Merge pull request #10528 from rwjblue/ensure-router-can-be-specified

[BUGFIX beta] Ensure custom Router can be passed to Ember.Application.
emberjs · Feb 25, 2015 · 25e679b · 25e679b
2 parents 0eac6b4 + 68e21a4
commit 25e679b
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/packages/ember-application/lib/system/application.js b/packages/ember-application/lib/system/application.js
@@ -291,11 +291,11 @@ var Application = Namespace.extend(DeferredMixin, {
         // This is to ensure that someone reopening `App.Router` does not
         // tamper with the default `Ember.Router`.
         // 2.0TODO: Can we move this into a globals-mode-only library?
-        this.Router = Router.extend();
+        this.Router = (this.Router || Router).extend();
         this.waitForDOMReady(this.buildDefaultInstance());
       }
     } else {
-      this.Router = Router.extend();
+      this.Router = (this.Router || Router).extend();
       this.waitForDOMReady(this.buildDefaultInstance());
     }
   },

diff --git a/packages/ember-application/tests/system/application_test.js b/packages/ember-application/tests/system/application_test.js
@@ -281,6 +281,18 @@ QUnit.test("can resolve custom router", function() {
   ok(app.__container__.lookup('router:main') instanceof CustomRouter, 'application resolved the correct router');
 });
 
+QUnit.test("can specify custom router", function() {
+  var CustomRouter = Router.extend();
+
+  app = run(function() {
+    return Application.create({
+      Router: CustomRouter
+    });
+  });
+
+  ok(app.__container__.lookup('router:main') instanceof CustomRouter, 'application resolved the correct router');
+});
+
 QUnit.test("throws helpful error if `app.then` is used", function() {
   run(function() {
     app = Application.create({