Merge pull request #147 from rwjblue/add-clearRender

Add `clearRender` method to allow testing of willDestroyElement.

.travis.yml

@@ -4,6 +4,7 @@ node_js:
 - 'stable'
 
 install:
+  - npm install -g npm
   - npm install -g bower
   - npm install --no-optional
   - bower install

lib/ember-test-helpers/test-module-for-component.js

@@ -200,6 +200,10 @@ export default TestModule.extend({
       }
       hook.apply(module, Array.prototype.slice.call(arguments, 1));
     };
+
+    context.clearRender = function() {
+      module.teardownComponent();
+    };
   },
 
   setupContext: function() {

lib/ember-test-helpers/test-module-for-integration.js

@@ -191,6 +191,10 @@ export default AbstractTestModule.extend({
       }
       hook.apply(module, Array.prototype.slice.call(arguments, 1));
     };
+
+    context.clearRender = function() {
+      module.teardownComponent();
+    };
   },
 
   teardownComponent: function() {

package.json

@@ -18,7 +18,7 @@
     "Ryan Florence",
     "Adolfo Builes"
   ],
-  "license": "Apache Version 2.0 and MIT",
+  "license": "(MIT OR Apache-2.0)",
   "readmeFilename": "README.md",
   "devDependencies": {
     "broccoli-babel-transpiler": "^5.4.5",

tests/test-module-for-component-test.js

@@ -584,8 +584,7 @@ moduleForComponent('Component Integration Tests: willDestoryElement', {
           var actuallyInDOM = Ember.$.contains(document, this.$()[0]);
 
           ok((actuallyInDOM === true) && (actuallyInDOM === stateIndicatesInDOM), 'component should still be in the DOM');
-      }
-
+        }
       })
     });
   }
@@ -594,7 +593,29 @@ moduleForComponent('Component Integration Tests: willDestoryElement', {
 test('still in DOM in willDestroyElement', function() {
     expect(1);
     this.render("{{my-component}}");
+});
+
+moduleForComponent('Component Integration Tests: force willDestroyElement via clearRender', {
+  integration: true,
+  beforeSetup: function() {
+    setResolverRegistry({});
+  }
+});
+
+test('still in DOM in willDestroyElement', function() {
+  expect(1);
+
+  let willDestroyCalled = false;
+  this.register('component:x-button', Ember.Component.extend({
+    willDestroyElement: function() {
+      willDestroyCalled = true;
+    }
+  }));
+
+  this.render("{{x-button}}");
+  this.clearRender();
 
+  ok(willDestroyCalled, 'can add assertions after willDestroyElement is called');
 });
 
 if (!hasEmberVersion(2,0)) {

tests/test-module-for-integration-test.js

@@ -274,3 +274,25 @@ test('still in DOM in willDestroyElement', function() {
     this.render("{{my-component}}");
 
 });
+
+moduleForIntegration('TestModuleForIntegration: force willDestroyElement via clearRender', {
+  beforeSetup: function() {
+    setResolverRegistry({});
+  }
+});
+
+test('still in DOM in willDestroyElement', function() {
+  expect(1);
+
+  let willDestroyCalled = false;
+  this.register('component:x-button', Ember.Component.extend({
+    willDestroyElement: function() {
+      willDestroyCalled = true;
+    }
+  }));
+
+  this.render("{{x-button}}");
+  this.clearRender();
+
+  ok(willDestroyCalled, 'can add assertions after willDestroyElement is called');
+});