From da8f6b2c761af80a8c85dc9083cb555f9cb565ce Mon Sep 17 00:00:00 2001 From: rorticus Date: Tue, 22 Aug 2017 10:15:27 -0400 Subject: [PATCH] Removing this:any in favor of the correct types --- tests/functional/asyncAwait.ts | 6 +- tests/unit/Map.ts | 15 ++--- tests/unit/Promise.ts | 107 +++++++++++++++++---------------- tests/unit/Symbol.ts | 2 +- tests/unit/support/queue.ts | 14 ++--- 5 files changed, 74 insertions(+), 70 deletions(-) diff --git a/tests/functional/asyncAwait.ts b/tests/functional/asyncAwait.ts index c46e824..60f275b 100644 --- a/tests/functional/asyncAwait.ts +++ b/tests/functional/asyncAwait.ts @@ -3,7 +3,7 @@ const { assert } = intern.getPlugin('chai'); import pollUntil from '@theintern/leadfoot/helpers/pollUntil'; registerSuite('asyncAwait', { - 'Async/Await with Bluebird'(this: any) { + 'Async/Await with Bluebird'() { return this.remote .get(( require).toUrl('./bluebird.html')) .then(pollUntil(function () { @@ -14,7 +14,7 @@ registerSuite('asyncAwait', { }); }, - 'Async/Await with Dojo'(this: any) { + 'Async/Await with Dojo'() { return this.remote .get(( require).toUrl('./asyncAwait.html')) .then(pollUntil(function () { @@ -25,7 +25,7 @@ registerSuite('asyncAwait', { }); }, - 'Async/Await with Bluebird and Dojo'(this: any) { + 'Async/Await with Bluebird and Dojo'() { return this.remote .get(( require).toUrl('./bluebirdAndDojo.html')) .then(pollUntil(function () { diff --git a/tests/unit/Map.ts b/tests/unit/Map.ts index 5442375..25b65a6 100644 --- a/tests/unit/Map.ts +++ b/tests/unit/Map.ts @@ -1,5 +1,6 @@ import { forOf, isIterable, IterableIterator, ShimIterator } from '../../src/iterator'; import Map from '../../src/Map'; +import { Tests } from 'intern/lib/interfaces/object'; const { registerSuite } = intern.getInterface('object'); const { assert } = intern.getPlugin('chai'); @@ -55,7 +56,7 @@ registerSuite('Map', { } }, - 'delete': { + 'delete': { before() { map = new Map([ [ 3, 'abc' ], @@ -100,8 +101,8 @@ registerSuite('Map', { }); }, - forEach: { - before(this: any) { + forEach: { + before() { function foo() {} const object = Object.create(null); const array: any[] = []; @@ -133,8 +134,8 @@ registerSuite('Map', { } }, - get: { - before(this: any) { + get: { + before() { map = new Map([ [ 0, 'a' ], [ 8, 'b' ], @@ -154,8 +155,8 @@ registerSuite('Map', { } }, - has: { - before(this: any) { + has: { + before() { map = new Map([ [ 3, 'abc' ] ]); diff --git a/tests/unit/Promise.ts b/tests/unit/Promise.ts index f9aaa7d..ddd6193 100644 --- a/tests/unit/Promise.ts +++ b/tests/unit/Promise.ts @@ -2,6 +2,7 @@ import { Thenable } from '../../src/interfaces'; import Promise from '../../src/Promise'; import { ShimIterator } from '../../src/iterator'; import '../../src/Symbol'; +import { Tests } from 'intern/lib/interfaces/object'; const { registerSuite } = intern.getInterface('object'); const { assert } = intern.getPlugin('chai'); @@ -11,7 +12,7 @@ type TypeUnderTest = typeof Promise; /* tslint:disable-next-line:variable-name */ export function addPromiseTests(suite: any, Promise: TypeUnderTest) { suite['.all'] = { - 'empty array': function (this: any) { + 'empty array': function () { let dfd = this.async(); let promise = Promise.all([]).then(dfd.callback(function (value: any[]) { assert.isArray(value); @@ -20,7 +21,7 @@ export function addPromiseTests(suite: any, Promise: TypeUnderTest) { assert.instanceOf(promise, Promise, 'promise should have expected type'); }, - 'mixed values and resolved': function (this: any) { + 'mixed values and resolved': function () { let dfd = this.async(); Promise.all([ 0, Promise.resolve(1), Promise.resolve(2) ]).then( dfd.callback(function (value: number[]) { @@ -30,7 +31,7 @@ export function addPromiseTests(suite: any, Promise: TypeUnderTest) { ); }, - 'iterable argument': function (this: any) { + 'iterable argument': function () { let dfd = this.async(); Promise.all({ [Symbol.iterator]() { @@ -46,7 +47,7 @@ export function addPromiseTests(suite: any, Promise: TypeUnderTest) { ); }, - 'reject if any rejected': function (this: any) { + 'reject if any rejected': function () { let dfd = this.async(); let pending = new Promise(function () {}); let rejected = Promise.reject(new Error('rejected')); @@ -61,7 +62,7 @@ export function addPromiseTests(suite: any, Promise: TypeUnderTest) { ); }, - 'foreign thenables': function (this: any) { + 'foreign thenables': function () { let dfd = this.async(); let normal = Promise.resolve(1); let foreign = { @@ -75,7 +76,7 @@ export function addPromiseTests(suite: any, Promise: TypeUnderTest) { })); }, - 'non-callable thenables': function (this: any) { + 'non-callable thenables': function () { let dfd = this.async(); let normal = Promise.resolve(1); let foreign = { then: 'foo' }; @@ -85,36 +86,38 @@ export function addPromiseTests(suite: any, Promise: TypeUnderTest) { })); }, - 'sparse array': { - all(this: any) { - let dfd = this.async(); - let iterable: any[] = []; + 'sparse array': { + tests: { + all() { + let dfd = this.async(); + let iterable: any[] = []; - iterable[1] = Promise.resolve(1); - iterable[3] = Promise.resolve(3); + iterable[1] = Promise.resolve(1); + iterable[3] = Promise.resolve(3); - Promise.all(iterable).then(dfd.callback(function (value: number[]) { - assert.isUndefined(value[0]); - assert.strictEqual(value[1], 1); - assert.isUndefined(value[2]); - assert.strictEqual(value[3], 3); - })); - }, + Promise.all(iterable).then(dfd.callback(function (value: number[]) { + assert.isUndefined(value[0]); + assert.strictEqual(value[1], 1); + assert.isUndefined(value[2]); + assert.strictEqual(value[3], 3); + })); + }, - race(this: any) { - let dfd = this.async(); - let iterable: any[] = []; + race() { + let dfd = this.async(); + let iterable: any[] = []; - iterable[1] = Promise.resolve(1); - iterable[3] = Promise.resolve(3); + iterable[1] = Promise.resolve(1); + iterable[3] = Promise.resolve(3); - Promise.race(iterable).then(dfd.callback(function (value: number) { - assert.isUndefined(value); - })); + Promise.race(iterable).then(dfd.callback(function (value: number) { + assert.isUndefined(value); + })); + } } }, - 'value not input': function (this: any) { + 'value not input': function () { let dfd = this.async(); let iterable = [ 0, 1 ]; @@ -123,7 +126,7 @@ export function addPromiseTests(suite: any, Promise: TypeUnderTest) { })); }, - 'non-promise thenables': function (this: any) { + 'non-promise thenables': function () { let dfd = this.async(); let thenable = { then(resolve: (_: string) => void) { @@ -139,7 +142,7 @@ export function addPromiseTests(suite: any, Promise: TypeUnderTest) { }; suite['.race'] = { - 'empty array': function (this: any) { + 'empty array': function () { let dfd = this.async(); Promise.race([]).then(dfd.rejectOnError(function () { assert.fail(false, true, 'Promise should not have resolved'); @@ -147,7 +150,7 @@ export function addPromiseTests(suite: any, Promise: TypeUnderTest) { setTimeout(dfd.callback(function () {}), 10); }, - 'mixed values and resolved': function (this: any) { + 'mixed values and resolved': function () { let dfd = this.async(); Promise.race([ 0, Promise.resolve(1), Promise.resolve(2) ]) .then(dfd.callback(function (value: any) { @@ -155,7 +158,7 @@ export function addPromiseTests(suite: any, Promise: TypeUnderTest) { })); }, - 'iterable argument': function (this: any) { + 'iterable argument': function () { let dfd = this.async(); Promise.race({ [Symbol.iterator]() { @@ -170,7 +173,7 @@ export function addPromiseTests(suite: any, Promise: TypeUnderTest) { ); }, - 'reject if any rejected': function (this: any) { + 'reject if any rejected': function () { let dfd = this.async(); let pending = new Promise(function () {}); let rejected = Promise.reject(new Error('rejected')); @@ -183,7 +186,7 @@ export function addPromiseTests(suite: any, Promise: TypeUnderTest) { })); }, - 'foreign thenables': function (this: any) { + 'foreign thenables': function () { let dfd = this.async(); let normal = Promise.resolve(1); let foreign = { @@ -199,7 +202,7 @@ export function addPromiseTests(suite: any, Promise: TypeUnderTest) { }; suite['.reject'] = { - error(this: any) { + error() { let dfd = this.async(); let resolved = false; let promise = Promise.reject(new Error('foo')).then( @@ -218,7 +221,7 @@ export function addPromiseTests(suite: any, Promise: TypeUnderTest) { assert.isFalse(resolved, 'promise should not have resolved synchronously'); }, - 'rejected thenable'(this: any) { + 'rejected thenable'() { let dfd = this.async(); let resolved = false; let thenable = { @@ -244,7 +247,7 @@ export function addPromiseTests(suite: any, Promise: TypeUnderTest) { }; suite['.resolve'] = { - 'simple value'(this: any) { + 'simple value'() { let dfd = this.async(); let resolved = false; let promise = Promise.resolve('foo').then( @@ -262,7 +265,7 @@ export function addPromiseTests(suite: any, Promise: TypeUnderTest) { assert.isFalse(resolved, 'promise should not have resolved synchronously'); }, - thenable(this: any) { + thenable() { let dfd = this.async(); let resolved = false; let thenable = { @@ -287,7 +290,7 @@ export function addPromiseTests(suite: any, Promise: TypeUnderTest) { }; suite['#catch'] = { - rejection: function (this: any) { + rejection: function () { let dfd = this.async(); let error = new Error('foo'); Promise.reject(error).catch(dfd.callback(function (err: Error) { @@ -295,7 +298,7 @@ export function addPromiseTests(suite: any, Promise: TypeUnderTest) { })); }, - identity: function (this: any) { + identity: function () { let dfd = this.async(); let error = new Error('foo'); Promise.reject(error) @@ -307,7 +310,7 @@ export function addPromiseTests(suite: any, Promise: TypeUnderTest) { })); }, - 'resolver throws': function (this: any) { + 'resolver throws': function () { let dfd = this.async(); let error = new Error('foo'); @@ -320,7 +323,7 @@ export function addPromiseTests(suite: any, Promise: TypeUnderTest) { })); }, - 'handler throws': function (this: any) { + 'handler throws': function () { let dfd = this.async(); let error = new Error('foo'); Promise.resolve(5) @@ -332,8 +335,8 @@ export function addPromiseTests(suite: any, Promise: TypeUnderTest) { })); }, - 'then throws': { - 'from resolver': function (this: any) { + 'then throws': { + 'from resolver': function () { let dfd = this.async(); let error = new Error('foo'); let foreign = { @@ -350,7 +353,7 @@ export function addPromiseTests(suite: any, Promise: TypeUnderTest) { })); }, - 'from handler': function (this: any) { + 'from handler': function () { let dfd = this.async(); let error = new Error('foo'); let foreign = { @@ -369,7 +372,7 @@ export function addPromiseTests(suite: any, Promise: TypeUnderTest) { }, 'then throws': { - 'from resolver': function (this: any) { + 'from resolver': function () { let dfd = this.async(); let error = new Error('foo'); let foreign = { @@ -386,7 +389,7 @@ export function addPromiseTests(suite: any, Promise: TypeUnderTest) { })); }, - 'from handler': function (this: any) { + 'from handler': function () { let dfd = this.async(); let error = new Error('foo'); let foreign = { @@ -408,14 +411,14 @@ export function addPromiseTests(suite: any, Promise: TypeUnderTest) { }; suite['#then'] = { - fulfillment: function (this: any) { + fulfillment: function () { let dfd = this.async(); Promise.resolve(5).then(dfd.callback(function (value: number) { assert.strictEqual(value, 5); })); }, - identity: function (this: any) { + identity: function () { let dfd = this.async(); Promise.resolve(5).then(undefined, dfd.rejectOnError(function (value: Error) { assert(false, 'Should not have resolved'); @@ -424,7 +427,7 @@ export function addPromiseTests(suite: any, Promise: TypeUnderTest) { })); }, - 'resolve once': function (this: any) { + 'resolve once': function () { let dfd = this.async(); let evilPromise = { then: (f?: Function, r?: Function) => { @@ -445,7 +448,7 @@ export function addPromiseTests(suite: any, Promise: TypeUnderTest) { }; suite.constructed = { - resolved(this: any) { + resolved() { let dfd = this.async(); let resolver: any; let resolved = false; @@ -463,7 +466,7 @@ export function addPromiseTests(suite: any, Promise: TypeUnderTest) { resolver(); }, - rejected(this: any) { + rejected() { let dfd = this.async(); let resolver: any; let resolved = false; diff --git a/tests/unit/Symbol.ts b/tests/unit/Symbol.ts index cb185df..99d2308 100644 --- a/tests/unit/Symbol.ts +++ b/tests/unit/Symbol.ts @@ -5,7 +5,7 @@ const { registerSuite } = intern.getInterface('object'); const { assert } = intern.getPlugin('chai'); registerSuite('Symbol', { - native: function (this: any) { + native: function () { if (!has('es6-symbol')) { this.skip('checking native implementation'); } diff --git a/tests/unit/support/queue.ts b/tests/unit/support/queue.ts index 8435960..c2794e2 100644 --- a/tests/unit/support/queue.ts +++ b/tests/unit/support/queue.ts @@ -6,7 +6,7 @@ const { registerSuite } = intern.getInterface('object'); const { assert } = intern.getPlugin('chai'); registerSuite('queue functions', { - '.queueTask()': function (this: any) { + '.queueTask()': function () { const dfd = this.async(5000); const parts: string[] = []; @@ -34,7 +34,7 @@ registerSuite('queue functions', { }), 300); }, - '.queueTask() => handle.destroy()': function (this: any) { + '.queueTask() => handle.destroy()': function () { const dfd = this.async(5000); let parts: string[]; @@ -54,7 +54,7 @@ registerSuite('queue functions', { }), 100); }, - '.queueAnimationTask()': function (this: any) { + '.queueAnimationTask()': function () { if (!has('host-browser')) { this.skip('browser required.'); } @@ -86,7 +86,7 @@ registerSuite('queue functions', { }), 300); }, - '.queueAnimationTask() => handle.destroy()': function (this: any) { + '.queueAnimationTask() => handle.destroy()': function () { if (!has('host-browser')) { this.skip('browser required.'); } @@ -110,7 +110,7 @@ registerSuite('queue functions', { }), 100); }, - '.queueMicroTask()': function (this: any) { + '.queueMicroTask()': function () { const dfd = this.async(5000); const parts: string[] = []; @@ -148,7 +148,7 @@ registerSuite('queue functions', { }), 1000); }, - '.queueMicroTask() => handle.destroy()': function (this: any) { + '.queueMicroTask() => handle.destroy()': function () { const dfd = this.async(5000); let parts: string[]; @@ -169,7 +169,7 @@ registerSuite('queue functions', { }, 'web workers': { - 'queue from webworker': function (this: any) { + 'queue from webworker': function () { if (global.Blob === undefined || global.Worker === undefined) { this.skip('does not support blobs and/or web workers'); return;