Merge pull request #17712 from simonihmig/blueprint-qunit-instance-init

Instance-initializer blueprint: destroy instance before application
emberjs · Mar 8, 2019 · 57371db · 57371db
2 parents 1a9f464 + bff547d
commit 57371db
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/...ance-initializer-test/qunit-rfc-232-files/__root__/__testType__/__path__/__name__-test.js b/...ance-initializer-test/qunit-rfc-232-files/__root__/__testType__/__path__/__name__-test.js
@@ -15,8 +15,8 @@ module('<%= friendlyTestName %>', function(hooks) {
     this.instance = this.application.buildInstance();
   });
   hooks.afterEach(function() {
-    <% if (destroyAppExists) { %>destroyApp(this.application);<% } else { %>run(this.application, 'destroy');<% } %>
     <% if (destroyAppExists) { %>destroyApp(this.instance);<% } else { %>run(this.instance, 'destroy');<% } %>
+    <% if (destroyAppExists) { %>destroyApp(this.application);<% } else { %>run(this.application, 'destroy');<% } %>
   });
 
   // Replace this with your real tests.

diff --git a/node-tests/fixtures/instance-initializer-test/module-unification/rfc232.js b/node-tests/fixtures/instance-initializer-test/module-unification/rfc232.js
@@ -15,8 +15,8 @@ module('Unit | Instance Initializer | foo', function(hooks) {
     this.instance = this.application.buildInstance();
   });
   hooks.afterEach(function() {
-    run(this.application, 'destroy');
     run(this.instance, 'destroy');
+    run(this.application, 'destroy');
   });
 
   // Replace this with your real tests.

diff --git a/node-tests/fixtures/instance-initializer-test/rfc232.js b/node-tests/fixtures/instance-initializer-test/rfc232.js
@@ -15,8 +15,8 @@ module('Unit | Instance Initializer | foo', function(hooks) {
     this.instance = this.application.buildInstance();
   });
   hooks.afterEach(function() {
-    run(this.application, 'destroy');
     run(this.instance, 'destroy');
+    run(this.application, 'destroy');
   });
 
   // Replace this with your real tests.