Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: match alternate edge version string format #25457

Merged
merged 11 commits into from
Jan 30, 2023
Merged

fix: match alternate edge version string format #25457

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
124b7a1
fix: match alternate edge version string format
CarbonCollins Jan 13, 2023
98f090e
Merge branch 'develop' into add-alt-version-forms-for-edge-browser
CarbonCollins Jan 24, 2023
e127b8d
Merge branch 'develop' into add-alt-version-forms-for-edge-browser
CarbonCollins Jan 26, 2023
daade39
chore: add changelog entry
CarbonCollins Jan 26, 2023
7b98807
Merge branch 'develop' into add-alt-version-forms-for-edge-browser
emilyrohrbough Jan 27, 2023
61ba2e6
Apply suggestions from code review
emilyrohrbough Jan 27, 2023
d531df5
Update cli/CHANGELOG.md
emilyrohrbough Jan 27, 2023
8a7f170
Update cli/CHANGELOG.md
emilyrohrbough Jan 27, 2023
9afed88
Merge branch 'develop' of github.com:cypress-io/cypress into add-alt-…
AtofStryker Jan 27, 2023
9ddb560
chore: update changelog to release on Tuesday for 12.5
AtofStryker Jan 27, 2023
32887c3
[run ci]
AtofStryker Jan 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions cli/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,19 @@
<!-- See the ../guides/writing-the-cypress-changelog.md for details on writing the changelog. -->
## 12.4.2

_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).

## 12.4.1

_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:**
Expand Down
8 changes: 4 additions & 4 deletions packages/launcher/lib/known-browsers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
},
Expand All @@ -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,
},
Expand All @@ -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,
},
Expand All @@ -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,
},
Expand Down