fix(test): fix #1069, FakeDate should handle constructor parameter (#…

…1070)
angular · Apr 6, 2018 · b3fdd7e · b3fdd7e
1 parent a86bddb
commit b3fdd7e
Show file tree

Hide file tree

Showing 4 changed files with 228 additions and 36 deletions.
diff --git a/lib/jasmine/jasmine.ts b/lib/jasmine/jasmine.ts
@@ -67,10 +67,14 @@
       return originalJasmineFn.apply(this, arguments);
     };
   });
-  if (enableClockPatch) {
-    const originalClockFn: Function = ((jasmine as any)[symbol('clock')] = jasmine['clock']);
-    (jasmine as any)['clock'] = function() {
-      const clock = originalClockFn.apply(this, arguments);
+
+  // need to patch jasmine.clock().mockDate and jasmine.clock().tick() so
+  // they can work properly in FakeAsyncTest
+  const originalClockFn: Function = ((jasmine as any)[symbol('clock')] = jasmine['clock']);
+  (jasmine as any)['clock'] = function() {
+    const clock = originalClockFn.apply(this, arguments);
+    if (!clock[symbol('patched')]) {
+      clock[symbol('patched')] = symbol('patched');
       const originalTick = (clock[symbol('tick')] = clock.tick);
       clock.tick = function() {
         const fakeAsyncZoneSpec = Zone.current.get('FakeAsyncTestZoneSpec');
@@ -83,28 +87,31 @@
       clock.mockDate = function() {
         const fakeAsyncZoneSpec = Zone.current.get('FakeAsyncTestZoneSpec');
         if (fakeAsyncZoneSpec) {
-          const dateTime = arguments[0];
+          const dateTime = arguments.length > 0 ? arguments[0] : new Date();
           return fakeAsyncZoneSpec.setCurrentRealTime.apply(
               fakeAsyncZoneSpec,
               dateTime && typeof dateTime.getTime === 'function' ? [dateTime.getTime()] :
                                                                    arguments);
         }
         return originalMockDate.apply(this, arguments);
       };
-      ['install', 'uninstall'].forEach(methodName => {
-        const originalClockFn: Function = (clock[symbol(methodName)] = clock[methodName]);
-        clock[methodName] = function() {
-          const FakeAsyncTestZoneSpec = (Zone as any)['FakeAsyncTestZoneSpec'];
-          if (FakeAsyncTestZoneSpec) {
-            (jasmine as any)[symbol('clockInstalled')] = 'install' === methodName;
-            return;
-          }
-          return originalClockFn.apply(this, arguments);
-        };
-      });
-      return clock;
-    };
-  }
+      // for auto go into fakeAsync feature, we need the flag to enable it
+      if (enableClockPatch) {
+        ['install', 'uninstall'].forEach(methodName => {
+          const originalClockFn: Function = (clock[symbol(methodName)] = clock[methodName]);
+          clock[methodName] = function() {
+            const FakeAsyncTestZoneSpec = (Zone as any)['FakeAsyncTestZoneSpec'];
+            if (FakeAsyncTestZoneSpec) {
+              (jasmine as any)[symbol('clockInstalled')] = 'install' === methodName;
+              return;
+            }
+            return originalClockFn.apply(this, arguments);
+          };
+        });
+      }
+    }
+    return clock;
+  };
 
   /**
    * Gets a function wrapping the body of a Jasmine `describe` block to execute in a

diff --git a/lib/zone-spec/fake-async-test.ts b/lib/zone-spec/fake-async-test.ts
@@ -32,13 +32,14 @@
   const OriginalDate = global.Date;
   class FakeDate {
     constructor() {
-      const d = new OriginalDate();
-      d.setTime(global.Date.now());
-      return d;
-    }
-
-    static UTC() {
-      return OriginalDate.UTC();
+      if (arguments.length === 0) {
+        const d = new OriginalDate();
+        d.setTime(FakeDate.now());
+        return d;
+      } else {
+        const args = Array.prototype.slice.call(arguments);
+        return new OriginalDate(...args);
+      }
     }
 
     static now() {
@@ -48,12 +49,19 @@
       }
       return OriginalDate.now.apply(this, arguments);
     }
-
-    static parse() {
-      return OriginalDate.parse();
-    }
   }
 
+  (FakeDate as any).UTC = OriginalDate.UTC;
+  (FakeDate as any).parse = OriginalDate.parse;
+
+  // keep a reference for zone patched timer function
+  const timers = {
+    setTimeout: global.setTimeout,
+    setInterval: global.setInterval,
+    clearTimeout: global.clearTimeout,
+    clearInterval: global.clearInterval
+  };
+
   class Scheduler {
     // Next scheduler id.
     public nextId: number = 1;
@@ -63,7 +71,7 @@
     // Current simulated time in millis.
     private _currentTime: number = 0;
     // Current real time in millis.
-    private _currentRealTime: number = Date.now();
+    private _currentRealTime: number = OriginalDate.now();
 
     constructor() {}
 
@@ -341,6 +349,11 @@
       }
       global['Date'] = FakeDate;
       FakeDate.prototype = OriginalDate.prototype;
+
+      // try check and reset timers
+      // because jasmine.clock().install() may
+      // have replaced the global timer
+      FakeAsyncTestZoneSpec.checkTimerPatch();
     }
 
     static resetDate() {
@@ -349,6 +362,17 @@
       }
     }
 
+    static checkTimerPatch() {
+      if (global.setTimeout !== timers.setTimeout) {
+        global.setTimeout = timers.setTimeout;
+        global.clearTimeout = timers.clearTimeout;
+      }
+      if (global.setInterval !== timers.setInterval) {
+        global.setInterval = timers.setInterval;
+        global.clearInterval = timers.clearInterval;
+      }
+    }
+
     lockDatePatch() {
       this.patchDateLocked = true;
       FakeAsyncTestZoneSpec.patchDate();

diff --git a/test/test-env-setup-mocha.ts b/test/test-env-setup-mocha.ts
@@ -81,6 +81,11 @@ declare const global: any;
           throw new Error(`Expected ${expected} to be greater than ${actual}`);
         }
       },
+      toBeLessThan: function(actual: number) {
+        if (expected >= actual) {
+          throw new Error(`Expected ${expected} to be lesser than ${actual}`);
+        }
+      },
       toBeDefined: function() {
         if (!expected) {
           throw new Error(`Expected ${expected} to be defined`);
@@ -109,6 +114,11 @@ declare const global: any;
           throw new Error(`Expected ${expected} to be truthy`);
         }
       },
+      toBeFalsy: function(actual: any) {
+        if (!!actual) {
+          throw new Error(`Expected ${actual} to be falsy`);
+        }
+      },
       toContain: function(actual: any) {
         if (expected.indexOf(actual) === -1) {
           throw new Error(`Expected ${expected} to contain ${actual}`);
@@ -159,7 +169,11 @@ declare const global: any;
           if (expected > actual) {
             throw new Error(`Expected ${expected} not to be greater than ${actual}`);
           }
-
+        },
+        toBeLessThan: function(actual: number) {
+          if (expected < actual) {
+            throw new Error(`Expected ${expected} not to be lesser than ${actual}`);
+          }
         },
         toHaveBeenCalledWith: function(params: any[]) {
           if (!eq(expected.callArgs, params)) {