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

Commit 5ceb5fc

Browse files
committed
fix rxjs to 5.4.2
1 parent f6d442f commit 5ceb5fc

File tree

2 files changed

+9
-13
lines changed

2 files changed

+9
-13
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
"phantomjs": "^2.1.7",
8888
"promises-aplus-tests": "^2.1.2",
8989
"pump": "^1.0.1",
90-
"rxjs": "^5.4.2",
90+
"rxjs": "5.4.2",
9191
"selenium-webdriver": "^3.4.0",
9292
"systemjs": "^0.19.37",
9393
"ts-loader": "^0.6.0",

test/common/setInterval.spec.ts

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -61,30 +61,26 @@ describe('setInterval', function() {
6161
});
6262

6363
it('should not cancel the task after invoke the setInterval callback', (done) => {
64-
const logs: string[] = [];
65-
const hasTaskSpy = jasmine.createSpy('hasTask');
64+
const logs: HasTaskState[] = [];
6665
const zone = Zone.current.fork({
6766
name: 'interval',
6867
onHasTask:
6968
(delegate: ZoneDelegate, currentZone: Zone, targetZone: Zone, hasTask: HasTaskState) => {
70-
hasTaskSpy(hasTask);
69+
logs.push(hasTask);
7170
return delegate.hasTask(targetZone, hasTask);
7271
}
7372
});
7473

7574
zone.run(() => {
76-
const timerId = setInterval(() => {
77-
logs.push('interval invoked');
78-
}, 100);
75+
const timerId = setInterval(() => {}, 100);
7976
(global as any)[Zone.__symbol__('setTimeout')](() => {
8077
expect(logs.length > 0).toBeTruthy();
81-
expect(hasTaskSpy)
82-
.toHaveBeenCalledWith(
83-
{microTask: false, macroTask: true, eventTask: false, change: 'macroTask'});
78+
expect(logs).toEqual(
79+
[{microTask: false, macroTask: true, eventTask: false, change: 'macroTask'}]);
8480
clearInterval(timerId);
85-
expect(hasTaskSpy.calls.allArgs()).toEqual([
86-
[{microTask: false, macroTask: true, eventTask: false, change: 'macroTask'}],
87-
[{microTask: false, macroTask: false, eventTask: false, change: 'macroTask'}]
81+
expect(logs).toEqual([
82+
{microTask: false, macroTask: true, eventTask: false, change: 'macroTask'},
83+
{microTask: false, macroTask: false, eventTask: false, change: 'macroTask'}
8884
]);
8985
done();
9086
}, 300);

0 commit comments

Comments
 (0)