honeymoose
/
angular-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(core): fix chained http call (#20924) 

Fixes an issue where chained http calls would prematurely call
testability whenStable callbacks after the first http call.

Fixes #20921

PR Close #20924
This commit is contained in:
Benjamin Ingberg 2017-12-10 17:08:12 +01:00 committed by Alex Eagle
parent fb4d84d5b8
commit 7e3f9a482a
2 changed files with 44 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
packages/core/src/testability/testability.ts
View File

@ -98,13 +98,22 @@ export class Testability implements PublicTestability {
/** @internal */
_runCallbacksIfReady(): void {
if (this.isStable()) {
// Schedules the call backs in a new frame so that it is always async.
scheduleMicroTask(() => {
while (this._callbacks.length !== 0) {
(this._callbacks.pop() !)(this._didWork);
}
if (this._callbacks.length !== 0) {
// Schedules the call backs after a macro task run outside of the angular zone to make sure
// no new task are added
this._ngZone.runOutsideAngular(() => {
setTimeout(() => {
if (this.isStable()) {
while (this._callbacks.length !== 0) {
(this._callbacks.pop() !)(this._didWork);
}
this._didWork = false;
}
});
});
} else {
this._didWork = false;
});
}
} else {
// Not Ready
this._didWork = true;

60
packages/core/test/testability/testability_spec.ts
View File

@ -16,13 +16,11 @@ import {scheduleMicroTask} from '../../src/util';
// Schedules a microtasks (using a resolved promise .then())
function microTask(fn: Function): void {
scheduleMicroTask(() => {
// We do double dispatch so that we can wait for scheduleMicrotask in the Testability when
// NgZone becomes stable.
scheduleMicroTask(fn);
});
// Schedules a task to be run after Testability checks for oustanding tasks. Since Testability
// uses a 0 second timeout to check for outstanding tasks we add our 0 second timeout after a
// micro task (which ensures Testability's timeout is run first).
function afterTestabilityCheck(fn: Function): void {
scheduleMicroTask(() => setTimeout(fn));
}
@Injectable()
@ -65,7 +63,7 @@ class MockNgZone extends NgZone {
it('should fire whenstable callbacks if pending count is 0',
inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
testability.whenStable(execute);
microTask(() => {
afterTestabilityCheck(() => {
expect(execute).toHaveBeenCalled();
async.done();
});
@ -82,11 +80,11 @@ class MockNgZone extends NgZone {
testability.increasePendingRequestCount();
testability.whenStable(execute);
microTask(() => {
afterTestabilityCheck(() => {
expect(execute).not.toHaveBeenCalled();
testability.decreasePendingRequestCount();
microTask(() => {
afterTestabilityCheck(() => {
expect(execute).not.toHaveBeenCalled();
async.done();
});
@ -98,11 +96,11 @@ class MockNgZone extends NgZone {
testability.increasePendingRequestCount();
testability.whenStable(execute);
microTask(() => {
afterTestabilityCheck(() => {
expect(execute).not.toHaveBeenCalled();
testability.decreasePendingRequestCount();
microTask(() => {
afterTestabilityCheck(() => {
expect(execute).toHaveBeenCalled();
async.done();
});
@ -120,7 +118,7 @@ class MockNgZone extends NgZone {
it('should fire whenstable callbacks with didWork if pending count is 0',
inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
testability.whenStable(execute);
microTask(() => {
afterTestabilityCheck(() => {
expect(execute).toHaveBeenCalledWith(false);
async.done();
});
@ -131,14 +129,14 @@ class MockNgZone extends NgZone {
testability.increasePendingRequestCount();
testability.whenStable(execute);
microTask(() => {
afterTestabilityCheck(() => {
testability.decreasePendingRequestCount();
microTask(() => {
afterTestabilityCheck(() => {
expect(execute).toHaveBeenCalledWith(true);
testability.whenStable(execute2);
microTask(() => {
afterTestabilityCheck(() => {
expect(execute2).toHaveBeenCalledWith(false);
async.done();
});
@ -154,7 +152,7 @@ class MockNgZone extends NgZone {
ngZone.stable();
testability.whenStable(execute);
microTask(() => {
afterTestabilityCheck(() => {
expect(execute).toHaveBeenCalled();
async.done();
});
@ -173,11 +171,11 @@ class MockNgZone extends NgZone {
ngZone.unstable();
testability.whenStable(execute);
microTask(() => {
afterTestabilityCheck(() => {
expect(execute).not.toHaveBeenCalled();
ngZone.stable();
microTask(() => {
afterTestabilityCheck(() => {
expect(execute).toHaveBeenCalled();
async.done();
});
@ -198,15 +196,15 @@ class MockNgZone extends NgZone {
testability.increasePendingRequestCount();
testability.whenStable(execute);
microTask(() => {
afterTestabilityCheck(() => {
expect(execute).not.toHaveBeenCalled();
testability.decreasePendingRequestCount();
microTask(() => {
afterTestabilityCheck(() => {
expect(execute).not.toHaveBeenCalled();
ngZone.stable();
microTask(() => {
afterTestabilityCheck(() => {
expect(execute).toHaveBeenCalled();
async.done();
});
@ -221,19 +219,19 @@ class MockNgZone extends NgZone {
testability.increasePendingRequestCount();
testability.whenStable(execute);
microTask(() => {
afterTestabilityCheck(() => {
expect(execute).not.toHaveBeenCalled();
ngZone.stable();
microTask(() => {
afterTestabilityCheck(() => {
expect(execute).not.toHaveBeenCalled();
testability.decreasePendingRequestCount();
microTask(() => {
afterTestabilityCheck(() => {
expect(execute).not.toHaveBeenCalled();
testability.decreasePendingRequestCount();
microTask(() => {
afterTestabilityCheck(() => {
expect(execute).toHaveBeenCalled();
async.done();
});
@ -248,11 +246,11 @@ class MockNgZone extends NgZone {
ngZone.stable();
testability.whenStable(execute);
microTask(() => {
afterTestabilityCheck(() => {
expect(execute).toHaveBeenCalledWith(true);
testability.whenStable(execute2);
microTask(() => {
afterTestabilityCheck(() => {
expect(execute2).toHaveBeenCalledWith(false);
async.done();
});
@ -264,14 +262,14 @@ class MockNgZone extends NgZone {
ngZone.unstable();
testability.whenStable(execute);
microTask(() => {
afterTestabilityCheck(() => {
ngZone.stable();
microTask(() => {
afterTestabilityCheck(() => {
expect(execute).toHaveBeenCalledWith(true);
testability.whenStable(execute2);
microTask(() => {
afterTestabilityCheck(() => {
expect(execute2).toHaveBeenCalledWith(false);
async.done();
});