From 124b7a13c87e9c70041bdcef15644b9f6d9fa726 Mon Sep 17 00:00:00 2001 From: Steven Collins Date: Fri, 13 Jan 2023 14:32:16 +0100 Subject: [PATCH 1/7] fix: match alternate edge version string format --- packages/launcher/lib/known-browsers.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/launcher/lib/known-browsers.ts b/packages/launcher/lib/known-browsers.ts index 51ec9bb24dc6..a9055824bcb3 100644 --- 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', 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', 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, }, From daade399c8520023bdd6d235b7779275f15d85fa Mon Sep 17 00:00:00 2001 From: Steven Collins Date: Thu, 26 Jan 2023 09:21:18 +0100 Subject: [PATCH 2/7] chore: add changelog entry --- cli/CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cli/CHANGELOG.md b/cli/CHANGELOG.md index 8403830c2e87..685ad647bbc4 100644 --- a/cli/CHANGELOG.md +++ b/cli/CHANGELOG.md @@ -9,6 +9,8 @@ _Released 01/31/2023 (PENDING)_ Fixes [#25568](https://github.com/cypress-io/cypress/issues/25568). - Fixed an issue where alternative Microsoft Edge Beta and Canary binary names were not being discovered by Cypress. Fixes [#25455](https://github.com/cypress-io/cypress/issues/25455). +- 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). **Dependency Updates:** From 61ba2e6db9720cd9359dc788e3570cecfb708b02 Mon Sep 17 00:00:00 2001 From: Emily Rohrbough Date: Fri, 27 Jan 2023 11:11:00 -0600 Subject: [PATCH 3/7] Apply suggestions from code review --- cli/CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/cli/CHANGELOG.md b/cli/CHANGELOG.md index 9899d671d284..6b1cb19a588b 100644 --- a/cli/CHANGELOG.md +++ b/cli/CHANGELOG.md @@ -4,6 +4,7 @@ _Released 01/32/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). From d531df512301beffdeba7f639613ee0a05ac1445 Mon Sep 17 00:00:00 2001 From: Emily Rohrbough Date: Fri, 27 Jan 2023 11:11:22 -0600 Subject: [PATCH 4/7] Update cli/CHANGELOG.md --- cli/CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/cli/CHANGELOG.md b/cli/CHANGELOG.md index 6b1cb19a588b..c079e1a81abe 100644 --- a/cli/CHANGELOG.md +++ b/cli/CHANGELOG.md @@ -14,7 +14,6 @@ _Released 01/27/2023_ **Bugfixes:** - - Fixed a regression from Cypress [12.4.0](https://docs.cypress.io/guides/references/changelog#12-4-0) where Cypress was not exiting properly when running multiple Component Testing specs in `electron` in `run` mode. Fixes [#25568](https://github.com/cypress-io/cypress/issues/25568). **Dependency Updates:** From 8a7f170c94885c928db0e73e632add6ba769e7d3 Mon Sep 17 00:00:00 2001 From: Emily Rohrbough Date: Fri, 27 Jan 2023 12:01:10 -0600 Subject: [PATCH 5/7] Update cli/CHANGELOG.md --- cli/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli/CHANGELOG.md b/cli/CHANGELOG.md index c079e1a81abe..e4e163fb640e 100644 --- a/cli/CHANGELOG.md +++ b/cli/CHANGELOG.md @@ -1,5 +1,5 @@ - ## 12.4.2 +## 12.4.2 _Released 01/32/2023 (PENDING)_ From 9ddb560310d0a3e11814c2bf302ebabe8f291269 Mon Sep 17 00:00:00 2001 From: Bill Glesias Date: Fri, 27 Jan 2023 15:32:12 -0500 Subject: [PATCH 6/7] chore: update changelog to release on Tuesday for 12.5 --- cli/CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cli/CHANGELOG.md b/cli/CHANGELOG.md index e4e163fb640e..55b2ad3c72f8 100644 --- a/cli/CHANGELOG.md +++ b/cli/CHANGELOG.md @@ -1,7 +1,7 @@ -## 12.4.2 +## 12.5.0 -_Released 01/32/2023 (PENDING)_ +_Released 01/31/2023 (PENDING)_ **Bugfixes:** From 32887c3636de9b5689f9d8f7a201659b3aa95059 Mon Sep 17 00:00:00 2001 From: Bill Glesias Date: Fri, 27 Jan 2023 15:32:26 -0500 Subject: [PATCH 7/7] [run ci]