use isBrowserGivenByCli only for run mode (#5)

* Update modeOptions.ts * Update index.ts * Update ProjectLifecycleManager.ts
cypress-io · Nov 3, 2024 · 66d26b1 · 66d26b1
1 parent c1fc1b2
commit 66d26b1
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/packages/data-context/src/data/ProjectLifecycleManager.ts b/packages/data-context/src/data/ProjectLifecycleManager.ts
@@ -315,14 +315,14 @@ export class ProjectLifecycleManager {
   async setInitialActiveBrowser () {
     const configBrowser = this.loadedFullConfig?.defaultBrowser
 
-    if (configBrowser && !this.ctx.modeOptions.isBrowserGivenByCli) {
-      if (this.ctx.isRunMode) {
+    if (configBrowser) {
+      if (this.ctx.isRunMode && !this.ctx.modeOptions.isBrowserGivenByCli) {
         this.ctx.setModeOptionsBrowser(configBrowser)
 
         return
       }
 
-      this.ctx.coreData.cliBrowser = configBrowser
+      this.ctx.coreData.cliBrowser ??= configBrowser
     }
 
     if (this.ctx.coreData.cliBrowser) {

diff --git a/packages/server/lib/modes/index.ts b/packages/server/lib/modes/index.ts
@@ -10,8 +10,6 @@ export = (mode, options) => {
     return require('./smoke_test').run(options)
   }
 
-  options.isBrowserGivenByCli = options.browser !== undefined
-
   if (mode === 'run') {
     _.defaults(options, {
       socketId: random.id(10),
@@ -20,6 +18,7 @@ export = (mode, options) => {
       quiet: false,
       morgan: false,
       report: true,
+      isBrowserGivenByCli: options.browser !== undefined,
     })
   }
 

diff --git a/packages/types/src/modeOptions.ts b/packages/types/src/modeOptions.ts
@@ -1,7 +1,6 @@
 export interface CommonModeOptions {
   _?: (string | null)[] | null
   invokedFromCli: boolean
-  isBrowserGivenByCli: boolean
   userNodePath?: string
   userNodeVersion?: string
   configFile?: string | null
@@ -25,6 +24,7 @@ export interface RunModeOptions extends CommonModeOptions {
   parallel?: boolean | null
   ciBuildId?: string | null
   tag?: (string)[] | null
+  isBrowserGivenByCli: boolean
 }
 
 export type TestingType = 'e2e' | 'component'