Merge pull request #10276 from ef4/fix-unregister-waiter

[BUGFIX beta] Fix broken unregisterWaiter semantics

packages/ember-testing/lib/test.js

@@ -1,7 +1,6 @@
 import Ember from "ember-metal/core";
 import emberRun from "ember-metal/run_loop";
 import { create } from "ember-metal/platform";
-import compare from "ember-runtime/compare";
 import RSVP from "ember-runtime/ext/rsvp";
 import setupForTesting from "ember-testing/setup_for_testing";
 import EmberApplication from "ember-application/system/application";
@@ -265,15 +264,13 @@ var Test = {
      @since 1.2.0
   */
   unregisterWaiter: function(context, callback) {
-    var pair;
     if (!this.waiters) { return; }
     if (arguments.length === 1) {
       callback = context;
       context = null;
     }
-    pair = [context, callback];
     this.waiters = Ember.A(this.waiters.filter(function(elt) {
-      return compare(elt, pair)!==0;
+      return !(elt[0] === context && elt[1] === callback);
     }));
   }
 };

packages/ember-testing/tests/helpers_test.js

@@ -26,6 +26,7 @@ function cleanup() {
     jQuery(document).off('ajaxComplete');
   });
   Test.pendingAjaxRequests = null;
+  Test.waiters = null;
 
   // Other cleanup
 
@@ -250,24 +251,33 @@ QUnit.module("ember-testing: Helper methods", {
 });
 
 test("`wait` respects registerWaiters", function() {
-  expect(2);
+  expect(3);
 
   var counter=0;
   function waiter() {
     return ++counter > 2;
   }
 
+  var other=0;
+  function otherWaiter() {
+    return ++other > 2;
+  }
+
   run(App, App.advanceReadiness);
   Test.registerWaiter(waiter);
+  Test.registerWaiter(otherWaiter);
 
   App.testHelpers.wait().then(function() {
     equal(waiter(), true, 'should not resolve until our waiter is ready');
     Test.unregisterWaiter(waiter);
-    equal(Test.waiters.length, 0, 'should not leave a waiter registered');
+    equal(Test.waiters.length, 1, 'should not leave the waiter registered');
+    other = 0;
+    return App.testHelpers.wait();
+  }).then(function() {
+    equal(otherWaiter(), true, 'other waiter is still registered');
   });
 });
 
-
 test("`visit` advances readiness.", function() {
   expect(2);
 
@@ -397,7 +407,7 @@ test("`wait` waits for outstanding timers", function() {
 
 
 test("`wait` respects registerWaiters with optional context", function() {
-  expect(2);
+  expect(3);
 
   var obj = {
     counter: 0,
@@ -406,13 +416,22 @@ test("`wait` respects registerWaiters with optional context", function() {
     }
   };
 
+  var other=0;
+  function otherWaiter() {
+    return ++other > 2;
+  }
+
   run(App, App.advanceReadiness);
   Test.registerWaiter(obj, obj.ready);
+  Test.registerWaiter(otherWaiter);
 
   App.testHelpers.wait().then(function() {
     equal(obj.ready(), true, 'should not resolve until our waiter is ready');
     Test.unregisterWaiter(obj, obj.ready);
-    equal(Test.waiters.length, 0, 'should not leave a waiter registered');
+    equal(Test.waiters.length, 1, 'should not leave the waiter registered');
+    return App.testHelpers.wait();
+  }).then(function() {
+    equal(otherWaiter(), true, 'other waiter should still be registered');
   });
 });