Destroy components on teardown.

Fixes #64.
emberjs · Aug 14, 2014 · d38c870 · d38c870
1 parent 08a9892
commit d38c870
Show file tree

Hide file tree

Showing 5 changed files with 55 additions and 5 deletions.
diff --git a/dist/amd/module-for-component.js b/dist/amd/module-for-component.js
@@ -27,11 +27,21 @@ define(
           var view = Ember.run(function(){
             var subject = context.subject();
             containerView.pushObject(subject);
-            // TODO: destory this somewhere
             containerView.appendTo('#ember-testing');
             return subject;
           });
 
+          var oldTeardown = this.teardown;
+          this.teardown = function() {
+            Ember.run(function() {
+              Ember.tryInvoke(containerView, 'destroy');
+            });
+
+            if (oldTeardown) {
+              return oldTeardown.apply(this, arguments);
+            }
+          };
+
           return view.$();
         };
 

diff --git a/dist/cjs/module-for-component.js b/dist/cjs/module-for-component.js
@@ -24,11 +24,21 @@ exports["default"] = function moduleForComponent(name, description, callbacks) {
       var view = Ember.run(function(){
         var subject = context.subject();
         containerView.pushObject(subject);
-        // TODO: destory this somewhere
         containerView.appendTo('#ember-testing');
         return subject;
       });
 
+      var oldTeardown = this.teardown;
+      this.teardown = function() {
+        Ember.run(function() {
+          Ember.tryInvoke(containerView, 'destroy');
+        });
+
+        if (oldTeardown) {
+          return oldTeardown.apply(this, arguments);
+        }
+      };
+
       return view.$();
     };
 

diff --git a/dist/globals/main.js b/dist/globals/main.js
@@ -74,11 +74,21 @@ exports["default"] = function moduleForComponent(name, description, callbacks) {
       var view = Ember.run(function(){
         var subject = context.subject();
         containerView.pushObject(subject);
-        // TODO: destory this somewhere
         containerView.appendTo('#ember-testing');
         return subject;
       });
 
+      var oldTeardown = this.teardown;
+      this.teardown = function() {
+        Ember.run(function() {
+          Ember.tryInvoke(containerView, 'destroy');
+        });
+
+        if (oldTeardown) {
+          return oldTeardown.apply(this, arguments);
+        }
+      };
+
       return view.$();
     };
 

diff --git a/dist/named-amd/main.js b/dist/named-amd/main.js
@@ -82,11 +82,21 @@ define("ember-qunit/module-for-component",
           var view = Ember.run(function(){
             var subject = context.subject();
             containerView.pushObject(subject);
-            // TODO: destory this somewhere
             containerView.appendTo('#ember-testing');
             return subject;
           });
 
+          var oldTeardown = this.teardown;
+          this.teardown = function() {
+            Ember.run(function() {
+              Ember.tryInvoke(containerView, 'destroy');
+            });
+
+            if (oldTeardown) {
+              return oldTeardown.apply(this, arguments);
+            }
+          };
+
           return view.$();
         };
 

diff --git a/lib/module-for-component.js b/lib/module-for-component.js
@@ -23,11 +23,21 @@ export default function moduleForComponent(name, description, callbacks) {
       var view = Ember.run(function(){
         var subject = context.subject();
         containerView.pushObject(subject);
-        // TODO: destory this somewhere
         containerView.appendTo('#ember-testing');
         return subject;
       });
 
+      var oldTeardown = this.teardown;
+      this.teardown = function() {
+        Ember.run(function() {
+          Ember.tryInvoke(containerView, 'destroy');
+        });
+
+        if (oldTeardown) {
+          return oldTeardown.apply(this, arguments);
+        }
+      };
+
       return view.$();
     };