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

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

View File

@ -1,12 +1,12 @@
{
"version": "v4",
"repo": "angular/DefinitelyTyped",
"repo": "DefinitelyTyped/DefinitelyTyped",
"ref": "master",
"path": "typings",
"bundle": "typings/tsd.d.ts",
"installed": {
"angularjs/angular.d.ts": {
"commit": "746b9a892629060bc853e792afff536e0ec4655e"
"commit": "6eebd5e90a1cbd6b47b0705ba72dbcd5baf846f3"
}
}
}

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.

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.

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;

View File

@ -1,30 +1,33 @@
{
"version": "v4",
"repo": "angular/DefinitelyTyped",
"repo": "DefinitelyTyped/DefinitelyTyped",
"ref": "master",
"path": "typings",
"bundle": "typings/tsd.d.ts",
"installed": {
"es6-shim/es6-shim.d.ts": {
"commit": "4b36b94d5910aa8a4d20bdcd5bd1f9ae6ad18d3c"
"es6-promise/es6-promise.d.ts": {
"commit": "6eebd5e90a1cbd6b47b0705ba72dbcd5baf846f3"
},
"es6-collections/es6-collections.d.ts": {
"commit": "6eebd5e90a1cbd6b47b0705ba72dbcd5baf846f3"
},
"hammerjs/hammerjs.d.ts": {
"commit": "22c44d95912a07f81c103a694330b15b92f7cb40"
"commit": "6eebd5e90a1cbd6b47b0705ba72dbcd5baf846f3"
},
"jasmine/jasmine.d.ts": {
"commit": "4b36b94d5910aa8a4d20bdcd5bd1f9ae6ad18d3c"
"commit": "6eebd5e90a1cbd6b47b0705ba72dbcd5baf846f3"
},
"node/node.d.ts": {
"commit": "51738fdf1643d269067861b405e87503b7479236"
"commit": "6eebd5e90a1cbd6b47b0705ba72dbcd5baf846f3"
},
"selenium-webdriver/selenium-webdriver.d.ts": {
"commit": "be0b6b394f77a59e192ad7cfec18078706e44db5"
"commit": "6eebd5e90a1cbd6b47b0705ba72dbcd5baf846f3"
},
"zone/zone.d.ts": {
"commit": "31e7317c9a0793857109236ef7c7f223305a8aa9"
"zone.js/zone.js.d.ts": {
"commit": "6eebd5e90a1cbd6b47b0705ba72dbcd5baf846f3"
},
"angular-protractor/angular-protractor.d.ts": {
"commit": "4207593c012565a7ea800ed861ffbe5011e7a501"
"commit": "6eebd5e90a1cbd6b47b0705ba72dbcd5baf846f3"
}
}
}

View File

@ -11,7 +11,8 @@ describe('md-progress-linear', function() {
var incrementButton = element(by.id('increment'));
var decrementButton = element(by.id('decrement'));
var initialValue = progressBar.getAttribute('aria-valuenow');
// Really a Promise<string> but can be coerced to a number after resolving
var initialValue: any = progressBar.getAttribute('aria-valuenow');
incrementButton.click();
expect(progressBar.getAttribute('aria-valuenow')).toBeGreaterThan(initialValue);

View File

@ -1,21 +1,21 @@
{
"version": "v4",
"repo": "angular/DefinitelyTyped",
"repo": "DefinitelyTyped/DefinitelyTyped",
"ref": "master",
"path": "typings",
"bundle": "typings/tsd.d.ts",
"installed": {
"fs-extra/fs-extra.d.ts": {
"commit": "fa52db59121913b35e9641a0f73ccc3ffba58840"
"commit": "6eebd5e90a1cbd6b47b0705ba72dbcd5baf846f3"
},
"node/node.d.ts": {
"commit": "285e6b692a5898ccc1dc19475187429deafb69d7"
"commit": "6eebd5e90a1cbd6b47b0705ba72dbcd5baf846f3"
},
"es6-promise/es6-promise.d.ts": {
"commit": "d5f92f93bdb49f332fa662ff1d0cc8700f02e4dc"
"commit": "6eebd5e90a1cbd6b47b0705ba72dbcd5baf846f3"
},
"jasmine/jasmine.d.ts": {
"commit": "5996649b8eecebbd6dd2e25a6a254de1b169a65c"
"commit": "6eebd5e90a1cbd6b47b0705ba72dbcd5baf846f3"
}
}
}