getTimerCount will not include cancelled immediates

packages/jest-fake-timers/src/__tests__/jestFakeTimers.test.ts

@@ -1303,5 +1303,22 @@ describe('FakeTimers', () => {
 
       expect(timers.getTimerCount()).toEqual(3);
     });
+
+    it('not includes cancelled immediates', () => {
+      const timers = new FakeTimers({
+        config,
+        global,
+        moduleMocker,
+        timerConfig,
+      });
+
+      timers.useFakeTimers();
+
+      global.setImmediate(() => {});
+      expect(timers.getTimerCount()).toEqual(1);
+      timers.clearAllTimers();
+
+      expect(timers.getTimerCount()).toEqual(0);
+    });
   });
 });

packages/jest-fake-timers/src/jestFakeTimers.ts

@@ -53,7 +53,6 @@ const setGlobal = (
 };
 
 export default class FakeTimers<TimerRef> {
-  private _cancelledImmediates!: Record<string, boolean>;
   private _cancelledTicks!: Record<string, boolean>;
   private _config: StackTraceConfig;
   private _disposed?: boolean;
@@ -105,9 +104,7 @@ export default class FakeTimers<TimerRef> {
   }
 
   clearAllTimers() {
-    this._immediates.forEach(immediate =>
-      this._fakeClearImmediate(immediate.uuid),
-    );
+    this._immediates = [];
     this._timers.clear();
   }
 
@@ -118,7 +115,6 @@ export default class FakeTimers<TimerRef> {
 
   reset() {
     this._cancelledTicks = {};
-    this._cancelledImmediates = {};
     this._now = 0;
     this._ticks = [];
     this._immediates = [];
@@ -177,11 +173,8 @@ export default class FakeTimers<TimerRef> {
   }
 
   private _runImmediate(immediate: Tick) {
-    if (!this._cancelledImmediates.hasOwnProperty(immediate.uuid)) {
-      // Callback may throw, so update the map prior calling.
-      this._cancelledImmediates[immediate.uuid] = true;
-      immediate.callback();
-    }
+    immediate.callback();
+    this._fakeClearImmediate(immediate.uuid);
   }
 
   runAllTimers() {
@@ -402,7 +395,9 @@ export default class FakeTimers<TimerRef> {
   }
 
   private _fakeClearImmediate(uuid: TimerID) {
-    this._cancelledImmediates[uuid] = true;
+    this._immediates = this._immediates.filter(
+      immediate => immediate.uuid !== uuid,
+    );
   }
 
   private _fakeNextTick(callback: Callback, ...args: Array<any>) {
@@ -439,13 +434,11 @@ export default class FakeTimers<TimerRef> {
       uuid: String(uuid),
     });
 
-    const cancelledImmediates = this._cancelledImmediates;
+    const immediates = this._immediates;
     this._timerAPIs.setImmediate(() => {
-      if (!cancelledImmediates.hasOwnProperty(uuid)) {
-        // Callback may throw, so update the map prior calling.
-        cancelledImmediates[String(uuid)] = true;
+      this._fakeClearImmediate(String(uuid));
+      immediates.find(x => x.uuid === String(uuid)) &&
         callback.apply(null, args);
-      }
     });
 
     return uuid;