Make sure runAllTimers also clears all ticks (#3915)

jestjs · Jun 27, 2017 · 113639b · 113639b
1 parent acc783a
commit 113639b
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/packages/jest-util/src/__tests__/fake_timers.test.js b/packages/jest-util/src/__tests__/fake_timers.test.js
@@ -406,6 +406,21 @@ describe('FakeTimers', () => {
         ),
       );
     });
+
+    it('also clears ticks', () => {
+      const global = {process};
+      const timers = new FakeTimers(global, moduleMocker);
+      timers.useFakeTimers();
+
+      const fn = jest.genMockFn();
+      global.setTimeout(() => {
+        process.nextTick(fn);
+      }, 0);
+      expect(fn.mock.calls.length).toBe(0);
+
+      timers.runAllTimers();
+      expect(fn.mock.calls.length).toBe(1);
+    });
   });
 
   describe('runTimersToTime', () => {

diff --git a/packages/jest-util/src/fake_timers.js b/packages/jest-util/src/fake_timers.js
@@ -219,6 +219,10 @@ class FakeTimers {
       if (this._immediates.length) {
         this.runAllImmediates();
       }
+
+      if (this._ticks.length) {
+        this.runAllTicks();
+      }
     }
 
     if (i === this._maxLoops) {