Skip to content

Commit 524fe27

Browse files
Update to cypress 12 (#213)
2 parents 1deb4d6 + 60e564e commit 524fe27

File tree

6 files changed

+20
-23
lines changed

6 files changed

+20
-23
lines changed

automation/run-e2e/cypress.config.cjs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ module.exports = defineConfig({
1818
videoUploadOnPasses: false,
1919
viewportHeight: 1080,
2020
viewportWidth: 1280,
21+
testIsolation: false,
2122
chromeWebSecurity: false,
2223
specPattern: "cypress/integration/**/*.js",
2324
supportFile: "cypress/support/e2e.js"

automation/run-e2e/lib/ci.mjs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,7 @@ import { createDeploymentBundle, prepareImage, startCypress, startRuntime } from
99
import { setupTestProject } from "./setup-test-project.mjs";
1010
import { updateWidget } from "./utils.mjs";
1111

12-
const MX_VERSION_MAP_URL =
13-
// Remove after merge
14-
"https://raw.githubusercontent.com/mendix/widgets-resources/master/configs/e2e/mendix-versions.json";
15-
// Uncomment after merge
16-
// "https://raw.githubusercontent.com/mendix/web-widgets/main/automation/run-e2e/mendix-versions.json";
12+
const MX_VERSION_MAP_URL = "https://raw.githubusercontent.com/mendix/web-widgets/main/automation/run-e2e/mendix-versions.json";
1713

1814
const { ls, cat } = sh;
1915

automation/run-e2e/lib/docker-utils.mjs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,12 +158,12 @@ export function startCypress(ip, freePort) {
158158
// container name
159159
`--name cypress`,
160160
// image to run, the entrypoint set to `cypress run` by default
161-
`cypress/included:10.11.0`,
161+
`cypress/included:12.1.0`,
162162
// cypress options
163163
`--browser ${browserCypress} ${headedMode}`.trim(),
164164
`--e2e`,
165165
`--config-file cypress.config.cjs`,
166-
`--config baseUrl=http://${ip}:${freePort},video=true,videoUploadOnPasses=false,viewportWidth=1280,viewportHeight=1080,chromeWebSecurity=false`
166+
`--config baseUrl=http://${ip}:${freePort},video=true,videoUploadOnPasses=false,viewportWidth=1280,viewportHeight=1080,testIsolation=false,chromeWebSecurity=false`
167167
];
168168
const command = [`docker run`, ...args].join(" ");
169169

automation/run-e2e/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
"dependencies": {
2323
"ansi-colors": "^4.1.3",
2424
"cross-zip": "^4.0.0",
25-
"cypress": "^10.11.0",
25+
"cypress": "^12.1.0",
2626
"cypress-image-diff-js": "^1.22.0",
27-
"cypress-terminal-report": "^4.1.2",
27+
"cypress-terminal-report": "^5.0.0",
2828
"enquirer": "^2.3.6",
2929
"eslint": "^7.20.0",
3030
"eslint-plugin-cypress": "^2.12.1",

pnpm-lock.yaml

Lines changed: 13 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

turbo.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,5 +51,5 @@
5151
"outputs": []
5252
}
5353
},
54-
"globalDependencies": ["packages/tools/release-utils-internal/**"]
54+
"globalDependencies": ["automation/**"]
5555
}

0 commit comments

Comments
 (0)