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

chore(typings): use mainline DefinitelyTyped repo rather than a fork.

Browse Source 
The upstream Jasmine typings don't define a type for the global
object with Jasmine methods polluting it, so just use any.

Also zone.js has a different name upstream.
This commit is contained in:
Alex Eagle
2016-02-01 10:28:57 -08:00
committed by Alex Eagle
parent 1435763383
commit 2f31c4c1c5
7 changed files with 25 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/angular2/src/testing/matchers.ts
View File

@ -84,7 +84,7 @@ export interface NgMatchers extends jasmine.Matchers {
not: NgMatchers;
}
var _global: jasmine.GlobalPolluter = <any>(typeof window === 'undefined' ? global : window);
var _global = <any>(typeof window === 'undefined' ? global : window);
/**
* Jasmine matching function with Angular matchers mixed in.

2
modules/angular2/src/testing/testing.ts
View File

@ -18,7 +18,7 @@ export {inject, injectAsync} from './test_injector';
export {expect, NgMatchers} from './matchers';
var _global: jasmine.GlobalPolluter = <any>(typeof window === 'undefined' ? global : window);
var _global = <any>(typeof window === 'undefined' ? global : window);
/**
* Run a function (with an optional asynchronous callback) after each test case.

2
modules/angular2/src/testing/testing_internal.ts
View File

@ -14,7 +14,7 @@ export {expect, NgMatchers} from './matchers';
export var proxy: ClassDecorator = (t) => t;
var _global: jasmine.GlobalPolluter = <any>(typeof window === 'undefined' ? global : window);
var _global = <any>(typeof window === 'undefined' ? global : window);
export var afterEach: Function = _global.afterEach;