Fix eslint errors

Author: mmarkelov

README.md

@@ -38,20 +38,21 @@ You can specify browser in multiple ways:
 If you don't pass any value it will be use `chromium` as default
 
 Use Playwright in your tests:
+
 ```json
 "test": "BROWSER=chromium jest"
 ```
 
 ```js
 describe('Google', () => {
-    beforeAll(async () => {
-        await page.goto('https://whatismybrowser.com/')
-    })
-
-    it('should display "google" text on page', async () => {
-        const browser = await page.$eval('.string-major a', el => el.text);
-        expect(browser).toContain('Chrome')
-    })
+  beforeAll(async () => {
+    await page.goto('https://whatismybrowser.com/')
+  })
+
+  it('should display "google" text on page', async () => {
+    const browser = await page.$eval('.string-major a', el => el.text)
+    expect(browser).toContain('Chrome')
+  })
 })
 ```
 

babel.config.js

@@ -1,13 +1,13 @@
 module.exports = {
-    presets: [
-        [
-            '@babel/preset-env',
-            {
-                targets: {
-                    node: '8',
-                },
-                loose: true,
-            },
-        ],
+  presets: [
+    [
+      '@babel/preset-env',
+      {
+        targets: {
+          node: '8',
+        },
+        loose: true,
+      },
     ],
+  ],
 }

index.js

@@ -1,3 +1,3 @@
-module.exports = require('./lib/PlaywrightEnvironment').default;
-module.exports.globalSetup = require('./lib/global').setup;
-module.exports.globalTeardown = require('./lib/global').teardown;
+module.exports = require('./lib/PlaywrightEnvironment').default
+module.exports.globalSetup = require('./lib/global').setup
+module.exports.globalTeardown = require('./lib/global').teardown

jest.config.js

@@ -3,4 +3,4 @@ module.exports = {
   globalSetup: './setup.js',
   globalTeardown: './teardown.js',
   testEnvironment: './testEnvironment.js',
-};
+}

src/PlaywrightEnvironment.js

@@ -2,35 +2,32 @@ import fs from 'fs'
 import NodeEnvironment from 'jest-environment-node'
 import playwright from 'playwright'
 import { WS_ENDPOINT_PATH } from './constants'
-import { checkBrowserEnv, getBrowserType, readConfig } from "./utils";
+import { checkBrowserEnv, getBrowserType, readConfig } from './utils'
 
 const handleError = error => {
   process.emit('uncaughtException', error)
-};
+}
 
 class PlaywrightEnvironment extends NodeEnvironment {
-  async teardown() {
-    await super.teardown()
-  }
-
   async setup() {
-    const wsEndpoint = fs.readFileSync(WS_ENDPOINT_PATH, 'utf8');
+    const wsEndpoint = fs.readFileSync(WS_ENDPOINT_PATH, 'utf8')
     if (!wsEndpoint) {
       throw new Error('wsEndpoint not found')
     }
-    const config = await readConfig();
-    const browserType = getBrowserType(config);
-    checkBrowserEnv(browserType);
-    const { connect, context } = config;
-    const connectOptions = Object.assign({}, { browserWSEndpoint: wsEndpoint }, connect );
-    this.global.browser = await playwright[browserType].connect(connectOptions);
-    this.global.context = await this.global.browser.newContext(context);
-    this.global.page = await this.global.context.newPage();
+    const config = await readConfig()
+    const browserType = getBrowserType(config)
+    checkBrowserEnv(browserType)
+    const { connect, context } = config
+    const connectOptions = { browserWSEndpoint: wsEndpoint, ...connect }
+    this.global.browser = await playwright[browserType].connect(connectOptions)
+    this.global.context = await this.global.browser.newContext(context)
+    this.global.page = await this.global.context.newPage()
     this.global.page.on('pageerror', handleError)
   }
 
   async teardown() {
-    this.global.page.removeListener('pageerror', handleError);
+    await super.teardown()
+    this.global.page.removeListener('pageerror', handleError)
     await this.global.page.close()
   }
 }

src/global.js

@@ -1,19 +1,20 @@
 import fs from 'fs'
+// eslint-disable-next-line import/no-extraneous-dependencies
 import rimraf from 'rimraf'
 import playwright from 'playwright'
 import { DIR, WS_ENDPOINT_PATH } from './constants'
-import { checkBrowserEnv, readConfig, getBrowserType } from "./utils";
+import { checkBrowserEnv, readConfig, getBrowserType } from './utils'
 
-let browser;
+let browser
 
 export async function setup() {
-  const config = await readConfig();
-  const browserType = getBrowserType(config);
-  checkBrowserEnv(browserType);
-  const { launchBrowserApp } = config;
-  browser = await playwright[browserType].launchBrowserApp(launchBrowserApp);
+  const config = await readConfig()
+  const browserType = getBrowserType(config)
+  checkBrowserEnv(browserType)
+  const { launchBrowserApp } = config
+  browser = await playwright[browserType].launchBrowserApp(launchBrowserApp)
   // Instead, we expose the connection details via file system to be used in tests
-  fs.mkdirSync(DIR, { recursive: true });
+  fs.mkdirSync(DIR, { recursive: true })
   fs.writeFileSync(WS_ENDPOINT_PATH, browser.wsEndpoint())
 }
 

src/utils.js

@@ -1,44 +1,46 @@
-import fs from 'fs';
-import path from 'path';
-import { promisify } from 'util';
-import { CHROMIUM, FIREFOX, WEBKIT, DEFAULT_CONFIG } from './constants';
+import fs from 'fs'
+import path from 'path'
+import { promisify } from 'util'
+import { CHROMIUM, FIREFOX, WEBKIT, DEFAULT_CONFIG } from './constants'
 
-const exists = promisify(fs.exists);
+const exists = promisify(fs.exists)
 
 export function checkBrowserEnv(param) {
-    if (param !== CHROMIUM && param !== FIREFOX && param !== WEBKIT) {
-        throw new Error(`Wrong browser type. Should be one of [${CHROMIUM}, ${FIREFOX}, ${WEBKIT}], but got ${param}`)
-    }
+  if (param !== CHROMIUM && param !== FIREFOX && param !== WEBKIT) {
+    throw new Error(
+      `Wrong browser type. Should be one of [${CHROMIUM}, ${FIREFOX}, ${WEBKIT}], but got ${param}`,
+    )
+  }
 }
 
 export function getBrowserType(config) {
-    const processBrowser = process.env.BROWSER;
-    if (processBrowser) {
-        return processBrowser
-    } else {
-        return config.browser || CHROMIUM
-    }
+  const processBrowser = process.env.BROWSER
+  if (processBrowser) {
+    return processBrowser
+  }
+  return config.browser || CHROMIUM
 }
 
 export async function readConfig() {
-    const defaultConfig = DEFAULT_CONFIG;
-
-    const hasCustomConfigPath = !!process.env.JEST_PLAYWRIGHT_CONFIG;
-    const configPath =
-        process.env.JEST_PLAYWRIGHT_CONFIG || 'jest-playwright.config.js';
-    const absConfigPath = path.resolve(process.cwd(), configPath);
-    const configExists = await exists(absConfigPath);
-
-    if (hasCustomConfigPath && !configExists) {
-        throw new Error(
-            `Error: Can't find a root directory while resolving a config file path.\nProvided path to resolve: ${configPath}`,
-        )
-    }
-
-    if (!hasCustomConfigPath && !configExists) {
-        return defaultConfig
-    }
-
-    const localConfig = await require(absConfigPath);
-    return Object.assign({}, defaultConfig, localConfig);
+  const defaultConfig = DEFAULT_CONFIG
+
+  const hasCustomConfigPath = !!process.env.JEST_PLAYWRIGHT_CONFIG
+  const configPath =
+    process.env.JEST_PLAYWRIGHT_CONFIG || 'jest-playwright.config.js'
+  const absConfigPath = path.resolve(process.cwd(), configPath)
+  const configExists = await exists(absConfigPath)
+
+  if (hasCustomConfigPath && !configExists) {
+    throw new Error(
+      `Error: Can't find a root directory while resolving a config file path.\nProvided path to resolve: ${configPath}`,
+    )
+  }
+
+  if (!hasCustomConfigPath && !configExists) {
+    return defaultConfig
+  }
+
+  // eslint-disable-next-line global-require,import/no-dynamic-require
+  const localConfig = await require(absConfigPath)
+  return { ...defaultConfig, ...localConfig }
 }