fix: support launching electron browser from launchpad (#19781)

* do not require path when launching browser * fix type * updated test Co-authored-by: Barthélémy Ledoux <bart@cypress.io> Co-authored-by: Zachary Williams <ZachJW34@gmail.com>
cypress-io · Jan 24, 2022 · 096c4eb · 096c4eb · cypress-bot · Jan 24, 2022
1 parent b5cafec
commit 096c4eb
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 12 deletions.
diff --git a/packages/data-context/src/actions/ProjectActions.ts b/packages/data-context/src/actions/ProjectActions.ts
@@ -305,7 +305,7 @@ export class ProjectActions {
       throw Error(`Cannot save preferences without currentProject.`)
     }
 
-    this.api.insertProjectPreferencesToCache(this.ctx.lifecycleManager.projectTitle, { ...args })
+    this.api.insertProjectPreferencesToCache(this.ctx.lifecycleManager.projectTitle, args)
   }
 
   async codeGenSpec (codeGenCandidate: string, codeGenType: CodeGenType): Promise<NexusGenObjects['ScaffoldedFile']> {

diff --git a/packages/graphql/schemas/schema.graphql b/packages/graphql/schemas/schema.graphql
@@ -685,7 +685,7 @@ type Mutation {
   setProjectIdInConfigFile(projectId: String!): Query
 
   """Save the projects preferences to cache"""
-  setProjectPreferences(browserPath: String!, testingType: TestingTypeEnum!): Query!
+  setProjectPreferences(testingType: TestingTypeEnum!): Query!
 
   """Save the prompt-shown state for this project"""
   setPromptShown(slug: String!): Boolean

diff --git a/packages/graphql/src/schemaTypes/objectTypes/gql-Mutation.ts b/packages/graphql/src/schemaTypes/objectTypes/gql-Mutation.ts
@@ -316,7 +316,6 @@ export const mutation = mutationType({
       description: 'Save the projects preferences to cache',
       args: {
         testingType: nonNull(TestingTypeEnum),
-        browserPath: nonNull(stringArg()),
       },
       async resolve (_, args, ctx) {
         await ctx.actions.project.setProjectPreferences(args)

diff --git a/packages/launchpad/cypress/e2e/choose-a-browser.cy.ts b/packages/launchpad/cypress/e2e/choose-a-browser.cy.ts
@@ -114,7 +114,6 @@ describe('Choose a Browser Page', () => {
       cy.get('@launchButton').click()
 
       cy.wait('@launchProject').then(({ request }) => {
-        expect(request?.body.variables.browserPath).to.contain('/test/chrome/path')
         expect(request?.body.variables.testingType).to.eq('e2e')
       })
     })

diff --git a/packages/launchpad/src/setup/OpenBrowser.vue b/packages/launchpad/src/setup/OpenBrowser.vue
@@ -55,13 +55,13 @@ mutation OpenBrowser_ClearTestingType {
 `
 
 gql`
-mutation OpenBrowser_LaunchProject ($testingType: TestingTypeEnum!, $browserPath: String!)  {
+mutation OpenBrowser_LaunchProject ($testingType: TestingTypeEnum!)  {
   launchOpenProject {
     id
   }
   # Removing for now until we decide what the behavior should be
   # hideBrowserWindow
-  setProjectPreferences(testingType: $testingType, browserPath: $browserPath) {
+  setProjectPreferences(testingType: $testingType) {
     currentProject {
       id
       title
@@ -73,12 +73,11 @@ mutation OpenBrowser_LaunchProject ($testingType: TestingTypeEnum!, $browserPath
 const launchOpenProject = useMutation(OpenBrowser_LaunchProjectDocument)
 const clearCurrentTestingType = useMutation(OpenBrowser_ClearTestingTypeDocument)
 
-const launch = (browserPath?: string) => {
+const launch = () => {
   const testingType = query.data.value?.currentTestingType
 
-  if (browserPath && testingType) {
+  if (testingType) {
     launchOpenProject.executeMutation({
-      browserPath,
       testingType,
     })
   }

diff --git a/packages/launchpad/src/setup/OpenBrowserList.vue b/packages/launchpad/src/setup/OpenBrowserList.vue
@@ -1,7 +1,7 @@
 <template>
   <form
     v-if="browsers"
-    @submit.prevent="emit('launch', props.gql?.currentBrowser?.path)"
+    @submit.prevent="emit('launch')"
   >
     <div
       class="flex flex-wrap py-40px gap-24px justify-center"
@@ -130,7 +130,7 @@ const props = defineProps<{
 
 const emit = defineEmits<{
   (e: 'navigated-back'): void
-  (e: 'launch', value: string | undefined): void
+  (e: 'launch'): void
 }>()
 
 const { t } = useI18n()

diff --git a/packages/types/src/cache.ts b/packages/types/src/cache.ts
@@ -5,7 +5,6 @@ export interface Cache {
 }
 
 export interface Preferences {
-  browserPath: string | null
   testingType: 'e2e' | 'component' | null
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,7 +5,6 @@ export interface Cache { @@
     }
     export interface Preferences {
-      browserPath: string | null
       testingType: 'e2e' | 'component' | null
     }
@@ Expand Down @@