fix: match alternate edge version string format (#25457)

* fix: match alternate edge version string format * chore: add changelog entry * Apply suggestions from code review * Update cli/CHANGELOG.md * Update cli/CHANGELOG.md * chore: update changelog to release on Tuesday for 12.5 * [run ci] --------- Co-authored-by: Emily Rohrbough <[email protected]> Co-authored-by: Bill Glesias <[email protected]>
cypress-io · Jan 30, 2023 · 53db0ea · 53db0ea · cypress-bot · Jan 30, 2023
1 parent 1f9ae86
commit 53db0ea
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/cli/CHANGELOG.md b/cli/CHANGELOG.md
@@ -1,4 +1,13 @@
  <!-- See the ../guides/writing-the-cypress-changelog.md for details on writing the changelog. -->
+## 12.5.0
+
+_Released 01/31/2023 (PENDING)_
+
+**Bugfixes:**
+
+- Fixed an issue where alternative Microsoft Edge Beta, Canary, and Dev binary versions were not being discovered by Cypress. 
+  Fixes [#25455](https://github.com/cypress-io/cypress/issues/25455).
+
 ## 12.4.1
 
 _Released 01/27/2023_

diff --git a/packages/launcher/lib/known-browsers.ts b/packages/launcher/lib/known-browsers.ts
@@ -117,7 +117,7 @@ export const knownBrowsers: Browser[] = [
     family: 'chromium',
     channel: 'stable',
     displayName: 'Edge',
-    versionRegex: /Microsoft Edge (\S+)/m,
+    versionRegex: /Microsoft Edge (\S+)/mi,
     binary: ['edge', 'microsoft-edge'],
     minSupportedVersion: MIN_EDGE_VERSION,
   },
@@ -126,7 +126,7 @@ export const knownBrowsers: Browser[] = [
     family: 'chromium',
     channel: 'canary',
     displayName: 'Edge Canary',
-    versionRegex: /Microsoft Edge Canary (\S+)/m,
+    versionRegex: /Microsoft Edge.+?(\S*(?= canary)|(?<=canary )\S*)/mi,
     binary: ['edge-canary', 'microsoft-edge-canary'],
     minSupportedVersion: MIN_EDGE_VERSION,
   },
@@ -135,7 +135,7 @@ export const knownBrowsers: Browser[] = [
     family: 'chromium',
     channel: 'beta',
     displayName: 'Edge Beta',
-    versionRegex: /Microsoft Edge Beta (\S+)/m,
+    versionRegex: /Microsoft Edge.+?(\S*(?= beta)|(?<=beta )\S*)/mi,
     binary: ['edge-beta', 'microsoft-edge-beta'],
     minSupportedVersion: MIN_EDGE_VERSION,
   },
@@ -144,7 +144,7 @@ export const knownBrowsers: Browser[] = [
     family: 'chromium',
     channel: 'dev',
     displayName: 'Edge Dev',
-    versionRegex: /Microsoft Edge Dev (\S+)/m,
+    versionRegex: /Microsoft Edge.+?(\S*(?= dev)|(?<=dev )\S*)/mi,
     binary: ['edge-dev', 'microsoft-edge-dev'],
     minSupportedVersion: MIN_EDGE_VERSION,
   },