[BUGFIX release] ensure helpers don’t leak on the Test Promise constr…

…uctor
emberjs · Jul 20, 2015 · c095b38 · c095b38
1 parent 5f53b21
commit c095b38
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/packages/ember-testing/lib/test.js b/packages/ember-testing/lib/test.js
@@ -453,6 +453,7 @@ EmberApplication.reopen({
 
     for (var name in helpers) {
       this.helperContainer[name] = this.originalMethods[name];
+      delete Test.Promise.prototype[name];
       delete this.testHelpers[name];
       delete this.originalMethods[name];
     }

diff --git a/packages/ember-testing/tests/helpers_test.js b/packages/ember-testing/tests/helpers_test.js
@@ -99,17 +99,28 @@ QUnit.module('ember-testing: Helper setup', {
   teardown() { cleanup(); }
 });
 
+function registerHelper() {
+  Test.registerHelper('LeakyMcLeakLeak', function(app) {
+  });
+}
+
 QUnit.test('Ember.Application#injectTestHelpers/#removeTestHelpers', function() {
   App = run(EmberApplication, EmberApplication.create);
   assertNoHelpers(App);
 
+  registerHelper();
+
   App.injectTestHelpers();
   assertHelpers(App);
+  ok(Ember.Test.Promise.prototype.LeakyMcLeakLeak, 'helper in question SHOULD be present');
 
   App.removeTestHelpers();
   assertNoHelpers(App);
+
+  equal(Ember.Test.Promise.prototype.LeakyMcLeakLeak, undefined, 'should NOT leak test promise extensions');
 });
 
+
 QUnit.test('Ember.Application#setupForTesting', function() {
   run(function() {
     App = EmberApplication.create();