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

refactor(test): remove explicit calls to flushMicrotasks() 

flushMicrotasks() is now called at after the fakeAsync callback returns,
see https://github.com/angular/angular/pull/2290
This commit is contained in:
Victor Berchet 2015-06-04 09:58:22 +02:00
parent 81fc657356
commit 309ef0f354
2 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/angular2/test/forms/integration_spec.ts
View File

@ -422,7 +422,6 @@ export function main() {
expect(ctx.name).toEqual("updatedValue"); expect(ctx.name).toEqual("updatedValue");
}); });
flushMicrotasks();
}))); })));
it("should support ng-model for single fields", it("should support ng-model for single fields",
@ -447,7 +446,6 @@ export function main() {
expect(ctx.name).toEqual("updatedValue"); expect(ctx.name).toEqual("updatedValue");
}); });
flushMicrotasks();
}))); })));
describe("template-driven forms", () => { describe("template-driven forms", () => {
@ -473,7 +471,6 @@ export function main() {
expect(form.controls['user']).toBeDefined(); expect(form.controls['user']).toBeDefined();
expect(form.controls['user'].controls['login']).toBeDefined(); expect(form.controls['user'].controls['login']).toBeDefined();
}); });
flushMicrotasks();
}))); })));
it("should not create a template-driven form when ng-no-form is used", it("should not create a template-driven form when ng-no-form is used",
@ -489,7 +486,6 @@ export function main() {
expect(view.rawView.elementInjectors.length).toEqual(0); expect(view.rawView.elementInjectors.length).toEqual(0);
}); });
flushMicrotasks();
}))); })));
it("should remove controls", inject([TestBed], fakeAsync(tb => { it("should remove controls", inject([TestBed], fakeAsync(tb => {
@ -517,7 +513,6 @@ export function main() {
expect(form.controls['login']).not.toBeDefined(); expect(form.controls['login']).not.toBeDefined();
}); });
flushMicrotasks();
}))); })));
it("should remove control groups", it("should remove control groups",
@ -574,7 +569,6 @@ export function main() {
expect(ctx.name).toEqual("updatedValue"); expect(ctx.name).toEqual("updatedValue");
}); });
flushMicrotasks();
}))); })));
@ -697,7 +691,6 @@ export function main() {
.toEqual(["ng-binding", "ng-touched", "ng-dirty", "ng-valid"]); .toEqual(["ng-binding", "ng-touched", "ng-dirty", "ng-valid"]);
tick(); tick();
}); });
flushMicrotasks();
}))); })));
}); });
}); });
@ -734,4 +727,4 @@ class MyComp {
mc.name = name; mc.name = name;
return mc; return mc;
} }
} }

1
modules/angular2/test/forms/model_spec.ts
View File

@ -10,7 +10,6 @@ import {
el, el,
AsyncTestCompleter, AsyncTestCompleter,
fakeAsync, fakeAsync,
flushMicrotasks,
tick, tick,
inject inject
} from 'angular2/test_lib'; } from 'angular2/test_lib';