feat(jest-environment-puppeteer): Simplify getBrowser function

argos-ci · Aug 19, 2018 · 8ccb0d0 · 8ccb0d0
1 parent 30a3daa
commit 8ccb0d0
Showing 1 changed file with 5 additions and 22 deletions.
diff --git a/packages/jest-environment-puppeteer/src/PuppeteerEnvironment.js b/packages/jest-environment-puppeteer/src/PuppeteerEnvironment.js
@@ -10,27 +10,6 @@ const handleError = error => {
   process.emit('uncaughtException', error)
 }
 
-const getBrowser = async config => {
-  const wsEndpoint = fs.readFileSync(WS_ENDPOINT_PATH, 'utf8')
-  let slowMo
-  let ignoreHTTPSErrors
-
-  if (!wsEndpoint) {
-    throw new Error('wsEndpoint not found')
-  }
-
-  if (config) {
-    slowMo = (config.connect && config.connect.slowMo) || (config.launch && config.launch.slowMo) 
-    ignoreHTTPSErrors = (config.connect && config.connect.ignoreHTTPSErrors) || (config.launch && config.launch.ignoreHTTPSErrors) 
-  }
-
-  return puppeteer.connect({
-    slowMo,
-    ignoreHTTPSErrors,
-    browserWSEndpoint: wsEndpoint,
-  })
-}
-
 const KEYS = {
   CONTROL_C: '\u0003',
   CONTROL_D: '\u0004',
@@ -57,7 +36,11 @@ class PuppeteerEnvironment extends NodeEnvironment {
     if (!wsEndpoint) {
       throw new Error('wsEndpoint not found')
     }
-    this.global.browser = await getBrowser(config)
+    this.global.browser = await puppeteer.connect({
+      ...config.connect,
+      ...config.launch,
+      browserWSEndpoint: wsEndpoint
+    })
     this.global.page = await this.global.browser.newPage()
     if (config && config.exitOnPageError) {
       this.global.page.addListener('pageerror', handleError)