Skip to content

Commit

Permalink
Makes sure we register router:main so it can be injected into control…
Browse files Browse the repository at this point in the history
…lers and routes even in Ember 1.11
  • Loading branch information
Miguel Madero committed Apr 12, 2016
1 parent 6207a7b commit eb3e171
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion lib/ember-test-helpers/test-module-for-integration.js
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ export default AbstractTestModule.extend({
this.container = items.container;
this.registry = items.registry;

if (hasEmberVersion(1, 13)) {
if (hasEmberVersion(1, 11)) {
var thingToRegisterWith = this.registry || this.container;
var router = resolver.resolve('router:main');
router = router || Ember.Router.extend();
Expand Down
2 changes: 1 addition & 1 deletion lib/ember-test-helpers/test-module.js
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ export default AbstractTestModule.extend({
this.container = items.container;
this.registry = items.registry;

if (hasEmberVersion(1, 13)) {
if (hasEmberVersion(1, 11)) {
var thingToRegisterWith = this.registry || this.container;
var router = resolver.resolve('router:main');
router = router || Ember.Router.extend();
Expand Down

0 comments on commit eb3e171

Please sign in to comment.