Merge pull request #16584 from emberjs/mem-leak

[BUGFIX] Memory issues

packages/@ember/application/tests/application_instance_test.js

@@ -30,10 +30,12 @@ moduleFor(
       setDebugFunction('debug', originalDebug);
       if (appInstance) {
         run(appInstance, 'destroy');
+        appInstance = null;
       }
 
       if (application) {
         run(application, 'destroy');
+        application = null;
       }
 
       document.getElementById('qunit-fixture').innerHTML = '';

packages/@ember/application/tests/application_test.js

@@ -234,7 +234,7 @@ moduleFor(
     [`@test acts like a namespace`](assert) {
       let lookup = (context.lookup = {});
 
-      lookup.TestApp = this.runTask(() => this.createApplication());
+      lookup.TestApp = this.application = this.runTask(() => this.createApplication());
 
       setNamespaceSearchDisabled(false);
       let Foo = (this.application.Foo = EmberObject.extend());

packages/@ember/application/tests/dependency_injection/normalization_test.js

@@ -15,7 +15,10 @@ moduleFor(
     }
 
     teardown() {
+      super.teardown();
       run(application, 'destroy');
+      application = undefined;
+      registry = undefined;
     }
 
     ['@test normalization'](assert) {

packages/@ember/application/tests/dependency_injection_test.js

@@ -42,8 +42,9 @@ moduleFor(
     }
 
     teardown() {
+      super.teardown();
       run(application, 'destroy');
-      application = locator = null;
+      registry = application = locator = null;
       context.lookup = originalLookup;
     }
 

packages/@ember/application/tests/readiness_test.js

@@ -55,6 +55,7 @@ moduleFor(
     teardown() {
       if (application) {
         run(() => application.destroy());
+        jQuery = readyCallbacks = domReady = Application = application = undefined;
       }
     }
 

packages/@ember/engine/tests/engine_initializers_test.js

@@ -11,10 +11,12 @@ moduleFor(
       run(() => {
         if (myEngineInstance) {
           myEngineInstance.destroy();
+          myEngineInstance = null;
         }
 
         if (myEngine) {
           myEngine.destroy();
+          myEngine = null;
         }
       });
     }

packages/@ember/engine/tests/engine_instance_initializers_test.js

@@ -22,6 +22,7 @@ moduleFor(
   'Engine instance initializers',
   class extends TestCase {
     teardown() {
+      super.teardown();
       run(() => {
         if (myEngineInstance) {
           myEngineInstance.destroy();
@@ -31,6 +32,7 @@ moduleFor(
           myEngine.destroy();
         }
       });
+      MyEngine = myEngine = myEngineInstance = undefined;
     }
 
     ["@test initializers require proper 'name' and 'initialize' properties"]() {

packages/@ember/engine/tests/engine_instance_test.js

@@ -20,10 +20,12 @@ moduleFor(
     teardown() {
       if (engineInstance) {
         run(engineInstance, 'destroy');
+        engineInstance = undefined;
       }
 
       if (engine) {
         run(engine, 'destroy');
+        engine = undefined;
       }
     }
 

packages/@ember/engine/tests/engine_test.js

@@ -12,28 +12,28 @@ import {
 
 let engine;
 let originalLookup = context.lookup;
-let lookup;
 
 moduleFor(
   'Engine',
   class extends TestCase {
     constructor() {
       super();
 
-      lookup = context.lookup = {};
-      engine = run(() => Engine.create());
+      run(() => {
+        engine = Engine.create();
+        context.lookup = { TestEngine: engine };
+      });
     }
 
     teardown() {
       context.lookup = originalLookup;
       if (engine) {
         run(engine, 'destroy');
+        engine = null;
       }
     }
 
     ['@test acts like a namespace'](assert) {
-      engine = run(() => (lookup.TestEngine = Engine.create()));
-
       engine.Foo = EmberObject.extend();
       assert.equal(
         engine.Foo.toString(),

packages/ember-extension-support/tests/data_adapter_test.js

@@ -29,6 +29,11 @@ const DataAdapter = EmberDataAdapter.extend({
 moduleFor(
   'Data Adapter',
   class extends ApplicationTestCase {
+    teardown() {
+      super.teardown();
+      adapter = undefined;
+    }
+
     ['@test Model types added'](assert) {
       this.add(
         'data-adapter:main',

packages/ember-routing/tests/location/auto_location_test.js

@@ -40,7 +40,7 @@ function mockBrowserHistory(overrides, assert) {
 }
 
 function createLocation(location, history) {
-  let owner = buildOwner();
+  owner = buildOwner();
 
   owner.register('location:history', HistoryLocation);
   owner.register('location:hash', HashLocation);
@@ -56,14 +56,15 @@ function createLocation(location, history) {
   return autolocation;
 }
 
-let location;
+let location, owner;
 
 moduleFor(
   'AutoLocation',
   class extends AbstractTestCase {
     teardown() {
-      if (location) {
-        run(location, 'destroy');
+      if (owner) {
+        run(owner, 'destroy');
+        owner = location = undefined;
       }
     }
 

packages/ember-routing/tests/system/route_test.js

@@ -15,7 +15,9 @@ moduleFor(
     }
 
     teardown() {
+      super.teardown();
       runDestroy(route);
+      route = routeOne = routeTwo = lookupHash = undefined;
     }
 
     ['@test default store utilizes the container to acquire the model factory'](assert) {
@@ -48,12 +50,15 @@ moduleFor(
         },
       };
 
-      setOwner(route, buildOwner(ownerOptions));
+      let owner = buildOwner(ownerOptions);
+      setOwner(route, owner);
 
       route.set('_qp', null);
 
       assert.equal(route.model({ post_id: 1 }), post);
       assert.equal(route.findModel('post', 1), post, '#findModel returns the correct post');
+
+      runDestroy(owner);
     }
 
     ["@test 'store' can be injected by data persistence frameworks"](assert) {
@@ -84,6 +89,8 @@ moduleFor(
 
       assert.equal(route.model({ post_id: 1 }), post, '#model returns the correct post');
       assert.equal(route.findModel('post', 1), post, '#findModel returns the correct post');
+
+      runDestroy(owner);
     }
 
     ["@test assert if 'store.find' method is not found"]() {
@@ -100,6 +107,8 @@ moduleFor(
       expectAssertion(function() {
         route.findModel('post', 1);
       }, 'Post has no method `find`.');
+
+      runDestroy(owner);
     }
 
     ['@test asserts if model class is not found']() {
@@ -113,6 +122,8 @@ moduleFor(
       expectAssertion(function() {
         route.model({ post_id: 1 });
       }, /You used the dynamic segment post_id in your route undefined, but <Ember.Object:ember\d+>.Post did not exist and you did not override your route\'s `model` hook./);
+
+      runDestroy(owner);
     }
 
     ["@test 'store' does not need to be injected"](assert) {
@@ -129,6 +140,8 @@ moduleFor(
       });
 
       assert.ok(true, 'no error was raised');
+
+      runDestroy(owner);
     }
 
     ["@test modelFor doesn't require the router"](assert) {
@@ -144,6 +157,8 @@ moduleFor(
       owner.register('route:foo', FooRoute);
 
       assert.strictEqual(route.modelFor('foo'), foo);
+
+      runDestroy(owner);
     }
 
     ['@test .send just calls an action if the router is absent'](assert) {
@@ -167,6 +182,8 @@ moduleFor(
       assert.equal(true, route.send('returnsTrue', 1, 2));
       assert.equal(false, route.send('returnsFalse'));
       assert.equal(undefined, route.send('nonexistent', 1, 2, 3));
+
+      runDestroy(route);
     }
 
     ['@test .send just calls an action if the routers internal router property is absent'](assert) {
@@ -191,6 +208,8 @@ moduleFor(
       assert.equal(true, route.send('returnsTrue', 1, 2));
       assert.equal(false, route.send('returnsFalse'));
       assert.equal(undefined, route.send('nonexistent', 1, 2, 3));
+
+      runDestroy(route);
     }
 
     ['@test .send asserts if called on a destroyed route']() {

packages/ember-runtime/tests/system/namespace/base_test.js

@@ -34,7 +34,12 @@ moduleFor(
     }
 
     ['@test Namespace should be duck typed'](assert) {
-      assert.ok(get(Namespace.create(), 'isNamespace'), 'isNamespace property is true');
+      let namespace = Namespace.create();
+      try {
+        assert.ok(get(namespace, 'isNamespace'), 'isNamespace property is true');
+      } finally {
+        run(namespace, 'destroy');
+      }
     }
 
     ['@test Namespace is found and named'](assert) {
@@ -90,23 +95,27 @@ moduleFor(
         name: 'NamespaceA',
       });
 
-      let nsB = (lookup.NamespaceB = Namespace.create({
-        name: 'CustomNamespaceB',
-      }));
-
-      nsA.Foo = EmberObject.extend();
-      nsB.Foo = EmberObject.extend();
-
-      assert.equal(
-        nsA.Foo.toString(),
-        'NamespaceA.Foo',
-        "The namespace's name is used when the namespace is not in the lookup object"
-      );
-      assert.equal(
-        nsB.Foo.toString(),
-        'CustomNamespaceB.Foo',
-        "The namespace's name is used when the namespace is in the lookup object"
-      );
+      try {
+        let nsB = (lookup.NamespaceB = Namespace.create({
+          name: 'CustomNamespaceB',
+        }));
+
+        nsA.Foo = EmberObject.extend();
+        nsB.Foo = EmberObject.extend();
+
+        assert.equal(
+          nsA.Foo.toString(),
+          'NamespaceA.Foo',
+          "The namespace's name is used when the namespace is not in the lookup object"
+        );
+        assert.equal(
+          nsB.Foo.toString(),
+          'CustomNamespaceB.Foo',
+          "The namespace's name is used when the namespace is in the lookup object"
+        );
+      } finally {
+        run(nsA, 'destroy');
+      }
     }
 
     ['@test Calling namespace.nameClasses() eagerly names all classes'](assert) {
@@ -138,6 +147,8 @@ moduleFor(
       UI.Nav = Namespace.create();
 
       assert.equal(Namespace.byName('UI.Nav'), UI.Nav);
+
+      run(UI.Nav, 'destroy');
     }
 
     ['@test Destroying a namespace before caching lookup removes it from the list of namespaces'](

packages/ember-runtime/tests/system/object/toString_test.js

@@ -1,3 +1,4 @@
+import { run } from '@ember/runloop';
 import { guidFor, setName } from 'ember-utils';
 import { context } from 'ember-environment';
 import EmberObject from '../../../lib/system/object';
@@ -35,6 +36,8 @@ moduleFor(
       assert.equal(obj.toString(), '<Foo.Bar:' + guidFor(obj) + '>');
 
       assert.equal(Foo.Bar.toString(), 'Foo.Bar');
+
+      run(Foo, 'destroy');
     }
 
     ['@test toString on a class returns a useful value when nested in a namespace'](assert) {
@@ -59,12 +62,16 @@ moduleFor(
 
       obj = Foo.Bar.create();
       assert.equal(obj.toString(), '<Foo.Bar:' + guidFor(obj) + '>');
+
+      run(Foo, 'destroy');
     }
 
     ['@test toString on a namespace finds the namespace in lookup'](assert) {
       let Foo = (lookup.Foo = Namespace.create());
 
       assert.equal(Foo.toString(), 'Foo');
+
+      run(Foo, 'destroy');
     }
 
     ['@test toString on a namespace finds the namespace in lookup'](assert) {
@@ -77,12 +84,16 @@ moduleFor(
 
       obj = Foo.Bar.create();
       assert.equal(obj.toString(), '<Foo.Bar:' + guidFor(obj) + '>');
+
+      run(Foo, 'destroy');
     }
 
     ['@test toString on a namespace falls back to modulePrefix, if defined'](assert) {
       let Foo = Namespace.create({ modulePrefix: 'foo' });
 
       assert.equal(Foo.toString(), 'foo');
+
+      run(Foo, 'destroy');
     }
 
     ['@test toString includes toStringExtension if defined'](assert) {

packages/ember-template-compiler/tests/system/bootstrap-test.js

@@ -35,7 +35,7 @@ function checkTemplate(templateName, assert) {
   runAppend(component);
 
   assert.equal(qunitFixture.textContent.trim(), 'Tobias takes teamocil', 'template works');
-  runDestroy(component);
+  runDestroy(owner);
 }
 
 moduleFor(
@@ -49,7 +49,7 @@ moduleFor(
 
     teardown() {
       setTemplates({});
-      runDestroy(component);
+      fixture = component = null;
     }
 
     ['@test template with data-template-name should add a new template to Ember.TEMPLATES'](