fix failing tests due to merge

Author: lmiller1990

packages/server/test/integration/http_requests_spec.js

@@ -83,7 +83,8 @@ let ctx
 describe('Routes', () => {
   require('mocha-banner').register()
 
-  beforeEach(function () {
+  beforeEach(async function () {
+    await Fixtures.scaffoldCommonNodeModules()
     ctx = makeLegacyDataContext()
     process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0'
 

system-tests/lib/fixtures.js

@@ -9,7 +9,7 @@ const root = _path.join(__dirname, '..')
 
 const serverRoot = _path.join(__dirname, '../../packages/server/')
 const projects = _path.join(root, 'projects')
-const tmpDir = _path.join(os.tmpdir(), 'cy-projects')
+let tmpDir = _path.join(os.tmpdir(), 'cy-projects')
 
 // copy contents instead of deleting+creating new file, which can cause
 // filewatchers to lose track of toFile.
@@ -175,7 +175,7 @@ export async function scaffoldProjectNodeModules (project: string, updateYarnLoc
 
   const runCmd = async (cmd) => {
     console.log(`📦 Running "${cmd}" in ${projectDir}`)
-    await execa.shell(cmd, { cwd: projectDir, stdio: 'inherit' })
+    await execa(cmd, { cwd: projectDir, stdio: 'inherit', shell: true })
   }
 
   const cacheDir = _path.join(cachedir('cy-system-tests-node-modules'), project, 'node_modules')
@@ -343,4 +343,8 @@ export function path (fixture) {
   return _path.join(serverRoot, 'test', 'support', 'fixtures', fixture)
 }
 
+export function setTmpDir (dir: string) {
+  tmpDir = dir
+}
+
 export default module.exports

system-tests/lib/fixtures.ts

@@ -691,11 +691,11 @@ const systemTests = {
         this.servers = null
       }
 
-      const s = options.settings
+      // const s = options.settings
 
-      if (s) {
-        await settings.writeOnly(e2ePath, s)
-      }
+      // if (s) {
+      //   await settings.writeOnly(e2ePath, s)
+      // }
     })
 
     afterEach(async function () {
@@ -780,10 +780,6 @@ const systemTests = {
       `--testingType=${options.testingType || 'e2e'}`,
     ]
 
-    if (options.testingType) {
-      args.push(`--testingType=${options.testingType}`)
-    }
-
     if (options.spec) {
       args.push(`--spec=${options.spec}`)
     }
@@ -925,7 +921,7 @@ const systemTests = {
     }
 
     if (ctx.settings) {
-      await settings.write(e2ePath, ctx.settings)
+      await settings.writeOnly(e2ePath, ctx.settings)
     }
 
     args = options.args || ['index.js'].concat(args)

system-tests/lib/system-tests.ts

@@ -2,7 +2,7 @@ module.exports = {
   'retries': 2,
   'e2e': {
     setupNodeEvents (on, config) {
-      const { useFixedBrowserLaunchSize } = require('../utils')
+      const { useFixedBrowserLaunchSize } = require('@tooling/system-tests/lib/pluginUtils')
 
       on('before:browser:launch', (browser, options) => {
         useFixedBrowserLaunchSize(browser, options, config)

system-tests/projects/retries-2/cypress.config.js

@@ -0,0 +1,45 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+"js-tokens@^3.0.0 || ^4.0.0":
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
+  integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
+
+loose-envify@^1.1.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
+  integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==
+  dependencies:
+    js-tokens "^3.0.0 || ^4.0.0"
+
+object-assign@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
+  integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
+
+react-dom@*:
+  version "17.0.2"
+  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-17.0.2.tgz#ecffb6845e3ad8dbfcdc498f0d0a939736502c23"
+  integrity sha512-s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA==
+  dependencies:
+    loose-envify "^1.1.0"
+    object-assign "^4.1.1"
+    scheduler "^0.20.2"
+
+react@*:
+  version "17.0.2"
+  resolved "https://registry.yarnpkg.com/react/-/react-17.0.2.tgz#d0b5cc516d29eb3eee383f75b62864cfb6800037"
+  integrity sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA==
+  dependencies:
+    loose-envify "^1.1.0"
+    object-assign "^4.1.1"
+
+scheduler@^0.20.2:
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.20.2.tgz#4baee39436e34aa93b4874bddcbf0fe8b8b50e91"
+  integrity sha512-2eWfGgAqqWFGqtdMmcL5zCMK1U8KlXv8SQFGglL3CEtd0aDVDWgeF/YoCmvln55m5zSk3J/20hTaSBeSObsQDQ==
+  dependencies:
+    loose-envify "^1.1.0"
+    object-assign "^4.1.1"

system-tests/projects/spec-generation/yarn.lock

@@ -77,11 +77,12 @@ describe('e2e config', () => {
   })
 
   it('throws error when multiple default config file are found in project', function () {
+    Fixtures.scaffoldProject('pristine-with-config-file')
     const projectRoot = Fixtures.projectPath('pristine-with-config-file')
 
     return fs.writeFile(path.join(projectRoot, 'cypress.config.ts'), 'export default {}').then(() => {
       return systemTests.exec(this, {
-        project: projectRoot,
+        project: 'pristine-with-config-file',
         expectedExitCode: 1,
         snapshot: true,
       })