Merge branch 'develop' into matth/fix/issue-17627-hang-fix

browser-versions.json

@@ -1,4 +1,4 @@
 {
-  "chrome:beta": "104.0.5112.57",
+  "chrome:beta": "104.0.5112.65",
   "chrome:stable": "103.0.5060.134"
 }

packages/server/lib/modes/index.ts

@@ -28,15 +28,11 @@ export = (mode, options) => {
   const loadingPromise = ctx.initializeMode()
 
   if (mode === 'run') {
-    if (options.testingType === 'component') {
-      return require('./run-ct').run(options, loadingPromise)
-    }
-
     // run must always be deterministic - if the user doesn't specify
     // a testingType, we default to e2e
-    options.testingType = 'e2e'
+    options.testingType = options.testingType || 'e2e'
 
-    return require('./run-e2e').run(options, loadingPromise)
+    return require('./run').run(options, loadingPromise)
   }
 
   if (mode === 'interactive') {

packages/server/lib/modes/interactive.ts

@@ -1,18 +1,19 @@
 import _ from 'lodash'
 import os from 'os'
 import { app, nativeImage as image } from 'electron'
-// eslint-disable-next-line no-duplicate-imports
-import type { WebContents } from 'electron'
+
 import * as cyIcons from '@packages/icons'
 import * as savedState from '../saved_state'
 import menu from '../gui/menu'
 import * as Windows from '../gui/windows'
 import { makeGraphQLServer } from '@packages/graphql/src/makeGraphQLServer'
-import { DataContext, globalPubSub, getCtx, clearCtx } from '@packages/data-context'
-import type { LaunchArgs, PlatformName } from '@packages/types'
-import { EventEmitter } from 'events'
+import { globalPubSub, getCtx, clearCtx } from '@packages/data-context'
+
+// eslint-disable-next-line no-duplicate-imports
+import type { WebContents } from 'electron'
+import type { LaunchArgs } from '@packages/types'
+
 import debugLib from 'debug'
-import Events from '../gui/events'
 
 const debug = debugLib('cypress:server:interactive')
 
@@ -153,21 +154,13 @@ export = {
       return Windows.open(projectRoot, port, this.getWindowArgs(state))
       .then((win) => {
         ctx?.actions.electron.setBrowserWindow(win)
-        Events.start({
-          ...(options as LaunchArgs),
-          onFocusTests () {
-            // @ts-ignore
-            return app.focus({ steal: true }) || win.focus()
-          },
-          os: os.platform() as PlatformName,
-        }, new EventEmitter())
 
         return win
       })
     })
   },
 
-  async run (options, ctx: DataContext) {
+  async run (options: LaunchArgs, _loading: Promise<void>) {
     const [, port] = await Promise.all([
       app.whenReady(),
       makeGraphQLServer(),

packages/server/test/integration/cypress_spec.js

@@ -20,7 +20,6 @@ const argsUtil = require(`../../lib/util/args`)
 const { fs } = require(`../../lib/util/fs`)
 const ciProvider = require(`../../lib/util/ci_provider`)
 const settings = require(`../../lib/util/settings`)
-const Events = require(`../../lib/gui/events`)
 const Windows = require(`../../lib/gui/windows`)
 const interactiveMode = require(`../../lib/modes/interactive`)
 const runMode = require(`../../lib/modes/run`)
@@ -1641,7 +1640,6 @@ describe('lib/cypress', () => {
       sinon.stub(electron.app, 'on').withArgs('ready').yieldsAsync()
       sinon.stub(Windows, 'open').resolves(this.win)
       sinon.stub(ServerE2E.prototype, 'startWebsockets')
-      sinon.spy(Events, 'start')
       sinon.stub(electron.ipcMain, 'on')
     })
 
@@ -1660,21 +1658,11 @@ describe('lib/cypress', () => {
       })
     })
 
-    it('passes options to Events.start', () => {
-      return cypress.start(['--port=2121', '--config=pageLoadTimeout=1000'])
-      .then(() => {
-        expect(Events.start).to.be.calledWithMatch({
-          config: {
-            pageLoadTimeout: 1000,
-            port: 2121,
-          },
-        })
-      })
-    })
-
     it('passes filtered options to Project#open and sets cli config', async function () {
       const open = sinon.stub(ServerE2E.prototype, 'open').resolves([])
 
+      sinon.stub(interactiveMode, 'ready')
+
       process.env.CYPRESS_FILE_SERVER_FOLDER = 'foo'
       process.env.CYPRESS_BASE_URL = 'http://localhost'
       process.env.CYPRESS_port = '2222'
@@ -1688,7 +1676,7 @@ describe('lib/cypress', () => {
       return user.set({ name: 'brian', authToken: 'auth-token-123' })
       .then(() => ctx.lifecycleManager.getFullInitialConfig())
       .then((json) => {
-        // this should be overriden by the env argument
+        // this should be overridden by the env argument
         json.baseUrl = 'http://localhost:8080'
 
         const { supportFile, specPattern, excludeSpecPattern, baseUrl, experimentalSessionAndOrigin, slowTestThreshold, ...rest } = json
@@ -1705,7 +1693,7 @@ describe('lib/cypress', () => {
           '--env=baz=baz',
         ])
       }).then(() => {
-        const options = Events.start.firstCall.args[0]
+        const options = interactiveMode.ready.firstCall.args[0]
 
         return openProject.create(this.todosPath, { ...options, testingType: 'e2e' }, [])
       }).then(() => {

packages/server/test/unit/modes/interactive_spec.js

@@ -6,7 +6,6 @@ const electron = require('electron')
 const DataContext = require('@packages/data-context')
 const savedState = require(`../../../lib/saved_state`)
 const menu = require(`../../../lib/gui/menu`)
-const Events = require(`../../../lib/gui/events`)
 const Windows = require(`../../../lib/gui/windows`)
 const interactiveMode = require(`../../../lib/modes/interactive`)
 
@@ -128,7 +127,6 @@ describe('gui/interactive', () => {
       this.state = {}
 
       sinon.stub(menu, 'set')
-      sinon.stub(Events, 'start')
       sinon.stub(Windows, 'open').resolves(this.win)
       sinon.stub(Windows, 'trackState')
 
@@ -137,18 +135,6 @@ describe('gui/interactive', () => {
       sinon.stub(state, 'get').resolves(this.state)
     })
 
-    it('calls Events.start with options, adding env, onFocusTests, and os', () => {
-      sinon.stub(os, 'platform').returns('someOs')
-      const opts = {}
-
-      return interactiveMode.ready(opts).then(() => {
-        expect(Events.start).to.be.called
-        expect(Events.start.lastCall.args[0].onFocusTests).to.be.a('function')
-
-        expect(Events.start.lastCall.args[0].os).to.equal('someOs')
-      })
-    })
-
     it('calls menu.set', () => {
       return interactiveMode.ready({}).then(() => {
         expect(menu.set).to.be.calledOnce

packages/types/src/server.ts

@@ -30,7 +30,6 @@ export interface LaunchArgs {
   projectRoot: string // same as above
   testingType: Cypress.TestingType
   invokedFromCli: boolean
-  runAllSpecsInSameBrowserSession?: boolean
   onError?: (error: Error) => void
   os: PlatformName
   exit?: boolean