Skip to content
This repository was archived by the owner on Sep 1, 2024. It is now read-only.

Commit 84224be

Browse files
committed
[cypress] Support Cypress 13
1 parent 1885917 commit 84224be

File tree

18 files changed

+573
-409
lines changed

18 files changed

+573
-409
lines changed

.github/workflows/ci.yaml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,8 @@ jobs:
127127
- "12.15"
128128
- "12.16"
129129
- "12.17"
130+
- "13.0"
131+
- "13.1"
130132
steps:
131133
- uses: actions/checkout@v4
132134

@@ -169,7 +171,7 @@ jobs:
169171
env:
170172
CYPRESS_INSTALL_BINARY: "0"
171173
run: |
172-
yarn set resolution "cypress@npm:10 - 12" ${{ matrix.cypress }}
174+
yarn set resolution "cypress@npm:11.2 - 13" ${{ matrix.cypress }}
173175
grep --after-context=1 "^\".*cypress.*" yarn.lock
174176
175177
- name: Install Cypress binary
@@ -232,6 +234,8 @@ jobs:
232234
- "12.15"
233235
- "12.16"
234236
- "12.17"
237+
- "13.0"
238+
- "13.1"
235239
steps:
236240
- uses: actions/checkout@v4
237241

@@ -278,7 +282,7 @@ jobs:
278282
env:
279283
CYPRESS_INSTALL_BINARY: "0"
280284
run: |
281-
yarn set resolution "cypress@npm:10 - 12" ${{ matrix.cypress }}
285+
yarn set resolution "cypress@npm:11.2 - 13" ${{ matrix.cypress }}
282286
Select-String -Pattern '^".*cypress.*' -Path yarn.lock -Context 0,1
283287
284288
- name: Install Cypress binary

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ complete usage instructions.
2828

2929
This plugin maintains compatibility with the Cypress and Node.js versions listed below:
3030

31-
[![11.2.0+ | 12.0.0+](https://img.shields.io/badge/Cypress-11.2.0%2B%20%7C%2012.0.0%2B-17202C?logo=cypress&labelColor=white&logoColor=17202C&style=flat)](https://cypress.io)
31+
[![11.2.0+ | 12.0.0+ | 13.0.0+](https://img.shields.io/badge/Cypress-11.2.0%2B%20%7C%2012.0.0%2B%20%7C%2013.0.0%2B-17202C?logo=cypress&labelColor=white&logoColor=17202C&style=flat)](https://cypress.io)
3232
[![16 | 18 | 20](https://img.shields.io/badge/Node.js-16%20%7C%2018%20%7C%2020-339933?logo=node.js&labelColor=white&logoColor=339933&style=flat)](https://nodejs.org)
3333

3434
## Jest Plugin

packages/cypress-plugin/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ complete usage instructions.
1919

2020
This plugin maintains compatibility with the Cypress and Node.js versions listed below:
2121

22-
[![11.2.0+ | 12.0.0+](https://img.shields.io/badge/Cypress-11.2.0%2B%20%7C%2012.0.0%2B-17202C?logo=cypress&labelColor=white&logoColor=17202C&style=flat)](https://cypress.io)
22+
[![11.2.0+ | 12.0.0+ | 13.0.0+](https://img.shields.io/badge/Cypress-11.2.0%2B%20%7C%2012.0.0%2B%20%7C%2013.0.0%2B-17202C?logo=cypress&labelColor=white&logoColor=17202C&style=flat)](https://cypress.io)
2323
[![16 | 18 | 20](https://img.shields.io/badge/Node.js-16%20%7C%2018%20%7C%2020-339933?logo=node.js&labelColor=white&logoColor=339933&style=flat)](https://nodejs.org)
2424

2525
## Contributing

packages/cypress-plugin/mocha.d.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ declare namespace Mocha {
2020

2121
// Additional fields that Cypress adds to Mocha.Test.
2222
export type CypressTestProps = {
23-
id: string;
24-
order: number;
2523
wallClockStartedAt: string;
2624
};
2725

packages/cypress-plugin/package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@
5656
"debug": "^4.3.3",
5757
"deep-equal": "^2.0.5",
5858
"es6-promisify": "^7.0.0",
59+
"escape-string-regexp": "^4.0.0",
5960
"lodash": "^4.17.21",
6061
"log-symbols": "^4.1.0",
6162
"mocha": "=7.0.1",
@@ -80,7 +81,7 @@
8081
"@types/yargs": "^17.0.24",
8182
"@unflakable/plugins-common": "workspace:",
8283
"cross-env": "^7.0.3",
83-
"cypress": "10 - 12",
84+
"cypress": "11.2 - 13",
8485
"jest": "^29.5.0",
8586
"jest-environment-node": "^29.5.0",
8687
"rimraf": "^5.0.1",
@@ -91,7 +92,7 @@
9192
"widest-line": "3.1.0"
9293
},
9394
"peerDependencies": {
94-
"cypress": "11.2 - 12"
95+
"cypress": "11.2 - 13"
9596
},
9697
"scripts": {
9798
"build": "yarn clean && tsc --noEmit && tsc --noEmit -p src && rollup --config",

packages/cypress-plugin/src/main.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,7 @@ const main = async (): Promise<void> => {
393393
}
394394
: runOptions
395395
);
396-
if (results.status === "finished") {
396+
if (results.status !== "failed") {
397397
exitDefault(results, unflakableConfig);
398398
} else {
399399
exitFailure(results);

0 commit comments

Comments
 (0)