fix: use util.getEnv to handle environment variables set with npm (#1…

…9560) Co-authored-by: Matt Henkes <[email protected]> Co-authored-by: Emily Rohrbough <[email protected]>
cypress-io · Jan 12, 2022 · 576519e · 576519e · cypress-bot · Jan 12, 2022
1 parent 0382768
commit 576519e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/cli/lib/tasks/verify.js b/cli/lib/tasks/verify.js
@@ -15,7 +15,7 @@ const logger = require('../logger')
 const xvfb = require('../exec/xvfb')
 const state = require('./state')
 
-const VERIFY_TEST_RUNNER_TIMEOUT_MS = +process.env.CYPRESS_VERIFY_TIMEOUT || 30000
+const VERIFY_TEST_RUNNER_TIMEOUT_MS = +util.getEnv('CYPRESS_VERIFY_TIMEOUT') || 30000
 
 const checkExecutable = (binaryDir) => {
   const executable = state.getPathToExecutable(binaryDir)

diff --git a/cli/test/lib/tasks/verify_spec.js b/cli/test/lib/tasks/verify_spec.js
@@ -81,6 +81,14 @@ context('lib/tasks/verify', () => {
     expect(newVerifyInstance.VERIFY_TEST_RUNNER_TIMEOUT_MS).to.eql(500000)
   })
 
+  it('accepts custom verify task timeout from npm', () => {
+    process.env.npm_config_CYPRESS_VERIFY_TIMEOUT = '500000'
+    delete require.cache[require.resolve(`${lib}/tasks/verify`)]
+    const newVerifyInstance = require(`${lib}/tasks/verify`)
+
+    expect(newVerifyInstance.VERIFY_TEST_RUNNER_TIMEOUT_MS).to.eql(500000)
+  })
+
   it('falls back to default verify task timeout if custom value is invalid', () => {
     process.env.CYPRESS_VERIFY_TIMEOUT = 'foobar'
     delete require.cache[require.resolve(`${lib}/tasks/verify`)]