Fix linter issues

This commit is contained in:
Lukas Tetzlaff 2017-11-02 13:10:19 +01:00
parent 57e8b70644
commit b66faf461f
2 changed files with 191 additions and 181 deletions

View file

@ -1,139 +1,140 @@
import * as util from 'util';
import test, { TestContext, Context } from 'ava';
import test, {TestContext, Context} from 'ava';
import * as jsdom from 'jsdom';
import m from '../src';
import m from '../src'; // tslint:disable-line:import-name
const isNode8orHigher = Number(process.versions.node.split('.')[0]) >= 8;
class PromiseSubclassFixture<T> extends Promise<T> {};
class ErrorSubclassFixture extends Error {};
/* Currently out of order, see https://github.com/Microsoft/TypeScript/issues/15202
class PromiseSubclassFixture<T> extends Promise<T> {}*/
class ErrorSubclassFixture extends Error {}
const document = new jsdom.JSDOM().window.document
const document = new jsdom.JSDOM().window.document;
const createDomElement = (el: string) => document.createElement(el);
type Test = { is: (value: any) => boolean, fixtures: any[] }
interface Test {is(value: any): boolean; fixtures: any[]; }
const types = new Map<string, Test>([
['undefined',
{ is: m.undefined, fixtures: [undefined] }
],['null',
{ is: m.null_, fixtures: [null] }
],['string',
{ is: m.string, fixtures: [
['undefined',
{is: m.undefined, fixtures: [undefined]}
], ['null',
{is: m.null_, fixtures: [null]}
], ['string',
{is: m.string, fixtures: [
'🦄',
'hello world',
''
] }
],['number',
{ is: m.number, fixtures: [
]}
], ['number',
{is: m.number, fixtures: [
6,
1.4,
0,
-0,
Infinity,
-Infinity
] }
],['boolean',
{ is: m.boolean, fixtures: [true, false] }
],['symbol',
{ is: m.symbol, fixtures: [Symbol('🦄')] }
],['array',
{ is: m.array, fixtures: [[1, 2], new Array(2)] }
],['function',
{ is: m.function_, fixtures: [
function foo() {}, // eslint-disable-line func-names
function () {},
]}
], ['boolean',
{is: m.boolean, fixtures: [true, false]}
], ['symbol',
{is: m.symbol, fixtures: [Symbol('🦄')]}
], ['array',
{is: m.array, fixtures: [[1, 2], new Array(2)]} // tslint:disable-line:prefer-array-literal
], ['function',
{is: m.function_, fixtures: [
// tslint:disable:no-empty no-unused-variable only-arrow-functions no-function-expression
function foo() {}, // tslint:disable-line:no-unused
function() {},
() => {},
async function () {},
function * (): any {}
] }
],['buffer',
{ is: m.buffer, fixtures: [Buffer.from('🦄')] }
],['object',
{ is: m.object, fixtures: [
async function() {},
function *(): any {}
// tslint:enable:no-empty no-unused-variable only-arrow-functions no-function-expression
]}
], ['buffer',
{is: m.buffer, fixtures: [Buffer.from('🦄')]}
], ['object',
{is: m.object, fixtures: [
{x: 1},
Object.create({x: 1})
] }
],['regExp',
{ is: m.regExp, fixtures: [
]}
], ['regExp',
{is: m.regExp, fixtures: [
/\w/,
new RegExp('\\w')
] }
],['date',
{ is: m.date, fixtures: [new Date()] }
],['error',
{ is: m.error, fixtures: [
]}
], ['date',
{is: m.date, fixtures: [new Date()]}
], ['error',
{is: m.error, fixtures: [
new Error('🦄'),
new ErrorSubclassFixture()
] }
],['nativePromise',
{ is: m.nativePromise, fixtures: [
]}
], ['nativePromise',
{is: m.nativePromise, fixtures: [
Promise.resolve(),
// currently out of order, see https://github.com/Microsoft/TypeScript/issues/15202
//PromiseSubclassFixture.resolve()
] }
],['promise',
{ is: m.promise, fixtures: [{then() {}, catch() {}}] }
],['generator',
{ is: m.generator, fixtures: [(function * () {
yield 4;
})()] }
],['generatorFunction',
{ is: m.generatorFunction, fixtures: [function * () {
yield 4;
}] }
],['asyncFunction',
{ is: m.asyncFunction, fixtures: [
async function () {},
async () => {}
] }
],['map',
{ is: m.map, fixtures: [new Map()] }
],['set',
{ is: m.set, fixtures: [new Set()] }
],['weakSet',
{ is: m.weakSet, fixtures: [new WeakSet()] }
],['weakMap',
{ is: m.weakMap, fixtures: [new WeakMap()] }
],['int8Array',
{ is: m.int8Array, fixtures: [new Int8Array(0)] }
],['uint8Array',
{ is: m.uint8Array, fixtures: [new Uint8Array(0)] }
],['uint8ClampedArray',
{ is: m.uint8ClampedArray, fixtures: [new Uint8ClampedArray(0)] }
],['int16Array',
{ is: m.int16Array, fixtures: [new Int16Array(0)]}
],['uint16Array',
{ is: m.uint16Array, fixtures: [new Uint16Array(0)] }
],['int32Array',
{ is: m.int32Array, fixtures: [new Int32Array(0)] }
],['uint32Array',
{ is: m.uint32Array, fixtures: [new Uint32Array(0)] }
],['float32Array',
{ is: m.float32Array, fixtures: [new Float32Array(0)] }
],['float64Array',
{ is: m.float64Array, fixtures: [new Float64Array(0)] }
],['arrayBuffer',
{ is: m.arrayBuffer, fixtures: [new ArrayBuffer(10)] }
],['nan',
{ is: m.nan, fixtures: [NaN, Number.NaN] }
],['nullOrUndefined',
{ is: m.nullOrUndefined, fixtures: [null, undefined] }
],['plainObject',
{ is: m.plainObject, fixtures: [
// PromiseSubclassFixture.resolve()
]}
], ['promise',
{is: m.promise, fixtures: [{then() {}, catch() {}}]} // tslint:disable-line:no-empty
], ['generator',
{is: m.generator, fixtures: [
(function *() { yield 4; })() // tslint:disable-line
]}
], ['generatorFunction',
{is: m.generatorFunction, fixtures: [
function *() { yield 4; } // tslint:disable-line
]}
], ['asyncFunction',
{is: m.asyncFunction, fixtures: [
async function() {}, // tslint:disable-line:no-empty only-arrow-functions no-function-expression
async () => {} // tslint:disable-line:no-empty
]}
], ['map',
{is: m.map, fixtures: [new Map()]}
], ['set',
{is: m.set, fixtures: [new Set()]}
], ['weakSet',
{is: m.weakSet, fixtures: [new WeakSet()]}
], ['weakMap',
{is: m.weakMap, fixtures: [new WeakMap()]}
], ['int8Array',
{is: m.int8Array, fixtures: [new Int8Array(0)]}
], ['uint8Array',
{is: m.uint8Array, fixtures: [new Uint8Array(0)]}
], ['uint8ClampedArray',
{is: m.uint8ClampedArray, fixtures: [new Uint8ClampedArray(0)]}
], ['int16Array',
{is: m.int16Array, fixtures: [new Int16Array(0)]}
], ['uint16Array',
{is: m.uint16Array, fixtures: [new Uint16Array(0)]}
], ['int32Array',
{is: m.int32Array, fixtures: [new Int32Array(0)]}
], ['uint32Array',
{is: m.uint32Array, fixtures: [new Uint32Array(0)]}
], ['float32Array',
{is: m.float32Array, fixtures: [new Float32Array(0)]}
], ['float64Array',
{is: m.float64Array, fixtures: [new Float64Array(0)]}
], ['arrayBuffer',
{is: m.arrayBuffer, fixtures: [new ArrayBuffer(10)]}
], ['nan',
{is: m.nan, fixtures: [NaN, Number.NaN]}
], ['nullOrUndefined',
{is: m.nullOrUndefined, fixtures: [null, undefined]}
], ['plainObject',
{is: m.plainObject, fixtures: [
{x: 1},
Object.create(null),
new Object() // eslint-disable-line no-new-object
] }
],['integer',
{ is: m.integer, fixtures: [6] }
],['safeInteger',
{ is: m.safeInteger, fixtures: [
new Object()
]}
], ['integer',
{is: m.integer, fixtures: [6]}
], ['safeInteger',
{is: m.safeInteger, fixtures: [
Math.pow(2, 53) - 1,
-Math.pow(2, 53) + 1
] }
],['domElement',
{ is: m.domElement, fixtures: [
]}
], ['domElement',
{is: m.domElement, fixtures: [
'div',
'input',
'span',
@ -141,31 +142,34 @@ const types = new Map<string, Test>([
'canvas',
'script'
].map(createDomElement) }
],['non-domElements',
{ is: value => !m.domElement(value), fixtures: [
], ['non-domElements',
{is: value => !m.domElement(value), fixtures: [
document.createTextNode('data'),
document.createProcessingInstruction('xml-stylesheet', 'href="mycss.css" type="text/css"'),
document.createComment('This is a comment'),
document,
document.implementation.createDocumentType('svg:svg', '-//W3C//DTD SVG 1.1//EN', 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'),
document.implementation.createDocumentType('svg:svg', '-//W3C//DTD SVG 1.1//EN', 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'), // tslint:disable-line
document.createDocumentFragment()
] }
],['infinite',
{ is: m.infinite, fixtures: [Infinity, -Infinity] }
]}
], ['infinite',
{is: m.infinite, fixtures: [Infinity, -Infinity]}
]
]);
// This ensures a certain method matches only the types
// it's supposed to and none of the other methods' types
const testType = (t: TestContext & Context<any>, type: string, exclude?: Array<string>) => {
const test = types.get(type)
if (test === undefined) {
t.fail(`is.${type} not defined`)
return
}
const { is } = test as Test
/* This ensures a certain method matches only the types
it's supposed to and none of the other methods' types */
const testType = (t: TestContext & Context<any>, type: string, exclude?: string[]) => {
const testData = types.get(type);
types.forEach(({ fixtures }, key) => {
if (testData === undefined) {
t.fail(`is.${type} not defined`);
return;
}
const {is} = testData;
types.forEach(({fixtures}, key) => {
// TODO: Automatically exclude value types in other tests that we have in the current one.
// Could reduce the use of `exclude`.
if (exclude && exclude.indexOf(key) !== -1) {
@ -177,7 +181,7 @@ const testType = (t: TestContext & Context<any>, type: string, exclude?: Array<s
for (const fixture of fixtures) {
assert(is(fixture), `Value: ${util.inspect(fixture)}`);
}
})
});
};
test('is', t => {
@ -224,9 +228,15 @@ test('is.buffer', t => {
});
test('is.object', t => {
const testData = types.get('object')
if (testData === undefined) t.fail("is.object not defined")
for (const el of (testData as Test).fixtures) {
const testData = types.get('object');
if (testData === undefined) {
t.fail('is.object not defined');
return;
}
for (const el of testData.fixtures) {
t.true(m.object(el));
}
});
@ -381,7 +391,6 @@ test('is.safeInteger', t => {
t.false(m.safeInteger(-Math.pow(2, 53)));
});
test('is.plainObject', t => {
testType(t, 'plainObject', ['object', 'promise']);
});
@ -399,10 +408,10 @@ test('is.iterable', t => {
});
test('is.class', t => {
class Foo {}
class Foo {} // tslint:disable-line
const classDeclarations = [
Foo,
class Bar extends Foo {}
class Bar extends Foo {} // tslint:disable-line
];
for (const x of classDeclarations) {
@ -412,7 +421,7 @@ test('is.class', t => {
test('is.typedArray', t => {
// Typescript currently does not support empty constructors for these
// see https://github.com/Microsoft/TypeScript/issues/19680
// See https://github.com/Microsoft/TypeScript/issues/19680
const typedArrays = [
new Int8Array(0),
new Uint8Array(0),
@ -441,7 +450,7 @@ test('is.arrayLike', t => {
t.true(m.arrayLike('unicorn'));
t.false(m.arrayLike({}));
t.false(m.arrayLike(() => {}));
t.false(m.arrayLike(() => {})); // tslint:disable-line:no-empty
t.false(m.arrayLike(new Map()));
});