fixup! feat(*): implement more granular pending task tracking

Author: gkalpak

src/ng/browser.js

@@ -75,8 +75,10 @@ function Browser(window, document, $log, $sniffer) {
 
   function decOutstandingRequestCount(taskType) {
     taskType = taskType || DEFAULT_TASK_TYPE;
-    if (outstandingRequestCounts[taskType]) outstandingRequestCounts[taskType]--;
-    if (outstandingRequestCounts[ALL_TASKS_TYPE]) outstandingRequestCounts[ALL_TASKS_TYPE]--;
+    if (outstandingRequestCounts[taskType]) {
+      outstandingRequestCounts[taskType]--;
+      outstandingRequestCounts[ALL_TASKS_TYPE]--;
+    }
   }
 
   function incOutstandingRequestCount(taskType) {

src/ng/testability.js

@@ -104,24 +104,20 @@ function $$TestabilityProvider() {
      * @name $$testability#whenStable
      *
      * @description
-     * Calls the callback when all pending requests (such as `$timeout` and `$http`) are completed.
-     * You can optionally pass a `taskType`, in which case the callback will be called when all
-     * pending requests of that type are completed (even if there are tasks of different types still
-     * pending).
+     * Calls the callback when all pending tasks are completed.
      *
-     * Available task types:
-     * - `$timeout`: Pending timeouts (via {@link $timeout}).
-     * - `$http`: Pending HTTP requests (via {@link $http}).
-     * - `$route`: A route transition is in progress (via {@link $route}).
-     * - `$applyAsync`: Pending tasks scheduled via {@link $rootScope#$applyAsync}.
-     * - `$evalAsync`: Pending tasks scheduled via {@link $rootScope#$evalAsync}.
+     * Types of tasks waited for include:
+     * - Pending timeouts (via {@link $timeout}).
+     * - Pending HTTP requests (via {@link $http}).
+     * - In-progress route transitions (via {@link $route}).
+     * - Pending tasks scheduled via {@link $rootScope#$applyAsync}.
+     * - Pending tasks scheduled via {@link $rootScope#$evalAsync}.
      *   These include tasks scheduled via `$evalAsync()` indirectly (such as {@link $q} promises).
      *
      * @param {function} callback
-     * @param {string=} taskType
      */
-    testability.whenStable = function(callback, taskType) {
-      $browser.notifyWhenNoOutstandingRequests(callback, taskType);
+    testability.whenStable = function(callback) {
+      $browser.notifyWhenNoOutstandingRequests(callback);
     };
 
     return testability;

src/ngMock/angular-mocks.js

@@ -52,8 +52,10 @@ angular.mock.$Browser = function() {
 
   function decOutstandingRequestCount(taskType) {
     taskType = taskType || DEFAULT_TASK_TYPE;
-    if (outstandingRequestCounts[taskType]) outstandingRequestCounts[taskType]--;
-    if (outstandingRequestCounts[ALL_TASKS_TYPE]) outstandingRequestCounts[ALL_TASKS_TYPE]--;
+    if (outstandingRequestCounts[taskType]) {
+      outstandingRequestCounts[taskType]--;
+      outstandingRequestCounts[ALL_TASKS_TYPE]--;
+    }
   }
   function incOutstandingRequestCount(taskType) {
     taskType = taskType || DEFAULT_TASK_TYPE;
@@ -184,14 +186,12 @@ angular.mock.$Browser = function() {
     if (angular.isDefined(delay)) {
       // A delay was passed so compute the next time
       nextTime = self.defer.now + delay;
+    } else if (self.deferredFns.length) {
+      // No delay was passed so set the next time so that it clears the deferred queue
+      nextTime = self.deferredFns[self.deferredFns.length - 1].time;
     } else {
-      if (self.deferredFns.length) {
-        // No delay was passed so set the next time so that it clears the deferred queue
-        nextTime = self.deferredFns[self.deferredFns.length - 1].time;
-      } else {
-        // No delay passed, but there are no deferred tasks so flush - indicates an error!
-        throw new Error('No deferred tasks to be flushed');
-      }
+      // No delay passed, but there are no deferred tasks so flush - indicates an error!
+      throw new Error('No deferred tasks to be flushed');
     }
 
     while (self.deferredFns.length && self.deferredFns[0].time <= nextTime) {
@@ -2263,6 +2263,9 @@ angular.mock.$TimeoutDecorator = ['$delegate', '$browser', function($delegate, $
    * @param {number=} delay maximum timeout amount to flush up until
    */
   $delegate.flush = function(delay) {
+    // For historical reasons, `$timeout.flush()` flushes all types of pending tasks.
+    // Keep the same behavior for backwards compatibility (and because it doesn't make sense to
+    // selectively flush scheduled events out of order).
     $browser.defer.flush(delay);
   };
 
@@ -2274,6 +2277,8 @@ angular.mock.$TimeoutDecorator = ['$delegate', '$browser', function($delegate, $
    * Verifies that there are no pending tasks that need to be flushed.
    */
   $delegate.verifyNoPendingTasks = function() {
+    // For historical reasons, `$timeout.verifyNoPendingTasks()` takes all types of pending tasks
+    // into account. Keep the same behavior for backwards compatibility.
     $browser.defer.verifyNoPendingTasks();
   };
 

test/ng/testabilitySpec.js

@@ -201,11 +201,7 @@ describe('$$testability', function() {
         var callback = noop;
 
         $$testability.whenStable(callback);
-        expect(spy).toHaveBeenCalledWith(callback, undefined);
-
-        spy.calls.reset();
-        $$testability.whenStable(callback, 'taskType');
-        expect(spy).toHaveBeenCalledWith(callback, 'taskType');
+        expect(spy).toHaveBeenCalledWith(callback);
       }));
   });
 });