Skip to content
This repository was archived by the owner on Feb 26, 2024. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions lib/zone-spec/async-test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -61,15 +61,6 @@ class AsyncTestZoneSpec implements ZoneSpec {
return false;
}

onScheduleTask(delegate: ZoneDelegate, currentZone: Zone, targetZone: Zone, task: Task): Task {
if (task.type == 'macroTask' && task.source == 'setInterval') {
this._failCallback('Cannot use setInterval from within an async zone test.');
return;
}

return delegate.scheduleTask(targetZone, task);
}

onHasTask(delegate: ZoneDelegate, current: Zone, target: Zone, hasTaskState: HasTaskState) {
delegate.hasTask(target, hasTaskState);
if (hasTaskState.change == 'microTask') {
Expand Down
11 changes: 6 additions & 5 deletions test/zone-spec/async-test.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -259,21 +259,22 @@ describe('AsyncTestZoneSpec', function() {
});
}));

it('should fail if setInterval is used', (done) => {
it('should not fail if setInterval is used and canceled', (done) => {
const testZoneSpec = new AsyncTestZoneSpec(
() => {
done.fail('expected failCallback to be called');
done();
},
(err) => {
expect(err).toEqual('Cannot use setInterval from within an async zone test.');
done();
done.fail('async zone called failCallback unexpectedly');
},
'name');

const atz = Zone.current.fork(testZoneSpec);

atz.run(function() {
setInterval(() => {}, 100);
let id = setInterval(() => {
clearInterval(id);
}, 100);
});
});

Expand Down