Skip to content
This repository was archived by the owner on Feb 26, 2024. It is now read-only.

Commit c9d437b

Browse files
JiaLiPassionJiaLiPassion
committed
fix(test): fix #1069, FakeDate should handle constructor parameter
1 parent a86bddb commit c9d437b

File tree

4 files changed

+212
-36
lines changed

4 files changed

+212
-36
lines changed

‎lib/jasmine/jasmine.ts

Lines changed: 26 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,14 @@
6767
return originalJasmineFn.apply(this, arguments);
6868
};
6969
});
70-
if (enableClockPatch) {
71-
const originalClockFn: Function = ((jasmine as any)[symbol('clock')] = jasmine['clock']);
72-
(jasmine as any)['clock'] = function() {
73-
const clock = originalClockFn.apply(this, arguments);
70+
71+
// need to patch jasmine.clock().mockDate and jasmine.clock().tick() so
72+
// they can work properly in FakeAsyncTest
73+
const originalClockFn: Function = ((jasmine as any)[symbol('clock')] = jasmine['clock']);
74+
(jasmine as any)['clock'] = function() {
75+
const clock = originalClockFn.apply(this, arguments);
76+
if (!clock[symbol('patched')]) {
77+
clock[symbol('patched')] = symbol('patched');
7478
const originalTick = (clock[symbol('tick')] = clock.tick);
7579
clock.tick = function() {
7680
const fakeAsyncZoneSpec = Zone.current.get('FakeAsyncTestZoneSpec');
@@ -83,28 +87,31 @@
8387
clock.mockDate = function() {
8488
const fakeAsyncZoneSpec = Zone.current.get('FakeAsyncTestZoneSpec');
8589
if (fakeAsyncZoneSpec) {
86-
const dateTime = arguments[0];
90+
const dateTime = arguments.length > 0 ? arguments[0] : new Date();
8791
return fakeAsyncZoneSpec.setCurrentRealTime.apply(
8892
fakeAsyncZoneSpec,
8993
dateTime && typeof dateTime.getTime === 'function' ? [dateTime.getTime()] :
9094
arguments);
9195
}
9296
return originalMockDate.apply(this, arguments);
9397
};
94-
['install', 'uninstall'].forEach(methodName => {
95-
const originalClockFn: Function = (clock[symbol(methodName)] = clock[methodName]);
96-
clock[methodName] = function() {
97-
const FakeAsyncTestZoneSpec = (Zone as any)['FakeAsyncTestZoneSpec'];
98-
if (FakeAsyncTestZoneSpec) {
99-
(jasmine as any)[symbol('clockInstalled')] = 'install' === methodName;
100-
return;
101-
}
102-
return originalClockFn.apply(this, arguments);
103-
};
104-
});
105-
return clock;
106-
};
107-
}
98+
// for auto go into fakeAsync feature, we need the flag to enable it
99+
if (enableClockPatch) {
100+
['install', 'uninstall'].forEach(methodName => {
101+
const originalClockFn: Function = (clock[symbol(methodName)] = clock[methodName]);
102+
clock[methodName] = function() {
103+
const FakeAsyncTestZoneSpec = (Zone as any)['FakeAsyncTestZoneSpec'];
104+
if (FakeAsyncTestZoneSpec) {
105+
(jasmine as any)[symbol('clockInstalled')] = 'install' === methodName;
106+
return;
107+
}
108+
return originalClockFn.apply(this, arguments);
109+
};
110+
});
111+
}
112+
}
113+
return clock;
114+
};
108115

109116
/**
110117
* Gets a function wrapping the body of a Jasmine `describe` block to execute in a

‎lib/zone-spec/fake-async-test.ts

Lines changed: 36 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,14 @@
3232
const OriginalDate = global.Date;
3333
class FakeDate {
3434
constructor() {
35-
const d = new OriginalDate();
36-
d.setTime(global.Date.now());
37-
return d;
38-
}
39-
40-
static UTC() {
41-
return OriginalDate.UTC();
35+
if (arguments.length === 0) {
36+
const d = new OriginalDate();
37+
d.setTime(FakeDate.now());
38+
return d;
39+
} else {
40+
const args = Array.prototype.slice.call(arguments);
41+
return new OriginalDate(...args);
42+
}
4243
}
4344

4445
static now() {
@@ -48,12 +49,19 @@
4849
}
4950
return OriginalDate.now.apply(this, arguments);
5051
}
51-
52-
static parse() {
53-
return OriginalDate.parse();
54-
}
5552
}
5653

54+
(FakeDate as any).UTC = OriginalDate.UTC;
55+
(FakeDate as any).parse = OriginalDate.parse;
56+
57+
// keep a reference for zone patched timer function
58+
const timers = {
59+
setTimeout: global.setTimeout,
60+
setInterval: global.setInterval,
61+
clearTimeout: global.clearTimeout,
62+
clearInterval: global.clearInterval
63+
};
64+
5765
class Scheduler {
5866
// Next scheduler id.
5967
public nextId: number = 1;
@@ -63,7 +71,7 @@
6371
// Current simulated time in millis.
6472
private _currentTime: number = 0;
6573
// Current real time in millis.
66-
private _currentRealTime: number = Date.now();
74+
private _currentRealTime: number = OriginalDate.now();
6775

6876
constructor() {}
6977

@@ -341,6 +349,11 @@
341349
}
342350
global['Date'] = FakeDate;
343351
FakeDate.prototype = OriginalDate.prototype;
352+
353+
// try check and reset timers
354+
// because jasmine.clock().install() may
355+
// have replaced the global timer
356+
FakeAsyncTestZoneSpec.checkTimerPatch();
344357
}
345358

346359
static resetDate() {
@@ -349,6 +362,17 @@
349362
}
350363
}
351364

365+
static checkTimerPatch() {
366+
if (global.setTimeout !== timers.setTimeout) {
367+
global.setTimeout = timers.setTimeout;
368+
global.clearTimeout = timers.clearTimeout;
369+
}
370+
if (global.setInterval !== timers.setInterval) {
371+
global.setInterval = timers.setInterval;
372+
global.clearInterval = timers.clearInterval;
373+
}
374+
}
375+
352376
lockDatePatch() {
353377
this.patchDateLocked = true;
354378
FakeAsyncTestZoneSpec.patchDate();

‎test/test-env-setup-mocha.ts

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,11 @@ declare const global: any;
8181
throw new Error(`Expected ${expected} to be greater than ${actual}`);
8282
}
8383
},
84+
toBeLessThan: function(actual: number) {
85+
if (expected >= actual) {
86+
throw new Error(`Expected ${expected} to be lesser than ${actual}`);
87+
}
88+
},
8489
toBeDefined: function() {
8590
if (!expected) {
8691
throw new Error(`Expected ${expected} to be defined`);
@@ -159,7 +164,11 @@ declare const global: any;
159164
if (expected > actual) {
160165
throw new Error(`Expected ${expected} not to be greater than ${actual}`);
161166
}
162-
167+
},
168+
toBeLessThan: function(actual: number) {
169+
if (expected < actual) {
170+
throw new Error(`Expected ${expected} not to be lesser than ${actual}`);
171+
}
163172
},
164173
toHaveBeenCalledWith: function(params: any[]) {
165174
if (!eq(expected.callArgs, params)) {

‎test/zone-spec/fake-async-test.spec.ts

Lines changed: 140 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -913,17 +913,45 @@ describe('FakeAsyncTestZoneSpec', () => {
913913
expect(d instanceof Date).toBe(true);
914914
});
915915
});
916+
917+
it('should new Date with parameter correctly', () => {
918+
fakeAsyncTestZone.run(() => {
919+
const d: Date = new Date(0);
920+
expect(d.getFullYear()).toBeLessThan(1971);
921+
const d1: Date = new Date('December 17, 1995 03:24:00');
922+
expect(d1.getFullYear()).toEqual(1995);
923+
const d2: Date = new Date(1995, 11, 17, 3, 24, 0);
924+
expect(d2.getFullYear()).toEqual(1995);
925+
});
926+
});
927+
928+
it('should get Date.UTC() correctly', () => {
929+
fakeAsyncTestZone.run(() => {
930+
const utcDate = new Date(Date.UTC(96, 11, 1, 0, 0, 0));
931+
expect(utcDate.getFullYear()).toBe(1996);
932+
});
933+
});
934+
935+
it('should call Date.parse() correctly', () => {
936+
fakeAsyncTestZone.run(() => {
937+
const unixTimeZero = Date.parse('01 Jan 1970 00:00:00 GMT');
938+
expect(unixTimeZero).toBe(0);
939+
});
940+
});
941+
916942
});
917943

918944
describe(
919-
'fakeAsyncTest should work without jasmine.clock',
945+
'fakeAsyncTest should work without patch jasmine.clock',
920946
ifEnvSupports(
921947
() => {
922948
return !supportClock() && supportNode();
923949
},
924950
() => {
925951
const fakeAsync = (Zone as any)[Zone.__symbol__('fakeAsyncTest')].fakeAsync;
952+
let spy: any;
926953
beforeEach(() => {
954+
spy = jasmine.createSpy('timer');
927955
jasmine.clock().install();
928956
});
929957

@@ -932,11 +960,44 @@ describe('FakeAsyncTestZoneSpec', () => {
932960
});
933961

934962
it('should check date type correctly', fakeAsync(() => {
963+
const d: any = new Date();
964+
expect(d instanceof Date).toBe(true);
965+
}));
966+
967+
it('should check date type correctly without fakeAsync', () => {
935968
const d: any = new Date();
936969
expect(d instanceof Date).toBe(true);
937-
}));
970+
});
971+
972+
it('should tick correctly', fakeAsync(() => {
973+
jasmine.clock().mockDate();
974+
const start = Date.now();
975+
jasmine.clock().tick(100);
976+
const end = Date.now();
977+
expect(end - start).toBe(100);
978+
}));
979+
980+
it('should tick correctly without fakeAsync', () => {
981+
jasmine.clock().mockDate();
982+
const start = Date.now();
983+
jasmine.clock().tick(100);
984+
const end = Date.now();
985+
expect(end - start).toBe(100);
986+
});
938987

939988
it('should mock date correctly', fakeAsync(() => {
989+
const baseTime = new Date(2013, 9, 23);
990+
jasmine.clock().mockDate(baseTime);
991+
const start = Date.now();
992+
expect(start).toBe(baseTime.getTime());
993+
jasmine.clock().tick(100);
994+
const end = Date.now();
995+
expect(end - start).toBe(100);
996+
expect(end).toBe(baseTime.getTime() + 100);
997+
expect(new Date().getFullYear()).toEqual(2013);
998+
}));
999+
1000+
it('should mock date correctly without fakeAsync', () => {
9401001
const baseTime = new Date(2013, 9, 23);
9411002
jasmine.clock().mockDate(baseTime);
9421003
const start = Date.now();
@@ -945,9 +1006,21 @@ describe('FakeAsyncTestZoneSpec', () => {
9451006
const end = Date.now();
9461007
expect(end - start).toBe(100);
9471008
expect(end).toBe(baseTime.getTime() + 100);
948-
}));
1009+
expect(new Date().getFullYear()).toEqual(2013);
1010+
});
9491011

9501012
it('should handle new Date correctly', fakeAsync(() => {
1013+
const baseTime = new Date(2013, 9, 23);
1014+
jasmine.clock().mockDate(baseTime);
1015+
const start = new Date();
1016+
expect(start.getTime()).toBe(baseTime.getTime());
1017+
jasmine.clock().tick(100);
1018+
const end = new Date();
1019+
expect(end.getTime() - start.getTime()).toBe(100);
1020+
expect(end.getTime()).toBe(baseTime.getTime() + 100);
1021+
}));
1022+
1023+
it('should handle new Date correctly without fakeAsync', () => {
9511024
const baseTime = new Date(2013, 9, 23);
9521025
jasmine.clock().mockDate(baseTime);
9531026
const start = new Date();
@@ -956,11 +1029,27 @@ describe('FakeAsyncTestZoneSpec', () => {
9561029
const end = new Date();
9571030
expect(end.getTime() - start.getTime()).toBe(100);
9581031
expect(end.getTime()).toBe(baseTime.getTime() + 100);
959-
}));
1032+
});
1033+
1034+
it('should handle setTimeout correctly', fakeAsync(() => {
1035+
setTimeout(spy, 100);
1036+
expect(spy).not.toHaveBeenCalled();
1037+
jasmine.clock().tick(100);
1038+
expect(spy).toHaveBeenCalled();
1039+
}));
1040+
1041+
it('should handle setTimeout correctly without fakeAsync', () => {
1042+
setTimeout(spy, 100);
1043+
expect(spy).not.toHaveBeenCalled();
1044+
jasmine.clock().tick(100);
1045+
expect(spy).toHaveBeenCalled();
1046+
});
9601047
}));
9611048

9621049
describe('fakeAsyncTest should patch jasmine.clock', ifEnvSupports(supportClock, () => {
1050+
let spy: any;
9631051
beforeEach(() => {
1052+
spy = jasmine.createSpy('timer');
9641053
jasmine.clock().install();
9651054
});
9661055

@@ -980,6 +1069,13 @@ describe('FakeAsyncTestZoneSpec', () => {
9801069
expect(end - start).toBe(100);
9811070
});
9821071

1072+
it('should tick correctly', () => {
1073+
const start = Date.now();
1074+
jasmine.clock().tick(100);
1075+
const end = Date.now();
1076+
expect(end - start).toBe(100);
1077+
});
1078+
9831079
it('should mock date correctly', () => {
9841080
const baseTime = new Date(2013, 9, 23);
9851081
jasmine.clock().mockDate(baseTime);
@@ -1001,6 +1097,13 @@ describe('FakeAsyncTestZoneSpec', () => {
10011097
expect(end.getTime() - start.getTime()).toBe(100);
10021098
expect(end.getTime()).toBe(baseTime.getTime() + 100);
10031099
});
1100+
1101+
it('should handle setTimeout correctly', () => {
1102+
setTimeout(spy, 100);
1103+
expect(spy).not.toHaveBeenCalled();
1104+
jasmine.clock().tick(100);
1105+
expect(spy).toHaveBeenCalled();
1106+
});
10041107
}));
10051108

10061109
describe('fakeAsyncTest should patch rxjs scheduler', ifEnvSupports(supportClock, () => {
@@ -1427,6 +1530,39 @@ const {fakeAsync, tick, discardPeriodicTasks, flush, flushMicrotasks} = fakeAsyn
14271530
expect(zoneInTest1).toBe(zoneInBeforeEach);
14281531
}));
14291532
});
1533+
1534+
describe('fakeAsync should work with Date', () => {
1535+
it('should get date diff correctly', fakeAsync(() => {
1536+
const start = Date.now();
1537+
tick(100);
1538+
const end = Date.now();
1539+
expect(end - start).toBe(100);
1540+
}));
1541+
1542+
it('should check date type correctly', fakeAsync(() => {
1543+
const d: any = new Date();
1544+
expect(d instanceof Date).toBe(true);
1545+
}));
1546+
1547+
it('should new Date with parameter correctly', fakeAsync(() => {
1548+
const d: Date = new Date(0);
1549+
expect(d.getFullYear()).toBeLessThan(1971);
1550+
const d1: Date = new Date('December 17, 1995 03:24:00');
1551+
expect(d1.getFullYear()).toEqual(1995);
1552+
const d2: Date = new Date(1995, 11, 17, 3, 24, 0);
1553+
expect(d2.getFullYear()).toEqual(1995);
1554+
}));
1555+
1556+
it('should get Date.UTC() correctly', fakeAsync(() => {
1557+
const utcDate = new Date(Date.UTC(96, 11, 1, 0, 0, 0));
1558+
expect(utcDate.getFullYear()).toBe(1996);
1559+
}));
1560+
1561+
it('should call Date.parse() correctly', fakeAsync(() => {
1562+
const unixTimeZero = Date.parse('01 Jan 1970 00:00:00 GMT');
1563+
expect(unixTimeZero).toBe(0);
1564+
}));
1565+
});
14301566
});
14311567

14321568
describe('ProxyZone', () => {

0 commit comments

Comments
 (0)