resolve conflicts

Author: lmiller1990

packages/server/test/integration/plugins_spec.js

@@ -7,17 +7,12 @@ const { makeLegacyDataContext } = require('../../lib/makeDataContext')
 let ctx
 
 describe('lib/plugins', () => {
-<<<<<<< HEAD
-  beforeEach(() => {
+  beforeEach(async () => {
     ctx = makeLegacyDataContext()
     Fixtures.scaffold()
-
-    ctx.actions.project.setActiveProjectForTestSetup(Fixtures.projectPath('plugin-before-browser-launch-deprecation'))
-=======
-  beforeEach(async () => {
     Fixtures.scaffoldProject('plugin-before-browser-launch-deprecation')
     await Fixtures.scaffoldCommonNodeModules()
->>>>>>> 71d92e0e49 (test: node_modules installs for system-tests, other improvements (#18574))
+    ctx.actions.project.setActiveProjectForTestSetup(Fixtures.projectPath('plugin-before-browser-launch-deprecation'))
   })
 
   afterEach(() => {

system-tests/lib/system-tests.ts

@@ -690,15 +690,12 @@ const systemTests = {
       } else {
         this.servers = null
       }
-<<<<<<< HEAD
 
       const s = options.settings
 
       if (s) {
         await settings.writeOnly(e2ePath, s)
       }
-=======
->>>>>>> 71d92e0e49 (test: node_modules installs for system-tests, other improvements (#18574))
     })
 
     afterEach(async function () {
@@ -779,12 +776,8 @@ const systemTests = {
     const args = [
       // hides a user warning to go through NPM module
       `--cwd=${serverPath}`,
-<<<<<<< HEAD
-      `--run-project=${options.project}`,
-=======
       `--run-project=${Fixtures.projectPath(options.project)}`,
       `--testingType=${options.testingType || 'e2e'}`,
->>>>>>> 71d92e0e49 (test: node_modules installs for system-tests, other improvements (#18574))
     ]
 
     if (options.testingType) {

system-tests/test/config_spec.js

@@ -77,7 +77,6 @@ describe('e2e config', () => {
   })
 
   it('throws error when multiple default config file are found in project', function () {
-<<<<<<< HEAD
     const projectRoot = Fixtures.projectPath('pristine-with-config-file')
 
     return fs.writeFile(path.join(projectRoot, 'cypress.config.ts'), 'export default {}').then(() => {
@@ -90,9 +89,7 @@ describe('e2e config', () => {
   })
 
   it('throws error when cypress.json is found in project and need migration', function () {
-=======
     Fixtures.scaffoldProject('pristine')
->>>>>>> 71d92e0e49 (test: node_modules installs for system-tests, other improvements (#18574))
     const projectRoot = Fixtures.projectPath('pristine')
 
     return fs.writeFile(path.join(projectRoot, 'cypress.json'), '{}').then(() => {

system-tests/test/specs_spec.js

@@ -24,25 +24,17 @@ describe('e2e specs', () => {
   // @see https://github.com/cypress-io/cypress/issues/14226
   it('handles the same integration and fixtures folders', function () {
     return systemTests.exec(this, {
-<<<<<<< HEAD
-      project,
       testingType: 'e2e',
-=======
       project: 'same-fixtures-integration-folders',
->>>>>>> 71d92e0e49 (test: node_modules installs for system-tests, other improvements (#18574))
       snapshot: false,
       expectedExitCode: 0,
     })
   })
 
   it('handles the fixtures folder being the subfolder of integration', function () {
     return systemTests.exec(this, {
-<<<<<<< HEAD
-      project,
       testingType: 'e2e',
-=======
       project: 'fixture-subfolder-of-integration',
->>>>>>> 71d92e0e49 (test: node_modules installs for system-tests, other improvements (#18574))
       snapshot: false,
       expectedExitCode: 0,
     })