From 2f31c4c1c5ae996be1afbd171b89322c16a260d9 Mon Sep 17 00:00:00 2001 From: Alex Eagle Date: Mon, 1 Feb 2016 10:28:57 -0800 Subject: [PATCH] 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. --- modules/angular1_router/tsd.json | 4 ++-- modules/angular2/src/testing/matchers.ts | 2 +- modules/angular2/src/testing/testing.ts | 2 +- .../angular2/src/testing/testing_internal.ts | 2 +- modules/angular2/tsd.json | 23 +++++++++++-------- .../e2e_test/material/progress_linear_spec.ts | 3 ++- tools/tsd.json | 10 ++++---- 7 files changed, 25 insertions(+), 21 deletions(-) diff --git a/modules/angular1_router/tsd.json b/modules/angular1_router/tsd.json index 481137d5eb..c3a826654c 100644 --- a/modules/angular1_router/tsd.json +++ b/modules/angular1_router/tsd.json @@ -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" } } } diff --git a/modules/angular2/src/testing/matchers.ts b/modules/angular2/src/testing/matchers.ts index 79e21f7236..7061afe180 100644 --- a/modules/angular2/src/testing/matchers.ts +++ b/modules/angular2/src/testing/matchers.ts @@ -84,7 +84,7 @@ export interface NgMatchers extends jasmine.Matchers { not: NgMatchers; } -var _global: jasmine.GlobalPolluter = (typeof window === 'undefined' ? global : window); +var _global = (typeof window === 'undefined' ? global : window); /** * Jasmine matching function with Angular matchers mixed in. diff --git a/modules/angular2/src/testing/testing.ts b/modules/angular2/src/testing/testing.ts index 0eaff9ce05..9fd9637c71 100644 --- a/modules/angular2/src/testing/testing.ts +++ b/modules/angular2/src/testing/testing.ts @@ -18,7 +18,7 @@ export {inject, injectAsync} from './test_injector'; export {expect, NgMatchers} from './matchers'; -var _global: jasmine.GlobalPolluter = (typeof window === 'undefined' ? global : window); +var _global = (typeof window === 'undefined' ? global : window); /** * Run a function (with an optional asynchronous callback) after each test case. diff --git a/modules/angular2/src/testing/testing_internal.ts b/modules/angular2/src/testing/testing_internal.ts index 72ca9ebb10..43a7e1c19b 100644 --- a/modules/angular2/src/testing/testing_internal.ts +++ b/modules/angular2/src/testing/testing_internal.ts @@ -14,7 +14,7 @@ export {expect, NgMatchers} from './matchers'; export var proxy: ClassDecorator = (t) => t; -var _global: jasmine.GlobalPolluter = (typeof window === 'undefined' ? global : window); +var _global = (typeof window === 'undefined' ? global : window); export var afterEach: Function = _global.afterEach; diff --git a/modules/angular2/tsd.json b/modules/angular2/tsd.json index cb6567ac13..b551a87bba 100644 --- a/modules/angular2/tsd.json +++ b/modules/angular2/tsd.json @@ -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" } } } diff --git a/modules/playground/e2e_test/material/progress_linear_spec.ts b/modules/playground/e2e_test/material/progress_linear_spec.ts index e1f852401d..1ff8e29f7c 100644 --- a/modules/playground/e2e_test/material/progress_linear_spec.ts +++ b/modules/playground/e2e_test/material/progress_linear_spec.ts @@ -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 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); diff --git a/tools/tsd.json b/tools/tsd.json index 87c70954a4..d3de3c7bdd 100644 --- a/tools/tsd.json +++ b/tools/tsd.json @@ -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" } } }