Skip to content

Commit aed9201

Browse files
Merge branch 'develop' into feat/support_angular_18
2 parents 7f8f880 + e790891 commit aed9201

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+6220
-5241
lines changed

.circleci/cache-version.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# Bump this version to force CI to re-create the cache from scratch.
22

3-
05-09-24
3+
05-23-24

.circleci/workflows.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ mainBuildFilters: &mainBuildFilters
3030
- /^release\/\d+\.\d+\.\d+$/
3131
# use the following branch as well to ensure that v8 snapshot cache updates are fully tested
3232
- 'update-v8-snapshot-cache-on-develop'
33+
- 'ignore-chrom-prefs'
3334
- 'publish-binary'
34-
- 'feat/vite_5_support'
3535

3636
# usually we don't build Mac app - it takes a long time
3737
# but sometimes we want to really confirm we are doing the right thing
@@ -42,7 +42,7 @@ macWorkflowFilters: &darwin-workflow-filters
4242
- equal: [ develop, << pipeline.git.branch >> ]
4343
# use the following branch as well to ensure that v8 snapshot cache updates are fully tested
4444
- equal: [ 'update-v8-snapshot-cache-on-develop', << pipeline.git.branch >> ]
45-
- equal: [ 'feat/vite_5_support', << pipeline.git.branch >> ]
45+
- equal: [ 'ignore-chrom-prefs', << pipeline.git.branch >> ]
4646
- matches:
4747
pattern: /^release\/\d+\.\d+\.\d+$/
4848
value: << pipeline.git.branch >>
@@ -53,7 +53,7 @@ linuxArm64WorkflowFilters: &linux-arm64-workflow-filters
5353
- equal: [ develop, << pipeline.git.branch >> ]
5454
# use the following branch as well to ensure that v8 snapshot cache updates are fully tested
5555
- equal: [ 'update-v8-snapshot-cache-on-develop', << pipeline.git.branch >> ]
56-
- equal: [ 'feat/vite_5_support', << pipeline.git.branch >> ]
56+
- equal: [ 'ignore-chrom-prefs', << pipeline.git.branch >> ]
5757
- matches:
5858
pattern: /^release\/\d+\.\d+\.\d+$/
5959
value: << pipeline.git.branch >>
@@ -76,7 +76,7 @@ windowsWorkflowFilters: &windows-workflow-filters
7676
- equal: [ develop, << pipeline.git.branch >> ]
7777
# use the following branch as well to ensure that v8 snapshot cache updates are fully tested
7878
- equal: [ 'update-v8-snapshot-cache-on-develop', << pipeline.git.branch >> ]
79-
- equal: [ 'chore/fix_illegal_characters_in_windows', << pipeline.git.branch >> ]
79+
- equal: [ 'feat/support_next_14', << pipeline.git.branch >> ]
8080
- matches:
8181
pattern: /^release\/\d+\.\d+\.\d+$/
8282
value: << pipeline.git.branch >>
@@ -152,7 +152,7 @@ commands:
152152
name: Set environment variable to determine whether or not to persist artifacts
153153
command: |
154154
echo "Setting SHOULD_PERSIST_ARTIFACTS variable"
155-
echo 'if ! [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "release/"* && "$CIRCLE_BRANCH" != "feat/vite_5_support" ]]; then
155+
echo 'if ! [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "release/"* && "$CIRCLE_BRANCH" != "ignore-chrom-prefs" ]]; then
156156
export SHOULD_PERSIST_ARTIFACTS=true
157157
fi' >> "$BASH_ENV"
158158
# You must run `setup_should_persist_artifacts` command and be using bash before running this command
+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
exports['questions-remain returns object if all questions have been answered 1'] = {
2+
'foo': 'foo is specified',
3+
'bar': 'so is bar',
4+
}
5+
6+
exports['questions-remain asks questions for missing options 1'] = {
7+
'foo': 'foo is specified',
8+
'bar': 'bar user answer',
9+
}

browser-versions.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"chrome:beta": "126.0.6478.17",
3-
"chrome:stable": "125.0.6422.112",
2+
"chrome:beta": "126.0.6478.26",
3+
"chrome:stable": "125.0.6422.141",
44
"chrome:minimum": "64.0.3282.0"
55
}

cli/CHANGELOG.md

+13-2
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,27 @@
11
<!-- See the ../guides/writing-the-cypress-changelog.md for details on writing the changelog. -->
22
## 13.11.0
33

4-
_Released 6/04/2024 (PENDING)_
4+
_Released 6/4/2024 (PENDING)_
55

66
**Features:**
77

8-
- Adds Component Testing support for Angular version 18. Addresses [#29309](https://github.com/cypress-io/cypress/issues/29309).
8+
- Added support for [Next.js 14](https://nextjs.org/blog/next-14) for component testing. Addresses [#28185](https://github.com/cypress-io/cypress/issues/28185).
9+
- Adds Component Testing support for Angular version 18. Addresses [#29309](https://github.com/cypress-io/cypress/issues/29309).
10+
- Added an `IGNORE_CHROME_PREFERENCES` environment variable to ignore Chrome preferences when launching Chrome. Addresses [#29330](https://github.com/cypress-io/cypress/issues/29330).
11+
12+
**Performance:**
13+
14+
- Improved performance when setting console props within `Cypress.log`. Addressed in [#29501](https://github.com/cypress-io/cypress/pull/29501).
915

1016
**Bugfixes:**
1117

18+
- Fixed a situation where the Launchpad would hang if the project config had not been loaded when the Launchpad first queries the current project. Fixes [#29486](https://github.com/cypress-io/cypress/issues/29486).
1219
- Pre-emptively fix behavior with Chrome for when `unload` events are forcefully deprecated by using `pagehide` as a proxy. Fixes [#29241](https://github.com/cypress-io/cypress/issues/29241).
1320

21+
**Misc:**
22+
23+
- Enhanced the type definitions available to `cy.intercept` and `cy.wait`. The `body` property of both the request and response in an interception can optionally be specified with user-defined types. Addresses [#29507](https://github.com/cypress-io/cypress/issues/29507).
24+
1425
## 13.10.0
1526

1627
_Released 5/21/2024_

cli/types/tests/cypress-tests.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -513,7 +513,7 @@ describe('then', () => {
513513

514514
cy.wait(['@foo', '@bar'])
515515
.then(([first, second]) => {
516-
first // $ExpectType Interception
516+
first // $ExpectType Interception<any, any>
517517
})
518518

519519
cy.wait(1234) // $ExpectType Chainable<undefined>

0 commit comments

Comments
 (0)