From a8087243839f00c8e40738f96c2e212082d11123 Mon Sep 17 00:00:00 2001 From: Ambrose Chua Date: Thu, 30 Sep 2021 11:56:57 +0800 Subject: [PATCH] Fix lint errors --- fixtures/fetch.js | 8 ++++---- package.json | 1 + src/browser-drivers.ts | 16 +--------------- src/index.ts | 1 + src/platform-browser.ts | 2 +- src/platform-deno.ts | 10 ++++------ src/platform-node.ts | 5 ++--- src/server.ts | 2 -- 8 files changed, 14 insertions(+), 31 deletions(-) diff --git a/fixtures/fetch.js b/fixtures/fetch.js index 4720e42..b2d1255 100644 --- a/fixtures/fetch.js +++ b/fixtures/fetch.js @@ -9,7 +9,7 @@ const tests = { signal: ctrl.signal, }); const o = await response.json(); - return `Cookie: ${o.headers['Cookie']}`; + return `Cookie: ${o.headers.Cookie}`; } catch (error) { return error.toString(); } @@ -23,7 +23,7 @@ const tests = { signal: ctrl.signal, }); const o = await response.json(); - return `Referer: ${o.headers['Referer']}`; + return `Referer: ${o.headers.Referer}`; } catch (error) { return error.toString(); } @@ -51,7 +51,7 @@ const tests = { signal: ctrl.signal, }); const o = await response.json(); - return `Date: ${o.headers['Date']}`; + return `Date: ${o.headers.Date}`; } catch (error) { return error.toString(); } @@ -65,7 +65,7 @@ const tests = { signal: ctrl.signal, }); const o = await response.json(); - return `Host: ${o.headers['Host']}`; + return `Host: ${o.headers.Host}`; } catch (error) { return error.toString(); } diff --git a/package.json b/package.json index dc536c3..f6b9071 100644 --- a/package.json +++ b/package.json @@ -46,6 +46,7 @@ "unicorn/prefer-node-protocol": "off" }, "globals": [ + "Deno", "Request", "Response", "Headers", diff --git a/src/browser-drivers.ts b/src/browser-drivers.ts index c566cdd..46da337 100644 --- a/src/browser-drivers.ts +++ b/src/browser-drivers.ts @@ -42,19 +42,5 @@ export const firefox: BrowserDriver = { }; export const safari: BrowserDriver = { path: '/usr/bin/safaridriver', - args: (port: number, logLevel = 'warn') => { - const logLevelArg = { - trace: 'trace', - debug: 'debug', - info: 'info', - warn: 'warn', - error: 'error', - silent: 'fatal', - }[logLevel]; - if (!logLevelArg) { - throw new Error('invalid log level'); - } - - return ['-p', `${port}`, '-l', `${logLevelArg}`]; - }, + args: (port: number, _logLevel = 'none') => ['-p', `${port}`], }; diff --git a/src/index.ts b/src/index.ts index e606b02..c4bb5bc 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,3 +1,4 @@ +import process from 'process'; import path from 'path'; import logger from '@wdio/logger'; import Table from 'cli-table3'; diff --git a/src/platform-browser.ts b/src/platform-browser.ts index e12a91a..0f11b1a 100644 --- a/src/platform-browser.ts +++ b/src/platform-browser.ts @@ -6,7 +6,7 @@ import getPort from 'get-port'; import tcpPortUsed from 'tcp-port-used'; import WebDriver from 'webdriver'; -import {Platform, Result, BrowserDriver, Context} from './types.js'; +import {Platform, Context, Result, BrowserDriver} from './types.js'; async function start( driver: BrowserDriver, diff --git a/src/platform-deno.ts b/src/platform-deno.ts index 44b0703..d7db80d 100644 --- a/src/platform-deno.ts +++ b/src/platform-deno.ts @@ -1,13 +1,10 @@ import {platform} from 'os'; import {spawn} from 'child_process'; -import logger from '@wdio/logger'; -import {Platform, Result} from './types.js'; - -const log = logger('fetch-compare'); +import {Platform, Context, Result} from './types.js'; export default class PlatformDeno implements Platform { - async run(ctx: Record, file: string): Promise { + async run(ctx: Context, file: string): Promise { const child = spawn( platform() === 'win32' ? 'deno.exe' : 'deno', ['run', '--allow-read', '--allow-net=httpbin.org', 'index-deno.js', file], @@ -23,11 +20,12 @@ export default class PlatformDeno implements Platform { if (code !== 0) { reject(code); } + resolve(stdout); }); }); child.kill(); - return JSON.parse(stdout); + return JSON.parse(stdout) as Result; } } diff --git a/src/platform-node.ts b/src/platform-node.ts index c7a1a83..d2b6d78 100644 --- a/src/platform-node.ts +++ b/src/platform-node.ts @@ -1,11 +1,10 @@ -import process from 'process'; import {fork} from 'child_process'; import path from 'path'; -import {Platform, Result} from './types.js'; +import {Platform, Context, Result} from './types.js'; export default class PlatformNode implements Platform { - async run(ctx: Record, file: string): Promise { + async run(ctx: Context, file: string): Promise { const child = fork(path.join(ctx.fixturesPath, 'index-node.js'), [file], { cwd: ctx.fixturesPath, }); diff --git a/src/server.ts b/src/server.ts index d276ed5..40667cf 100644 --- a/src/server.ts +++ b/src/server.ts @@ -1,6 +1,4 @@ -import process from 'process'; import net from 'net'; -import path from 'path'; import Koa from 'koa'; import files from 'koa-files';