fix(core): Remove deprecated Testability methods (angular#53768)

This commit removes the long-deprecated Testability methods that track
pending tasks. This is done by NgZone today and will be done by other
APIs in zoneless.

BREAKING CHANGE: Testability methods `increasePendingRequestCount`,
`decreasePendingRequestCount` and `getPendingRequestCount` have been
removed. This information is tracked with zones.

PR Close angular#53768

Author: atscott

goldens/public-api/core/index.md

@@ -1596,13 +1596,7 @@ export abstract class TemplateRef<C> {
 // @public
 export class Testability implements PublicTestability {
     constructor(_ngZone: NgZone, registry: TestabilityRegistry, testabilityGetter: GetTestability);
-    // @deprecated
-    decreasePendingRequestCount(): number;
     findProviders(using: any, provider: string, exactMatch: boolean): any[];
-    // @deprecated
-    getPendingRequestCount(): number;
-    // @deprecated
-    increasePendingRequestCount(): number;
     isStable(): boolean;
     whenStable(doneCb: Function, timeout?: number, updateCb?: Function): void;
     // (undocumented)

packages/core/src/testability/testability.ts

@@ -81,7 +81,6 @@ export const TESTABILITY_GETTER = new InjectionToken<GetTestability>('');
  */
 @Injectable()
 export class Testability implements PublicTestability {
-  private _pendingCount: number = 0;
   private _isZoneStable: boolean = true;
   private _callbacks: WaitCallback[] = [];
 
@@ -123,33 +122,11 @@ export class Testability implements PublicTestability {
     });
   }
 
-  /**
-   * Increases the number of pending request
-   * @deprecated pending requests are now tracked with zones.
-   */
-  increasePendingRequestCount(): number {
-    this._pendingCount += 1;
-    return this._pendingCount;
-  }
-
-  /**
-   * Decreases the number of pending request
-   * @deprecated pending requests are now tracked with zones
-   */
-  decreasePendingRequestCount(): number {
-    this._pendingCount -= 1;
-    if (this._pendingCount < 0) {
-      throw new Error('pending async requests below zero');
-    }
-    this._runCallbacksIfReady();
-    return this._pendingCount;
-  }
-
   /**
    * Whether an associated application is stable
    */
   isStable(): boolean {
-    return this._isZoneStable && this._pendingCount === 0 && !this._ngZone.hasPendingMacrotasks;
+    return this._isZoneStable && !this._ngZone.hasPendingMacrotasks;
   }
 
   private _runCallbacksIfReady(): void {
@@ -226,13 +203,6 @@ export class Testability implements PublicTestability {
     this._runCallbacksIfReady();
   }
 
-  /**
-   * Get the number of pending requests
-   * @deprecated pending requests are now tracked with zones
-   */
-  getPendingRequestCount(): number {
-    return this._pendingCount;
-  }
   /**
    * Registers an application with a testability hook so that it can be tracked.
    * @param token token of application, root element

packages/core/test/testability/testability_spec.ts

@@ -8,7 +8,7 @@
 
 import {EventEmitter} from '@angular/core';
 import {Injectable} from '@angular/core/src/di';
-import {GetTestability, PendingMacrotask, Testability, TestabilityRegistry} from '@angular/core/src/testability/testability';
+import {GetTestability, PendingMacrotask, Testability, TestabilityRegistry,} from '@angular/core/src/testability/testability';
 import {NgZone} from '@angular/core/src/zone/ng_zone';
 import {fakeAsync, tick, waitForAsync} from '@angular/core/testing';
 
@@ -25,8 +25,11 @@ function microTask(fn: Function): void {
 
 class NoopGetTestability implements GetTestability {
   addToWindow(registry: TestabilityRegistry): void {}
-  findTestabilityInTree(registry: TestabilityRegistry, elem: any, findInAncestors: boolean):
-      Testability|null {
+  findTestabilityInTree(
+      registry: TestabilityRegistry,
+      elem: any,
+      findInAncestors: boolean,
+      ): Testability|null {
     return null;
   }
 }
@@ -77,62 +80,6 @@ describe('Testability', () => {
     // (injected into a constructor) across all instances.
     setTestabilityGetter(null! as GetTestability);
   });
-  describe('Pending count logic', () => {
-    it('should start with a pending count of 0', () => {
-      expect(testability.getPendingRequestCount()).toEqual(0);
-    });
-
-    it('should fire whenstable callbacks if pending count is 0', waitForAsync(() => {
-         testability.whenStable(execute);
-
-         microTask(() => {
-           expect(execute).toHaveBeenCalled();
-         });
-       }));
-
-    it('should not fire whenstable callbacks synchronously if pending count is 0', () => {
-      testability.whenStable(execute);
-      expect(execute).not.toHaveBeenCalled();
-    });
-
-    it('should not call whenstable callbacks when there are pending counts', waitForAsync(() => {
-         testability.increasePendingRequestCount();
-         testability.increasePendingRequestCount();
-         testability.whenStable(execute);
-
-         microTask(() => {
-           expect(execute).not.toHaveBeenCalled();
-           testability.decreasePendingRequestCount();
-
-           microTask(() => {
-             expect(execute).not.toHaveBeenCalled();
-           });
-         });
-       }));
-
-    it('should fire whenstable callbacks when pending drops to 0', waitForAsync(() => {
-         testability.increasePendingRequestCount();
-         testability.whenStable(execute);
-
-         microTask(() => {
-           expect(execute).not.toHaveBeenCalled();
-           testability.decreasePendingRequestCount();
-
-           microTask(() => {
-             expect(execute).toHaveBeenCalled();
-           });
-         });
-       }));
-
-    it('should not fire whenstable callbacks synchronously when pending drops to 0',
-       waitForAsync(() => {
-         testability.increasePendingRequestCount();
-         testability.whenStable(execute);
-         testability.decreasePendingRequestCount();
-
-         expect(execute).not.toHaveBeenCalled();
-       }));
-  });
 
   describe('NgZone callback logic', () => {
     describe('whenStable with timeout', () => {
@@ -159,7 +106,7 @@ describe('Testability', () => {
 
       it('calls the done callback when angular is stable', fakeAsync(() => {
            let timeout1Done = false;
-           ngZone.run(() => setTimeout(() => timeout1Done = true, 500));
+           ngZone.run(() => setTimeout(() => (timeout1Done = true), 500));
            testability.whenStable(execute, 1000);
 
            tick(600);
@@ -176,16 +123,15 @@ describe('Testability', () => {
            expect(execute.calls.count()).toEqual(1);
          }));
 
-
       it('calls update when macro tasks change', fakeAsync(() => {
            let timeout1Done = false;
            let timeout2Done = false;
-           ngZone.run(() => setTimeout(() => timeout1Done = true, 500));
+           ngZone.run(() => setTimeout(() => (timeout1Done = true), 500));
            tick();
            testability.whenStable(execute, 1000, updateCallback);
 
            tick(100);
-           ngZone.run(() => setTimeout(() => timeout2Done = true, 300));
+           ngZone.run(() => setTimeout(() => (timeout2Done = true), 300));
            expect(updateCallback.calls.count()).toEqual(1);
            tick(600);
 
@@ -209,7 +155,7 @@ describe('Testability', () => {
            testability.whenStable(execute, 1000, execute2);
 
            tick(100);
-           ngZone.run(() => setTimeout(() => timeoutDone = true, 500));
+           ngZone.run(() => setTimeout(() => (timeoutDone = true), 500));
            ngZone.stable();
            expect(execute2).toHaveBeenCalled();
 
@@ -258,43 +204,33 @@ describe('Testability', () => {
       expect(execute).not.toHaveBeenCalled();
     });
 
-    it('should not fire whenstable callback when event did not finish', fakeAsync(() => {
+    it('should fire whenstable callback with didWork if event is already finished',
+       fakeAsync(() => {
          ngZone.unstable();
-         testability.increasePendingRequestCount();
+         ngZone.stable();
          testability.whenStable(execute);
 
          tick();
-         expect(execute).not.toHaveBeenCalled();
-         testability.decreasePendingRequestCount();
-
-         tick();
-         expect(execute).not.toHaveBeenCalled();
-         ngZone.stable();
+         expect(execute).toHaveBeenCalled();
+         testability.whenStable(execute2);
 
          tick();
-         expect(execute).toHaveBeenCalled();
+         expect(execute2).toHaveBeenCalled();
        }));
 
-    it('should not fire whenstable callback when there are pending counts', fakeAsync(() => {
+    it('should fire whenstable callback with didwork when event finishes', fakeAsync(() => {
          ngZone.unstable();
-         testability.increasePendingRequestCount();
-         testability.increasePendingRequestCount();
          testability.whenStable(execute);
 
          tick();
-         expect(execute).not.toHaveBeenCalled();
          ngZone.stable();
 
          tick();
-         expect(execute).not.toHaveBeenCalled();
-         testability.decreasePendingRequestCount();
-
-         tick();
-         expect(execute).not.toHaveBeenCalled();
-         testability.decreasePendingRequestCount();
+         expect(execute).toHaveBeenCalled();
+         testability.whenStable(execute2);
 
          tick();
-         expect(execute).toHaveBeenCalled();
+         expect(execute2).toHaveBeenCalled();
        }));
   });
 });

packages/upgrade/src/dynamic/test/upgrade_spec.ts

@@ -3419,19 +3419,19 @@ withEachNg1Version(() => {
         angular.module_('ng1', []);
         const element = html('<div></div>');
         adapter.bootstrap(element, ['ng1']).ready((ref) => {
-          const ng2Testability: Testability = ref.ng2Injector.get(Testability);
-          ng2Testability.increasePendingRequestCount();
+          const zone = ref.ng2Injector.get(NgZone);
           let ng2Stable = false;
 
+          zone.run(() => {
+            setTimeout(() => {
+              ng2Stable = true;
+            }, 100);
+          });
+
           angular.getTestability(element).whenStable(() => {
             expect(ng2Stable).toEqual(true);
             ref.dispose();
           });
-
-          setTimeout(() => {
-            ng2Stable = true;
-            ng2Testability.decreasePendingRequestCount();
-          }, 100);
         });
       }));
     });

packages/upgrade/static/test/integration/testability_spec.ts

@@ -6,8 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {destroyPlatform, NgModule, Testability} from '@angular/core';
-import {NgZone} from '@angular/core/src/zone/ng_zone';
+import {destroyPlatform, NgModule, Testability, NgZone} from '@angular/core';
 import {fakeAsync, flush, tick} from '@angular/core/testing';
 import {BrowserModule} from '@angular/platform-browser';
 import {platformBrowserDynamic} from '@angular/platform-browser-dynamic';
@@ -78,20 +77,20 @@ withEachNg1Version(() => {
       const element = html('<div></div>');
 
       bootstrap(platformBrowserDynamic(), Ng2Module, element, ng1Module).then((upgrade) => {
-        const ng2Testability: Testability = upgrade.injector.get(Testability);
-        ng2Testability.increasePendingRequestCount();
+        const zone = upgrade.injector.get(NgZone);
         let ng2Stable = false;
         let ng1Stable = false;
 
+        zone.run(() => {
+          setTimeout(() => {
+            ng2Stable = true;
+          }, 100);
+        });
+
         angular.getTestability(element).whenStable(() => {
           ng1Stable = true;
         });
 
-        setTimeout(() => {
-          ng2Stable = true;
-          ng2Testability.decreasePendingRequestCount();
-        }, 100);
-
         expect(ng1Stable).toEqual(false);
         expect(ng2Stable).toEqual(false);
         tick(100);