Split cleanup into two buckets.

addon-test-support/@ember/test-helpers/-utils.js

@@ -8,3 +8,17 @@ export function nextTickPromise() {
     nextTick(resolve);
   });
 }
+
+export function runDestroyablesFor(bucket, key) {
+  let destroyables = bucket[key];
+
+  if (!destroyables) {
+    return;
+  }
+
+  for (let i = 0; i < destroyables.length; i++) {
+    destroyables[i]();
+  }
+
+  delete bucket[key];
+}

addon-test-support/@ember/test-helpers/setup-context.js

@@ -1,5 +1,6 @@
 import { run } from '@ember/runloop';
 import { set, setProperties, get, getProperties } from '@ember/object';
+import { guidFor } from '@ember/object/internals';
 import buildOwner from './build-owner';
 import { _setupPromiseListeners } from './ext/rsvp';
 import { _setupAJAXHooks } from './settled';
@@ -49,6 +50,8 @@ export function resumeTest() {
   return context.resumeTest();
 }
 
+export const CLEANUP = Object.create(null);
+
 /*
  * Responsible for:
  *
@@ -62,6 +65,9 @@ export default function(context, options = {}) {
   Ember.testing = true;
   setContext(context);
 
+  let contextGuid = guidFor(context);
+  CLEANUP[contextGuid] = [];
+
   return nextTickPromise()
     .then(() => {
       let { resolver } = options;

addon-test-support/@ember/test-helpers/setup-rendering-context.js

@@ -2,7 +2,7 @@ import { guidFor } from '@ember/object/internals';
 import { run } from '@ember/runloop';
 import Ember from 'ember';
 import global from './global';
-import { getContext } from './setup-context';
+import { getContext, CLEANUP } from './setup-context';
 import { nextTickPromise } from './-utils';
 import settled from './settled';
 
@@ -38,16 +38,17 @@ export function clearRender() {
  * - Adding `this.clearRender` to the provided context
  */
 export default function(context) {
-  let guid = guidFor(context);
+  let contextGuid = guidFor(context);
+  RENDERING_CLEANUP[contextGuid] = [];
 
   let testElementContainer = document.getElementById('ember-testing-container');
   let fixtureResetValue = testElementContainer.innerHTML;
 
-  RENDERING_CLEANUP[guid] = [
-    () => {
-      testElementContainer.innerHTML = fixtureResetValue;
-    },
-  ];
+  // push this into the final cleanup bucket, to be ran _after_ the owner
+  // is destroyed and settled (e.g. flushed run loops, etc)
+  CLEANUP[contextGuid].push(() => {
+    testElementContainer.innerHTML = fixtureResetValue;
+  });
 
   return nextTickPromise().then(() => {
     let { owner } = context;
@@ -67,7 +68,10 @@ export default function(context) {
       : owner._lookupFactory('view:-outlet');
     let OutletTemplate = owner.lookup('template:-outlet');
     let toplevelView = OutletView.create();
-    RENDERING_CLEANUP[guid].push(() => toplevelView.destroy());
+
+    // push this into the rendering specific cleanup bucket, to be ran during
+    // `teardownRenderingContext` but before the owner itself is destroyed
+    RENDERING_CLEANUP[contextGuid].push(() => toplevelView.destroy());
 
     let hasOutletTemplate = Boolean(OutletTemplate);
     let outletState = {

addon-test-support/@ember/test-helpers/teardown-context.js

@@ -1,23 +1,32 @@
+import { guidFor } from '@ember/object/internals';
 import { run } from '@ember/runloop';
 import { _teardownPromiseListeners } from './ext/rsvp';
 import { _teardownAJAXHooks } from './settled';
-import { unsetContext } from './setup-context';
-import { nextTickPromise } from './-utils';
+import { unsetContext, CLEANUP } from './setup-context';
+import { nextTickPromise, runDestroyablesFor } from './-utils';
 import settled from './settled';
 import Ember from 'ember';
 
 export default function(context) {
-  return nextTickPromise().then(() => {
-    let { owner } = context;
+  return nextTickPromise()
+    .then(() => {
+      let { owner } = context;
 
-    _teardownPromiseListeners();
-    _teardownAJAXHooks();
+      _teardownPromiseListeners();
+      _teardownAJAXHooks();
 
-    run(owner, 'destroy');
-    Ember.testing = false;
+      run(owner, 'destroy');
+      Ember.testing = false;
 
-    unsetContext();
+      unsetContext();
 
-    return settled();
-  });
+      return settled();
+    })
+    .finally(() => {
+      let contextGuid = guidFor(context);
+
+      runDestroyablesFor(CLEANUP, contextGuid);
+
+      return settled();
+    });
 }

addon-test-support/@ember/test-helpers/teardown-rendering-context.js

@@ -1,19 +1,13 @@
 import { guidFor } from '@ember/object/internals';
-import { run } from '@ember/runloop';
 import { RENDERING_CLEANUP } from './setup-rendering-context';
-import { nextTickPromise } from './-utils';
+import { nextTickPromise, runDestroyablesFor } from './-utils';
 import settled from './settled';
 
 export default function(context) {
   return nextTickPromise().then(() => {
-    let guid = guidFor(context);
-    let destroyables = RENDERING_CLEANUP[guid];
+    let contextGuid = guidFor(context);
 
-    for (let i = 0; i < destroyables.length; i++) {
-      run(destroyables[i]);
-    }
-
-    delete RENDERING_CLEANUP[guid];
+    runDestroyablesFor(RENDERING_CLEANUP, contextGuid);
 
     return settled();
   });

tests/unit/teardown-rendering-context-test.js

@@ -32,6 +32,7 @@ module('setupRenderingContext', function(hooks) {
     assert.ok(document.contains(beforeTeardownEl), 'precond - ember-testing element is in DOM');
 
     await teardownRenderingContext(this);
+    await teardownContext(this);
 
     let afterTeardownEl = document.getElementById('ember-testing');