feat: adjust default timeout with slowMo

Closes #36
argos-ci · Apr 24, 2018 · 6871ec8 · 6871ec8
1 parent 0d493c4
commit 6871ec8
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 4 deletions.
diff --git a/packages/expect-puppeteer/src/options.js b/packages/expect-puppeteer/src/options.js
@@ -4,9 +4,28 @@ export const setDefaultOptions = options => {
   defaultOptionsValue = options
 }
 
-export const getDefaultOptions = () => defaultOptionsValue
+export const getDefaultOptions = () => {
+  if (
+    global.puppeteerConfig &&
+    global.puppeteerConfig.launch &&
+    global.puppeteerConfig.launch.slowMo &&
+    defaultOptionsValue &&
+    defaultOptionsValue.timeout
+  ) {
+    return {
+      ...defaultOptionsValue,
+      // Multiplying slowMo by 10 is just arbitrary
+      // slowMo is applied on all Puppeteer internal methods, so it is just a "slow" indicator
+      // we can't use it as a real value
+      timeout:
+        defaultOptionsValue.timeout + global.puppeteerConfig.launch.slowMo * 10,
+    }
+  }
+
+  return defaultOptionsValue
+}
 
 export const defaultOptions = options => ({
-  ...defaultOptionsValue,
+  ...getDefaultOptions(),
   ...options,
 })
diff --git a/packages/jest-environment-puppeteer/src/PuppeteerEnvironment.js b/packages/jest-environment-puppeteer/src/PuppeteerEnvironment.js
@@ -11,13 +11,21 @@ const handleError = error => {
 class PuppeteerEnvironment extends NodeEnvironment {
   async setup() {
     const config = await readConfig()
+    this.global.puppeteerConfig = config
+
     const wsEndpoint = fs.readFileSync(WS_ENDPOINT_PATH, 'utf8')
     if (!wsEndpoint) {
       throw new Error('wsEndpoint not found')
     }
     this.global.browser = await puppeteer.connect({
-      slowMo: config && config.launch && config.launch.slowMo ? config.launch.slowMo : undefined,
-      ignoreHTTPSErrors: config && config.launch && config.launch.ignoreHTTPSErrors ? config.launch.ignoreHTTPSErrors : undefined,
+      slowMo:
+        config && config.launch && config.launch.slowMo
+          ? config.launch.slowMo
+          : undefined,
+      ignoreHTTPSErrors:
+        config && config.launch && config.launch.ignoreHTTPSErrors
+          ? config.launch.ignoreHTTPSErrors
+          : undefined,
       browserWSEndpoint: wsEndpoint,
     })
     this.global.page = await this.global.browser.newPage()