fix(launcher): detect new Chrome 64-bit path on Windows

cypress-io · Aug 31, 2020 · d558e44 · d558e44
1 parent c378960
commit d558e44
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/packages/launcher/__snapshots__/windows_spec.ts.js b/packages/launcher/__snapshots__/windows_spec.ts.js
@@ -176,3 +176,9 @@ exports['windows browser detection detects browsers as expected 1'] = [
     }
   }
 ]
+
+exports['windows browser detection detects new Chrome 64-bit app path 1'] = {
+  "name": "chrome",
+  "version": "4.4.4",
+  "path": "C:/Program Files/Google/Chrome/Application/chrome.exe"
+}
diff --git a/packages/launcher/lib/windows/index.ts b/packages/launcher/lib/windows/index.ts
@@ -9,9 +9,10 @@ import { Browser, FoundBrowser } from '../types'
 import { utils } from '../utils'
 
 function formFullAppPath (name: string) {
-  const prefix = 'C:/Program Files (x86)/Google/Chrome/Application'
-
-  return [normalize(join(prefix, `${name}.exe`))]
+  return [
+    `C:/Program Files (x86)/Google/Chrome/Application/${name}.exe`,
+    `C:/Program Files/Google/Chrome/Application/${name}.exe`,
+  ].map(normalize)
 }
 
 function formChromiumAppPath () {

diff --git a/packages/launcher/test/unit/windows_spec.ts b/packages/launcher/test/unit/windows_spec.ts
@@ -65,6 +65,14 @@ describe('windows browser detection', () => {
     snapshot(detected)
   })
 
+  // @see https://github.com/cypress-io/cypress/issues/8425
+  it('detects new Chrome 64-bit app path', async () => {
+    stubBrowser('C:/Program Files/Google/Chrome/Application/chrome.exe', '4.4.4')
+    const chrome = _.find(browsers, { name: 'chrome', channel: 'stable' })
+
+    snapshot(await windowsHelper.detect(chrome))
+  })
+
   context('#getVersionString', () => {
     it('runs wmic and returns output', async () => {
       stubBrowser('foo', 'bar')