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

chore: update zone.js to 0.5.1

Browse Source 
fix #1862
This commit is contained in:
Victor Berchet
2015-05-19 09:13:17 +02:00
parent ad95601e3c
commit 94272af45b
6 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,10 +25,9 @@ interface FakeAsyncZone extends NgZoneZone {
* @returns {Function} The function wrapped to be executed in the fakeAsync zone
*/
export function fakeAsync(fn: Function): Function {
// TODO(vicb) re-enable once the jasmine patch from zone.js is applied
// if (global.zone._inFakeAsyncZone) {
// throw new Error('fakeAsync() calls can not be nested');
//}
if ((<FakeAsyncZone>global.zone)._inFakeAsyncZone) {
throw new Error('fakeAsync() calls can not be nested');
}
var fakeAsyncZone = <FakeAsyncZone>global.zone.fork({
setTimeout: _setTimeout,

12
modules/angular2/test/test_lib/fake_async_spec.ts
View File

@ -37,14 +37,10 @@ export function main() {
it('should work with inject()',
inject([Parser], fakeAsync((parser) => { expect(parser).toBeAnInstanceOf(Parser); })));
if (!IS_DARTIUM) {
it('should throw on nested calls', () => {
// TODO(vicb): re-enable once the jasmine patch from zone.js is applied
if (!IS_DARTIUM) return;
expect(() => { fakeAsync(() => { fakeAsync(() => null)(); })(); })
.toThrowError('fakeAsync() calls can not be nested');
});
}
it('should throw on nested calls', () => {
expect(() => { fakeAsync(() => { fakeAsync(() => null)(); })(); })
.toThrowError('fakeAsync() calls can not be nested');
});
it('should flush microtasks before returning', () => {
var thenRan = false;