Main cypress open script now always goes through launchpad even if --e2e or --ct are used (if LAUNCHPAD=1)

Author: BlueWinds

package.json

@@ -27,7 +27,7 @@
     "precypress:open:debug": "yarn ensure-deps",
     "cypress:open:debug": "node ./scripts/debug.js cypress:open",
     "precypress:run": "yarn ensure-deps",
-    "cypress:run": "cypress run-ct --dev",
+    "cypress:run": "cypress run --dev",
     "precypress:run:debug": "yarn ensure-deps",
     "cypress:run:debug": "node ./scripts/debug.js cypress:run",
     "cypress:verify": "cypress verify --dev",

packages/server/lib/gui/windows.ts

@@ -5,7 +5,6 @@ import { BrowserWindow } from 'electron'
 import Debug from 'debug'
 import cwd from '../cwd'
 import savedState from '../saved_state'
-import { getPathToDesktopIndex } from '@packages/resolve-dist'
 
 const debug = Debug('cypress:server:windows')
 
@@ -32,7 +31,6 @@ const getUrl = function (type, port?: number) {
       throw new Error(`No acceptable window type found for: '${type}'`)
   }
 }
-
 const getByType = (type) => {
   return windows[type]
 }

packages/server/lib/modes/index.ts

@@ -7,19 +7,20 @@ export = (mode, options) => {
     return require('./smoke_test').run(options)
   }
 
-  if (mode === 'run' && options.testingType === 'e2e') {
+  if (mode === 'run') {
+    if (options.testingType === 'component') {
+      return require('./run-ct').run(options)
+    }
+
     return require('./run-e2e').run(options)
   }
 
-  if (mode === 'run' && options.testingType === 'component') {
-    return require('./run-ct').run(options)
-  }
+  if (mode === 'interactive') {
+    if (options.testingType === 'component' && !process.env.LAUNCHPAD) {
+      return require('./interactive-ct').run(options)
+    }
 
-  if (mode === 'interactive' && options.testingType === 'e2e') {
+    // Either launchpad or straight to e2e tests
     return require('./interactive-e2e').run(options)
   }
-
-  if (mode === 'interactive' && options.testingType === 'component') {
-    return require('./interactive-ct').run(options)
-  }
 }

packages/server/lib/util/args.js

@@ -211,7 +211,6 @@ module.exports = {
       // set in case we
       // bypassed the cli
       cwd: process.cwd(),
-      testingType: 'e2e',
     })
     .mapValues(coerceUtil.coerce)
     .value()