Fix using Chromium installed via snapcraft

packages/desktop-gui/src/lib/browser-model.js

@@ -7,6 +7,7 @@ export default class Browser {
   @observable channel
   @observable version
   @observable path
+  @observable profilePath
   @observable majorVersion
   @observable info
   @observable custom
@@ -20,6 +21,7 @@ export default class Browser {
     this.channel = browser.channel
     this.version = browser.version
     this.path = browser.path
+    this.profilePath = browser.profilePath
     this.majorVersion = browser.majorVersion
     this.info = browser.info
     this.custom = browser.custom

packages/launcher/__snapshots__/browsers_spec.ts.js

@@ -5,7 +5,6 @@ exports['browsers returns the expected list of browsers 1'] = [
     "channel": "stable",
     "displayName": "Chrome",
     "versionRegex": {},
-    "profile": true,
     "binary": [
       "google-chrome",
       "chrome",
@@ -18,7 +17,6 @@ exports['browsers returns the expected list of browsers 1'] = [
     "channel": "stable",
     "displayName": "Chromium",
     "versionRegex": {},
-    "profile": true,
     "binary": [
       "chromium-browser",
       "chromium"
@@ -30,7 +28,6 @@ exports['browsers returns the expected list of browsers 1'] = [
     "channel": "canary",
     "displayName": "Canary",
     "versionRegex": {},
-    "profile": true,
     "binary": "google-chrome-canary"
   },
   {
@@ -40,7 +37,6 @@ exports['browsers returns the expected list of browsers 1'] = [
     "displayName": "Firefox",
     "info": "Firefox support is currently in beta! You can help us continue to improve the Cypress + Firefox experience by [reporting any issues you find](https://on.cypress.io/new-issue).",
     "versionRegex": {},
-    "profile": true,
     "binary": "firefox"
   },
   {
@@ -50,7 +46,6 @@ exports['browsers returns the expected list of browsers 1'] = [
     "displayName": "Firefox Developer Edition",
     "info": "Firefox support is currently in beta! You can help us continue to improve the Cypress + Firefox experience by [reporting any issues you find](https://on.cypress.io/new-issue).",
     "versionRegex": {},
-    "profile": true,
     "binary": [
       "firefox-developer-edition",
       "firefox"
@@ -63,7 +58,6 @@ exports['browsers returns the expected list of browsers 1'] = [
     "displayName": "Firefox Nightly",
     "info": "Firefox support is currently in beta! You can help us continue to improve the Cypress + Firefox experience by [reporting any issues you find](https://on.cypress.io/new-issue).",
     "versionRegex": {},
-    "profile": true,
     "binary": [
       "firefox-nightly",
       "firefox-trunk"
@@ -75,7 +69,6 @@ exports['browsers returns the expected list of browsers 1'] = [
     "channel": "stable",
     "displayName": "Edge",
     "versionRegex": {},
-    "profile": true,
     "binary": "edge"
   },
   {
@@ -84,7 +77,6 @@ exports['browsers returns the expected list of browsers 1'] = [
     "channel": "canary",
     "displayName": "Edge Canary",
     "versionRegex": {},
-    "profile": true,
     "binary": "edge-canary"
   },
   {
@@ -93,7 +85,6 @@ exports['browsers returns the expected list of browsers 1'] = [
     "channel": "beta",
     "displayName": "Edge Beta",
     "versionRegex": {},
-    "profile": true,
     "binary": "edge-beta"
   },
   {
@@ -102,7 +93,6 @@ exports['browsers returns the expected list of browsers 1'] = [
     "channel": "dev",
     "displayName": "Edge Dev",
     "versionRegex": {},
-    "profile": true,
     "binary": "edge-dev"
   }
 ]

packages/launcher/__snapshots__/darwin_spec.ts.js

@@ -5,7 +5,6 @@ exports['darwin browser detection detects browsers as expected 1'] = [
     "channel": "stable",
     "displayName": "Chrome",
     "versionRegex": {},
-    "profile": true,
     "binary": [
       "google-chrome",
       "chrome",
@@ -26,7 +25,6 @@ exports['darwin browser detection detects browsers as expected 1'] = [
     "channel": "stable",
     "displayName": "Chromium",
     "versionRegex": {},
-    "profile": true,
     "binary": [
       "chromium-browser",
       "chromium"
@@ -46,7 +44,6 @@ exports['darwin browser detection detects browsers as expected 1'] = [
     "channel": "canary",
     "displayName": "Canary",
     "versionRegex": {},
-    "profile": true,
     "binary": "google-chrome-canary",
     "path": "/Applications/Google Chrome Canary.app/Contents/MacOS/Google Chrome Canary",
     "version": "someVersion",
@@ -64,7 +61,6 @@ exports['darwin browser detection detects browsers as expected 1'] = [
     "displayName": "Firefox",
     "info": "Firefox support is currently in beta! You can help us continue to improve the Cypress + Firefox experience by [reporting any issues you find](https://on.cypress.io/new-issue).",
     "versionRegex": {},
-    "profile": true,
     "binary": "firefox",
     "path": "/Applications/Firefox.app/Contents/MacOS/firefox-bin",
     "version": "someVersion",
@@ -82,7 +78,6 @@ exports['darwin browser detection detects browsers as expected 1'] = [
     "displayName": "Firefox Developer Edition",
     "info": "Firefox support is currently in beta! You can help us continue to improve the Cypress + Firefox experience by [reporting any issues you find](https://on.cypress.io/new-issue).",
     "versionRegex": {},
-    "profile": true,
     "binary": [
       "firefox-developer-edition",
       "firefox"
@@ -103,7 +98,6 @@ exports['darwin browser detection detects browsers as expected 1'] = [
     "displayName": "Firefox Nightly",
     "info": "Firefox support is currently in beta! You can help us continue to improve the Cypress + Firefox experience by [reporting any issues you find](https://on.cypress.io/new-issue).",
     "versionRegex": {},
-    "profile": true,
     "binary": [
       "firefox-nightly",
       "firefox-trunk"
@@ -123,7 +117,6 @@ exports['darwin browser detection detects browsers as expected 1'] = [
     "channel": "stable",
     "displayName": "Edge",
     "versionRegex": {},
-    "profile": true,
     "binary": "edge",
     "path": "/Applications/Microsoft Edge.app/Contents/MacOS/Microsoft Edge",
     "version": "someVersion",
@@ -140,7 +133,6 @@ exports['darwin browser detection detects browsers as expected 1'] = [
     "channel": "canary",
     "displayName": "Edge Canary",
     "versionRegex": {},
-    "profile": true,
     "binary": "edge-canary",
     "path": "/Applications/Microsoft Edge Canary.app/Contents/MacOS/Microsoft Edge Canary",
     "version": "someVersion",
@@ -157,7 +149,6 @@ exports['darwin browser detection detects browsers as expected 1'] = [
     "channel": "beta",
     "displayName": "Edge Beta",
     "versionRegex": {},
-    "profile": true,
     "binary": "edge-beta",
     "path": "/Applications/Microsoft Edge Beta.app/Contents/MacOS/Microsoft Edge Beta",
     "version": "someVersion",
@@ -174,7 +165,6 @@ exports['darwin browser detection detects browsers as expected 1'] = [
     "channel": "dev",
     "displayName": "Edge Dev",
     "versionRegex": {},
-    "profile": true,
     "binary": "edge-dev",
     "path": "/Applications/Microsoft Edge Dev.app/Contents/MacOS/Microsoft Edge Dev",
     "version": "someVersion",

packages/launcher/__snapshots__/windows_spec.ts.js

@@ -5,7 +5,6 @@ exports['windows browser detection detects browsers as expected 1'] = [
     "channel": "stable",
     "displayName": "Chrome",
     "versionRegex": {},
-    "profile": true,
     "binary": [
       "google-chrome",
       "chrome",
@@ -26,7 +25,6 @@ exports['windows browser detection detects browsers as expected 1'] = [
     "channel": "stable",
     "displayName": "Chromium",
     "versionRegex": {},
-    "profile": true,
     "binary": [
       "chromium-browser",
       "chromium"
@@ -46,7 +44,6 @@ exports['windows browser detection detects browsers as expected 1'] = [
     "channel": "canary",
     "displayName": "Canary",
     "versionRegex": {},
-    "profile": true,
     "binary": "google-chrome-canary",
     "path": "C:/Users/flotwig/AppData/Local/Google/Chrome SxS/Application/chrome.exe",
     "version": "3.4.5",
@@ -64,7 +61,6 @@ exports['windows browser detection detects browsers as expected 1'] = [
     "displayName": "Firefox",
     "info": "Firefox support is currently in beta! You can help us continue to improve the Cypress + Firefox experience by [reporting any issues you find](https://on.cypress.io/new-issue).",
     "versionRegex": {},
-    "profile": true,
     "binary": "firefox",
     "path": "C:/Program Files/Mozilla Firefox/firefox.exe",
     "version": "72",
@@ -82,7 +78,6 @@ exports['windows browser detection detects browsers as expected 1'] = [
     "displayName": "Firefox Developer Edition",
     "info": "Firefox support is currently in beta! You can help us continue to improve the Cypress + Firefox experience by [reporting any issues you find](https://on.cypress.io/new-issue).",
     "versionRegex": {},
-    "profile": true,
     "binary": [
       "firefox-developer-edition",
       "firefox"
@@ -103,7 +98,6 @@ exports['windows browser detection detects browsers as expected 1'] = [
     "displayName": "Firefox Nightly",
     "info": "Firefox support is currently in beta! You can help us continue to improve the Cypress + Firefox experience by [reporting any issues you find](https://on.cypress.io/new-issue).",
     "versionRegex": {},
-    "profile": true,
     "binary": [
       "firefox-nightly",
       "firefox-trunk"
@@ -123,7 +117,6 @@ exports['windows browser detection detects browsers as expected 1'] = [
     "channel": "stable",
     "displayName": "Edge",
     "versionRegex": {},
-    "profile": true,
     "binary": "edge",
     "path": "C:/Program Files (x86)/Microsoft/Edge/Application/msedge.exe",
     "version": "11",
@@ -140,7 +133,6 @@ exports['windows browser detection detects browsers as expected 1'] = [
     "channel": "canary",
     "displayName": "Edge Canary",
     "versionRegex": {},
-    "profile": true,
     "binary": "edge-canary",
     "path": "C:/Users/flotwig/AppData/Local/Microsoft/Edge SxS/Application/msedge.exe",
     "version": "14",
@@ -157,7 +149,6 @@ exports['windows browser detection detects browsers as expected 1'] = [
     "channel": "beta",
     "displayName": "Edge Beta",
     "versionRegex": {},
-    "profile": true,
     "binary": "edge-beta",
     "path": "C:/Program Files (x86)/Microsoft/Edge Beta/Application/msedge.exe",
     "version": "12",
@@ -174,7 +165,6 @@ exports['windows browser detection detects browsers as expected 1'] = [
     "channel": "dev",
     "displayName": "Edge Dev",
     "versionRegex": {},
-    "profile": true,
     "binary": "edge-dev",
     "path": "C:/Program Files (x86)/Microsoft/Edge Dev/Application/msedge.exe",
     "version": "13",

packages/launcher/lib/browsers.ts

@@ -12,7 +12,6 @@ export const browsers: Browser[] = [
     channel: 'stable',
     displayName: 'Chrome',
     versionRegex: /Google Chrome (\S+)/m,
-    profile: true,
     binary: ['google-chrome', 'chrome', 'google-chrome-stable'],
   },
   {
@@ -22,7 +21,6 @@ export const browsers: Browser[] = [
     channel: 'stable',
     displayName: 'Chromium',
     versionRegex: /Chromium (\S+)/m,
-    profile: true,
     binary: ['chromium-browser', 'chromium'],
   },
   {
@@ -31,7 +29,6 @@ export const browsers: Browser[] = [
     channel: 'canary',
     displayName: 'Canary',
     versionRegex: /Google Chrome Canary (\S+)/m,
-    profile: true,
     binary: 'google-chrome-canary',
   },
   {
@@ -42,7 +39,6 @@ export const browsers: Browser[] = [
     info: firefoxInfo,
     // Mozilla Firefox 70.0.1
     versionRegex: /^Mozilla Firefox ([^\sab]+)$/m,
-    profile: true,
     binary: 'firefox',
   },
   {
@@ -53,7 +49,6 @@ export const browsers: Browser[] = [
     info: firefoxInfo,
     // Mozilla Firefox 73.0b12
     versionRegex: /^Mozilla Firefox (\S+b\S*)$/m,
-    profile: true,
     // ubuntu PPAs install it as firefox
     binary: ['firefox-developer-edition', 'firefox'],
   },
@@ -65,7 +60,6 @@ export const browsers: Browser[] = [
     info: firefoxInfo,
     // Mozilla Firefox 74.0a1
     versionRegex: /^Mozilla Firefox (\S+a\S*)$/m,
-    profile: true,
     // ubuntu PPAs install it as firefox-trunk
     binary: ['firefox-nightly', 'firefox-trunk'],
   },
@@ -75,7 +69,6 @@ export const browsers: Browser[] = [
     channel: 'stable',
     displayName: 'Edge',
     versionRegex: /Microsoft Edge (\S+)/m,
-    profile: true,
     binary: 'edge',
   },
   {
@@ -84,7 +77,6 @@ export const browsers: Browser[] = [
     channel: 'canary',
     displayName: 'Edge Canary',
     versionRegex: /Microsoft Edge Canary (\S+)/m,
-    profile: true,
     binary: 'edge-canary',
   },
   {
@@ -93,7 +85,6 @@ export const browsers: Browser[] = [
     channel: 'beta',
     displayName: 'Edge Beta',
     versionRegex: /Microsoft Edge Beta (\S+)/m,
-    profile: true,
     binary: 'edge-beta',
   },
   {
@@ -102,7 +93,6 @@ export const browsers: Browser[] = [
     channel: 'dev',
     displayName: 'Edge Dev',
     versionRegex: /Microsoft Edge Dev (\S+)/m,
-    profile: true,
     binary: 'edge-dev',
   },
 ]

packages/launcher/lib/detect.ts

@@ -99,6 +99,7 @@ function checkOneBrowser (browser: Browser): Promise<boolean | FoundBrowser> {
     'type',
     'version',
     'path',
+    'profilePath',
     'custom',
     'warning',
     'info',