adding additional window chromium paths

cypress-io · Dec 13, 2024 · bafd757 · bafd757 · cypress-bot · Dec 13, 2024
1 parent acf54b2
commit bafd757
Show file tree

Hide file tree

Showing 3 changed files with 99 additions and 4 deletions.
diff --git a/packages/launcher/__snapshots__/windows_spec.ts.js b/packages/launcher/__snapshots__/windows_spec.ts.js
@@ -353,3 +353,72 @@ exports['windows browser detection detects Firefox local installs 1'] = [
     },
   },
 ]
+
+exports['windows browser detection detects Chromium 64-bit install 1'] = [
+  {
+    'name': 'chromium',
+    'family': 'chromium',
+    'channel': 'stable',
+    'displayName': 'Chromium',
+    'versionRegex': {},
+    'binary': [
+      'chromium-browser',
+      'chromium',
+    ],
+    'minSupportedVersion': 64,
+    'path': 'C:/Program Files/Google/chrome-win/chrome.exe',
+    'version': '6.6.6',
+    'findAppParams': {
+      'appName': 'Chromium.app',
+      'executable': 'Contents/MacOS/Chromium',
+      'bundleId': 'org.chromium.Chromium',
+      'versionProperty': 'CFBundleShortVersionString',
+    },
+  },
+]
+
+exports['windows browser detection detects Chromium 32-bit install in Chromium folder 1'] = [
+  {
+    'name': 'chromium',
+    'family': 'chromium',
+    'channel': 'stable',
+    'displayName': 'Chromium',
+    'versionRegex': {},
+    'binary': [
+      'chromium-browser',
+      'chromium',
+    ],
+    'minSupportedVersion': 64,
+    'path': 'C:/Program Files (x86)/Google/Chromium/chrome.exe',
+    'version': '7.7.7',
+    'findAppParams': {
+      'appName': 'Chromium.app',
+      'executable': 'Contents/MacOS/Chromium',
+      'bundleId': 'org.chromium.Chromium',
+      'versionProperty': 'CFBundleShortVersionString',
+    },
+  },
+]
+
+exports['windows browser detection detects Chromium 64-bit install in Chromium folder 1'] = [
+  {
+    'name': 'chromium',
+    'family': 'chromium',
+    'channel': 'stable',
+    'displayName': 'Chromium',
+    'versionRegex': {},
+    'binary': [
+      'chromium-browser',
+      'chromium',
+    ],
+    'minSupportedVersion': 64,
+    'path': 'C:/Program Files/Google/Chromium/chrome.exe',
+    'version': '8.8.8',
+    'findAppParams': {
+      'appName': 'Chromium.app',
+      'executable': 'Contents/MacOS/Chromium',
+      'bundleId': 'org.chromium.Chromium',
+      'versionProperty': 'CFBundleShortVersionString',
+    },
+  },
+]
diff --git a/packages/launcher/lib/windows/index.ts b/packages/launcher/lib/windows/index.ts
@@ -26,9 +26,12 @@ function formChromeBetaAppPath () {
 }
 
 function formChromiumAppPath () {
-  const exe = 'C:/Program Files (x86)/Google/chrome-win32/chrome.exe'
-
-  return [normalize(exe)]
+  return [
+    'C:/Program Files (x86)/Google/chrome-win32/chrome.exe',
+    'C:/Program Files/Google/chrome-win/chrome.exe',
+    'C:/Program Files/Google/Chromium/chrome.exe',
+    'C:/Program Files (x86)/Google/Chromium/chrome.exe',
+  ].map(normalize)
 }
 
 function formChromeCanaryAppPath () {

diff --git a/packages/launcher/test/unit/windows_spec.ts b/packages/launcher/test/unit/windows_spec.ts
@@ -45,8 +45,10 @@ describe('windows browser detection', () => {
   it('detects browsers as expected', async () => {
     // chrome
     stubBrowser('C:/Program Files (x86)/Google/Chrome/Application/chrome.exe', '1.2.3')
-    // chromium
+    // chromium - 32-bit will be preferred for passivity
     stubBrowser('C:/Program Files (x86)/Google/chrome-win32/chrome.exe', '2.3.4')
+    stubBrowser('C:/Program Files/Google/chrome-win/chrome.exe', '2.3.4')
+
     // chrome-for-testing - 64-bit will be preferred
     stubBrowser('C:/Program Files (x86)/Google/Chrome for Testing/chrome.exe', '1.2.3')
     stubBrowser('C:/Program Files/Google/Chrome for Testing/chrome.exe', '1.2.3')
@@ -110,6 +112,27 @@ describe('windows browser detection', () => {
     snapshot(await detect(firefoxes))
   })
 
+  it('detects Chromium 64-bit install', async () => {
+    stubBrowser('C:/Program Files/Google/chrome-win/chrome.exe', '6.6.6')
+    const chromium = _.find(knownBrowsers, { name: 'chromium' })!
+
+    snapshot(await detect([chromium]))
+  })
+
+  it('detects Chromium 32-bit install in Chromium folder', async () => {
+    stubBrowser('C:/Program Files (x86)/Google/Chromium/chrome.exe', '7.7.7')
+    const chromium = _.find(knownBrowsers, { name: 'chromium' })!
+
+    snapshot(await detect([chromium]))
+  })
+
+  it('detects Chromium 64-bit install in Chromium folder', async () => {
+    stubBrowser('C:/Program Files/Google/Chromium/chrome.exe', '8.8.8')
+    const chromium = _.find(knownBrowsers, { name: 'chromium' })!
+
+    snapshot(await detect([chromium]))
+  })
+
   it('works with :browserName format in Windows', () => {
     sinon.stub(os, 'platform').returns('win32')
     let path = `${HOMEDIR}/foo/bar/browser.exe`