Merge branch 'develop' into ryanm/fix/v8-improvements

cypress-io · Dec 2, 2022 · aa6b359 · aa6b359 · cypress-bot · Dec 2, 2022
2 parents bb1390e + 05dc4a5
commit aa6b359
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 4 deletions.
diff --git a/.circleci/workflows.yml b/.circleci/workflows.yml
@@ -628,8 +628,9 @@ commands:
             - install-webkit-deps
       - run:
           name: Run system tests
+          environment:
+            CYPRESS_COMMERCIAL_RECOMMENDATIONS: '0'
           command: |
-            CYPRESS_COMMERCIAL_RECOMMENDATIONS=0
             ALL_SPECS=`circleci tests glob "/root/cypress/system-tests/test/*spec*"`
             SPECS=
             for file in $ALL_SPECS; do
@@ -656,8 +657,9 @@ commands:
       - restore_cached_system_tests_deps
       - run:
           name: Run system tests
+          environment:
+            CYPRESS_COMMERCIAL_RECOMMENDATIONS: '0'
           command: |
-            CYPRESS_COMMERCIAL_RECOMMENDATIONS=0
             ALL_SPECS=`circleci tests glob "$HOME/cypress/system-tests/test-binary/*spec*"`
             SPECS=`echo $ALL_SPECS | xargs -n 1 | circleci tests split --split-by=timings`
             echo SPECS=$SPECS
@@ -1340,7 +1342,7 @@ jobs:
           condition:
             equal: [ *darwin-arm64-executor, << parameters.executor >> ]
           steps:
-            - run: rm -f /tmp/cypress/junit/* 
+            - run: rm -f /tmp/cypress/junit/*
       - unless:
           condition:
             or:
@@ -1529,7 +1531,9 @@ jobs:
     steps:
       - restore_cached_workspace
       - run:
-          command: CYPRESS_COMMERCIAL_RECOMMENDATIONS=0 yarn workspace @tooling/system-tests test:ci "test/non_root*spec*" --browser electron
+          environment:
+            CYPRESS_COMMERCIAL_RECOMMENDATIONS: '0'
+          command: yarn workspace @tooling/system-tests test:ci "test/non_root*spec*" --browser electron
       - verify-mocha-results
       - store_test_results:
           path: /tmp/cypress

diff --git a/cli/lib/util.js b/cli/lib/util.js
@@ -533,6 +533,7 @@ const util = {
     la(is.unemptyString(varName), 'expected environment variable name, not', varName)
 
     const configVarName = `npm_config_${varName}`
+    const configVarNameLower = configVarName.toLowerCase()
     const packageConfigVarName = `npm_package_config_${varName}`
 
     let result
@@ -545,6 +546,10 @@ const util = {
       debug(`Using ${varName} from npm config`)
 
       result = process.env[configVarName]
+    } else if (process.env.hasOwnProperty(configVarNameLower)) {
+      debug(`Using ${varName.toLowerCase()} from npm config`)
+
+      result = process.env[configVarNameLower]
     } else if (process.env.hasOwnProperty(packageConfigVarName)) {
       debug(`Using ${varName} from package.json config`)
 

diff --git a/cli/test/lib/util_spec.js b/cli/test/lib/util_spec.js
@@ -543,6 +543,11 @@ describe('util', () => {
       expect(util.getEnv('CYPRESS_FOO')).to.eql('')
     })
 
+    it('npm config set should work', () => {
+      process.env.npm_config_cypress_foo_foo = 'bazz'
+      expect(util.getEnv('CYPRESS_FOO_FOO')).to.eql('bazz')
+    })
+
     it('throws on non-string name', () => {
       expect(() => {
         util.getEnv()