Skip to content

Commit

Permalink
Merge pull request #12766 from trentmwillis/test-router
Browse files Browse the repository at this point in the history
Use routing service instead of application controller in test helpers
  • Loading branch information
rwjblue committed Jan 20, 2016
2 parents c54ecab + 65172ae commit bb163d0
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions packages/ember-testing/lib/helpers.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@ var helper = Test.registerHelper;
var asyncHelper = Test.registerAsyncHelper;

function currentRouteName(app) {
var appController = app.__container__.lookup('controller:application');
var routingService = app.__container__.lookup('service:-routing');

return get(appController, 'currentRouteName');
return get(routingService, 'currentRouteName');
}

function currentPath(app) {
var appController = app.__container__.lookup('controller:application');
var routingService = app.__container__.lookup('service:-routing');

return get(appController, 'currentPath');
return get(routingService, 'currentPath');
}

function currentURL(app) {
Expand Down

0 comments on commit bb163d0

Please sign in to comment.