cargdev/angular
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(fakeAsync): flush the microtasks before returning

Browse Source 
fixes #2269
This commit is contained in:
Victor Berchet
2015-06-02 19:55:03 +02:00
parent ec3a78289f
commit c7572ac1f9
3 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/angular2/src/test_lib/fake_async.dart
View File

@ -27,7 +27,7 @@ Function fakeAsync(Function fn) {
a7 = _u, a8 = _u, a9 = _u]) {
// runZoned() to install a custom exception handler that re-throws
return runZoned(() {
new quiver.FakeAsync().run((quiver.FakeAsync async) {
return new quiver.FakeAsync().run((quiver.FakeAsync async) {
try {
_fakeAsync = async;
List args = [
@ -42,7 +42,9 @@ Function fakeAsync(Function fn) {
a8,
a9
].takeWhile((a) => a != _u).toList();
return Function.apply(fn, args);
var res = Function.apply(fn, args);
_fakeAsync.flushMicrotasks();
return res;
} finally {
_fakeAsync = null;
}

6
modules/angular2/src/test_lib/fake_async.ts
View File

@ -46,7 +46,11 @@ export function fakeAsync(fn: Function): Function {
ListWrapper.clear(_pendingPeriodicTimers);
ListWrapper.clear(_pendingTimers);
var res = fakeAsyncZone.run(() => { var res = fn(... args); });
let res = fakeAsyncZone.run(() => {
let res = fn(... args);
flushMicrotasks();
return res;
});
if (_pendingPeriodicTimers.length > 0) {
throw new BaseException(