Fix timers: reference can be null (#4855)

jestjs · Nov 7, 2017 · 00114dd · 00114dd
1 parent 8901f87
commit 00114dd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/packages/jest-environment-node/src/index.js b/packages/jest-environment-node/src/index.js
@@ -50,7 +50,9 @@ class NodeEnvironment {
       },
     });
 
-    const timerRefToId = (timer: Timer) => timer.id;
+    const timerRefToId = (timer: Timer): ?number => {
+      return (timer && timer.id) || null;
+    };
 
     const timerConfig = {
       idToRef: timerIdToRef,

diff --git a/packages/jest-util/src/fake_timers.js b/packages/jest-util/src/fake_timers.js
@@ -59,7 +59,7 @@ type TimerAPI = {
 
 type TimerConfig<Ref> = {|
   idToRef: (id: number) => Ref,
-  refToId: (ref: Ref) => number,
+  refToId: (ref: Ref) => ?number,
 |};
 
 const MS_IN_A_YEAR = 31536000000;
@@ -387,7 +387,7 @@ export default class FakeTimers<TimerRef> {
   _fakeClearTimer(timerRef: TimerRef) {
     const uuid = this._timerConfig.refToId(timerRef);
 
-    if (this._timers.hasOwnProperty(uuid)) {
+    if (uuid && this._timers.hasOwnProperty(uuid)) {
       delete this._timers[String(uuid)];
     }
   }