Merge pull request #11253 from teddyzeenny/reset-bug

[BUGFIX release] always pass instance to instance initializers
emberjs · May 22, 2015 · 10f772a · 10f772a
2 parents 8a82918 + 8415914
commit 10f772a
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 3 deletions.
diff --git a/packages/ember-application/lib/system/application.js b/packages/ember-application/lib/system/application.js
@@ -664,9 +664,7 @@ var Application = Namespace.extend(DeferredMixin, {
     function handleReset() {
       run(instance, 'destroy');
 
-      this.buildDefaultInstance();
-
-      run.schedule('actions', this, 'domReady');
+      run.schedule('actions', this, 'domReady', this.buildDefaultInstance());
     }
 
     run.join(this, handleReset);

diff --git a/packages/ember-application/tests/system/instance_initializers_test.js b/packages/ember-application/tests/system/instance_initializers_test.js
@@ -362,4 +362,26 @@ if (Ember.FEATURES.isEnabled('ember-application-instance-initializers')) {
       });
     });
   }
+
+  QUnit.test("Initializers get an instance on app reset", function() {
+    expect(2);
+
+    var MyApplication = Application.extend();
+
+    MyApplication.instanceInitializer({
+      name: 'giveMeAnInstance',
+      initialize(instance) {
+        ok(!!instance, 'Initializer got an instance');
+      }
+    });
+
+    run(function() {
+      app = MyApplication.create({
+        router: false,
+        rootElement: '#qunit-fixture'
+      });
+    });
+
+    run(app, 'reset');
+  });
 }