angular
diff --git a/‎packages/core/src/testability/testability.ts
Copy file name to clipboardExpand all lines: packages/core/src/testability/testability.ts
+24-9Lines changed: 24 additions & 9 deletions b/‎packages/core/src/testability/testability.ts
Copy file name to clipboardExpand all lines: packages/core/src/testability/testability.ts
+24-9Lines changed: 24 additions & 9 deletions
@@ -6,7 +6,9 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 
-import {Inject, Injectable, InjectionToken} from '../di';
+import {inject, Inject, Injectable, InjectionToken} from '../di';
+import {isInInjectionContext} from '../di/contextual';
+import {DestroyRef} from '../linker/destroy_ref';
 import {NgZone} from '../zone/ng_zone';
 
 /**
@@ -84,13 +86,21 @@ export class Testability implements PublicTestability {
   private _isZoneStable: boolean = true;
   private _callbacks: WaitCallback[] = [];
 
-  private taskTrackingZone: {macroTasks: Task[]} | null = null;
+  private _taskTrackingZone: {macroTasks: Task[]} | null = null;
+
+  private _destroyRef?: DestroyRef;
 
   constructor(
     private _ngZone: NgZone,
     private registry: TestabilityRegistry,
     @Inject(TESTABILITY_GETTER) testabilityGetter: GetTestability,
   ) {
+    // Attempt to retrieve a `DestroyRef` optionally.
+    // For backwards compatibility reasons, this cannot be required.
+    if (isInInjectionContext()) {
+      this._destroyRef = inject(DestroyRef, {optional: true}) ?? undefined;
+    }
+
     // If there was no Testability logic registered in the global scope
     // before, register the current testability getter as a global one.
     if (!_testabilityGetter) {
@@ -99,19 +109,19 @@ export class Testability implements PublicTestability {
     }
     this._watchAngularEvents();
     _ngZone.run(() => {
-      this.taskTrackingZone =
+      this._taskTrackingZone =
         typeof Zone == 'undefined' ? null : Zone.current.get('TaskTrackingZone');
     });
   }
 
   private _watchAngularEvents(): void {
-    this._ngZone.onUnstable.subscribe({
+    const onUnstableSubscription = this._ngZone.onUnstable.subscribe({
       next: () => {
         this._isZoneStable = false;
       },
     });
 
-    this._ngZone.runOutsideAngular(() => {
+    const onStableSubscription = this._ngZone.runOutsideAngular(() =>
       this._ngZone.onStable.subscribe({
         next: () => {
           NgZone.assertNotInAngularZone();
@@ -120,7 +130,12 @@ export class Testability implements PublicTestability {
             this._runCallbacksIfReady();
           });
         },
-      });
+      }),
+    );
+
+    this._destroyRef?.onDestroy(() => {
+      onUnstableSubscription.unsubscribe();
+      onStableSubscription.unsubscribe();
     });
   }
 
@@ -156,12 +171,12 @@ export class Testability implements PublicTestability {
   }
 
   private getPendingTasks(): PendingMacrotask[] {
-    if (!this.taskTrackingZone) {
+    if (!this._taskTrackingZone) {
       return [];
     }
 
     // Copy the tasks data so that we don't leak tasks.
-    return this.taskTrackingZone.macroTasks.map((t: Task) => {
+    return this._taskTrackingZone.macroTasks.map((t: Task) => {
       return {
         source: t.source,
         // From TaskTrackingZone:
@@ -196,7 +211,7 @@ export class Testability implements PublicTestability {
    *    and no further updates will be issued.
    */
   whenStable(doneCb: Function, timeout?: number, updateCb?: Function): void {
-    if (updateCb && !this.taskTrackingZone) {
+    if (updateCb && !this._taskTrackingZone) {
       throw new Error(
         'Task tracking zone is required when passing an update callback to ' +
           'whenStable(). Is "zone.js/plugins/task-tracking" loaded?',