Main cypress script open now opens launchpad unless --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')
 
@@ -18,20 +17,6 @@ export type WindowOptions = Electron.BrowserWindowConstructorOptions & {
 let windows = {}
 let recentlyCreatedWindow = false
 
-const getUrl = function (type) {
-  switch (type) {
-    case 'INDEX':
-      if (process.env.LAUNCHPAD) {
-        return getPathToDesktopIndex('launchpad')
-      }
-
-      return getPathToDesktopIndex('desktop-gui')
-
-    default:
-      throw new Error(`No acceptable window type found for: '${type}'`)
-  }
-}
-
 const getByType = (type) => {
   return windows[type]
 }
@@ -248,10 +233,6 @@ export function open (projectRoot, options: WindowOptions = {}, newBrowserWindow
     },
   })
 
-  if (!options.url) {
-    options.url = getUrl(options.type)
-  }
-
   win = create(projectRoot, options, newBrowserWindow)
 
   debug('creating electron window with options %o', options)

packages/server/lib/modes/index.js

@@ -7,19 +7,20 @@ module.exports = (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') {
+      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/modes/interactive-e2e.js

@@ -9,16 +9,26 @@ const menu = require('../gui/menu')
 const Events = require('../gui/events')
 const Windows = require('../gui/windows')
 
+const { getPathToDesktopIndex } = require('@packages/resolve-dist')
+
 const isDev = () => {
   return process.env['CYPRESS_INTERNAL_ENV'] === 'development'
 }
 
+const getUrl = function (type) {
+  if (type === 'e2e' || !process.env.LAUNCHPAD) {
+    return getPathToDesktopIndex('desktop-gui')
+  }
+
+  return getPathToDesktopIndex('launchpad')
+}
+
 module.exports = {
   isMac () {
     return os.platform() === 'darwin'
   },
 
-  getWindowArgs (state) {
+  getWindowArgs (state, options) {
     // Electron Window's arguments
     // These options are passed to Electron's BrowserWindow
     const minWidth = Math.round(/* 13" MacBook Air */ 1792 / 3) // Thirds
@@ -97,6 +107,7 @@ module.exports = {
       onClose () {
         app.quit()
       },
+      url: getUrl(options.testingType),
     }
 
     return _.extend(common, this.platformArgs())

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()