[BUGFIX stable] Instance initializers should run before App.ready

packages/ember-application/lib/system/application.js

@@ -291,11 +291,13 @@ var Application = Namespace.extend(DeferredMixin, {
         // tamper with the default `Ember.Router`.
         // 2.0TODO: Can we move this into a globals-mode-only library?
         this.Router = (this.Router || Router).extend();
-        this.waitForDOMReady(this.buildDefaultInstance());
+        this.buildDefaultInstance();
+        this.waitForDOMReady();
       }
     } else {
       this.Router = (this.Router || Router).extend();
-      this.waitForDOMReady(this.buildDefaultInstance());
+      this.buildDefaultInstance();
+      this.waitForDOMReady();
     }
   },
 
@@ -357,13 +359,13 @@ var Application = Namespace.extend(DeferredMixin, {
     loading.
 
     @private
-    @method scheduleInitialize
+    @method waitForDOMReady
   */
-  waitForDOMReady(_instance) {
+  waitForDOMReady() {
     if (!this.$ || this.$.isReady) {
-      run.schedule('actions', this, 'domReady', _instance);
+      run.schedule('actions', this, 'domReady');
     } else {
-      this.$().ready(run.bind(this, 'domReady', _instance));
+      this.$().ready(run.bind(this, 'domReady'));
     }
   },
 
@@ -552,16 +554,12 @@ var Application = Namespace.extend(DeferredMixin, {
     to defer readiness until the auth token has been retrieved.
 
     @private
-    @method _initialize
+    @method domReady
   */
-  domReady(_instance) {
+  domReady() {
     if (this.isDestroyed) { return; }
 
-    var app = this;
-
-    this.boot().then(function() {
-      app.runInstanceInitializers(_instance);
-    });
+    this.boot();
 
     return this;
   },
@@ -718,6 +716,7 @@ var Application = Namespace.extend(DeferredMixin, {
         this.__deprecatedInstance__.setupEventDispatcher();
       }
 
+      this.runInstanceInitializers(this.__deprecatedInstance__);
       this.ready(); // user hook
       this.__deprecatedInstance__.startRouting();
 
@@ -734,8 +733,8 @@ var Application = Namespace.extend(DeferredMixin, {
   },
 
   /**
-    Called when the Application has become ready.
-    The call will be delayed until the DOM has become ready.
+    Called when the Application has become ready, immediately before routing
+    begins. The call will be delayed until the DOM has become ready.
 
     @event ready
   */

packages/ember-application/tests/system/application_test.js

@@ -9,6 +9,7 @@ import View from "ember-views/views/view";
 import Controller from "ember-runtime/controllers/controller";
 import NoneLocation from "ember-routing/location/none_location";
 import EmberObject from "ember-runtime/system/object";
+import EmberRoute from "ember-routing/system/route";
 import jQuery from "ember-views/system/jquery";
 import compile from "ember-template-compiler/system/compile";
 
@@ -127,6 +128,40 @@ QUnit.test('initialized application go to initial route', function() {
   equal(jQuery('#qunit-fixture h1').text(), "Hi from index");
 });
 
+QUnit.test("ready hook is called before routing begins", function() {
+  expect(2);
+
+  run(function() {
+    function registerRoute(application, name, callback) {
+      var route = EmberRoute.extend({
+        activate: callback
+      });
+
+      application.register('route:' + name, route);
+    }
+
+    var MyApplication = Application.extend({
+      ready() {
+        registerRoute(this, 'index', function() {
+          ok(true, 'last-minite route is activated');
+        });
+      }
+    });
+
+    app = MyApplication.create({
+      rootElement: '#qunit-fixture'
+    });
+
+    app.Router.reopen({
+      location: 'none'
+    });
+
+    registerRoute(app, 'application', function() {
+      ok(true, 'normal route is activated');
+    });
+  });
+});
+
 QUnit.test("initialize application via initialize call", function() {
   run(function() {
     app = Application.create({

packages/ember-application/tests/system/instance_initializers_test.js

@@ -340,6 +340,33 @@ if (Ember.FEATURES.isEnabled('ember-application-instance-initializers')) {
     });
   });
 
+  QUnit.test("initializers are run before ready hook", function() {
+    expect(2);
+
+    var readyWasCalled = false;
+
+    var MyApplication = Application.extend({
+      ready() {
+        ok(true, 'ready is called');
+        readyWasCalled = true;
+      }
+    });
+
+    MyApplication.instanceInitializer({
+      name: 'initializer',
+      initialize() {
+        ok(!readyWasCalled, 'ready is not yet called');
+      }
+    });
+
+    run(function() {
+      app = MyApplication.create({
+        router: false,
+        rootElement: '#qunit-fixture'
+      });
+    });
+  });
+
   if (initializeContextFeatureEnabled) {
     QUnit.test("initializers should be executed in their own context", function() {
       expect(1);