PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Merge pull request #11692 from matrix-org/andybalaam/downgrade-cypress-to-12

Browse source 
Downgrade Cypress to v12.
This commit is contained in:
Andy Balaam 2023-10-02 10:54:07 +01:00 committed by GitHub
commit 8d289544b3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
cypress.config.ts
View file

@ -15,12 +15,11 @@ limitations under the License.
*/ */
import { defineConfig } from "cypress"; import { defineConfig } from "cypress";
import * as fs from "node:fs";
import registerPlugins from "./cypress/plugins"; import registerPlugins from "./cypress/plugins";
export default defineConfig({ export default defineConfig({
video: true, videoUploadOnPasses: false,
projectId: "ppvnzg", projectId: "ppvnzg",
experimentalInteractiveRunEvents: true, experimentalInteractiveRunEvents: true,
experimentalMemoryManagement: true, experimentalMemoryManagement: true,
@ -28,18 +27,6 @@ export default defineConfig({
chromeWebSecurity: false, chromeWebSecurity: false,
e2e: { e2e: {
setupNodeEvents(on, config) { setupNodeEvents(on, config) {
// Delete videos of passing tests
on("after:spec", (spec, results) => {
if (results && results.video) {
const failures = results.tests.some((test) =>
test.attempts.some((attempt) => attempt.state === "failed"),
);
if (!failures) {
fs.unlinkSync(results.video);
}
}
});
return registerPlugins(on, config); return registerPlugins(on, config);
}, },
baseUrl: "http://localhost:8080", baseUrl: "http://localhost:8080",

2
package.json
View file

@ -185,7 +185,7 @@
"babel-jest": "^29.0.0", "babel-jest": "^29.0.0",
"blob-polyfill": "^7.0.0", "blob-polyfill": "^7.0.0",
"chokidar": "^3.5.1", "chokidar": "^3.5.1",
"cypress": "^13.0.0", "cypress": "^12.0.0",
"cypress-axe": "^1.0.0", "cypress-axe": "^1.0.0",
"cypress-cloud": "^2.0.0-beta.0", "cypress-cloud": "^2.0.0-beta.0",
"cypress-multi-reporters": "^1.6.1", "cypress-multi-reporters": "^1.6.1",

24
yarn.lock
View file

@ -1436,10 +1436,10 @@
lazy-ass "1.6.0" lazy-ass "1.6.0"
ramda "0.26.1" ramda "0.26.1"
"@cypress/request@^3.0.0": "@cypress/request@^2.88.11":
version "3.0.0" version "2.88.12"
resolved "https://registry.yarnpkg.com/@cypress/request/-/request-3.0.0.tgz#7f58dfda087615ed4e6aab1b25fffe7630d6dd85" resolved "https://registry.yarnpkg.com/@cypress/request/-/request-2.88.12.tgz#ba4911431738494a85e93fb04498cb38bc55d590"
integrity sha512-GKFCqwZwMYmL3IBoNeR2MM1SnxRIGERsQOTWeQKoYBt2JLqcqiy7JXqO894FLrpjZYqGxW92MNwRH2BN56obdQ== integrity sha512-tOn+0mDZxASFM+cuAP9szGUGPI1HwWVSvdzm7V4cCsPdFTx6qMj29CwaQmRAMIEhORIUBFBsYROYJcveK4uOjA==
dependencies: dependencies:
aws-sign2 "~0.7.0" aws-sign2 "~0.7.0"
aws4 "^1.8.0" aws4 "^1.8.0"
@ -4374,12 +4374,12 @@ cypress-terminal-report@^5.3.2:
semver "^7.3.5" semver "^7.3.5"
tv4 "^1.3.0" tv4 "^1.3.0"
cypress@^13.0.0: cypress@^12.0.0:
version "13.1.0" version "12.17.3"
resolved "https://registry.yarnpkg.com/cypress/-/cypress-13.1.0.tgz#18f268e66662cd91b1766db18bd1f63a66592205" resolved "https://registry.yarnpkg.com/cypress/-/cypress-12.17.3.tgz#1e2b19037236fc60e4a4b3a14f0846be17a1fc0e"
integrity sha512-LUKxCYlB973QBFls1Up4FAE9QIYobT+2I8NvvAwMfQS2YwsWbr6yx7y9hmsk97iqbHkKwZW3MRjoK1RToBFVdQ== integrity sha512-/R4+xdIDjUSLYkiQfwJd630S81KIgicmQOLXotFxVXkl+eTeVO+3bHXxdi5KBh/OgC33HWN33kHX+0tQR/ZWpg==
dependencies: dependencies:
"@cypress/request" "^3.0.0" "@cypress/request" "^2.88.11"
"@cypress/xvfb" "^1.2.4" "@cypress/xvfb" "^1.2.4"
"@types/node" "^16.18.39" "@types/node" "^16.18.39"
"@types/sinonjs__fake-timers" "8.1.1" "@types/sinonjs__fake-timers" "8.1.1"
@ -4414,7 +4414,6 @@ cypress@^13.0.0:
minimist "^1.2.8" minimist "^1.2.8"
ospath "^1.2.2" ospath "^1.2.2"
pretty-bytes "^5.6.0" pretty-bytes "^5.6.0"
process "^0.11.10"
proxy-from-env "1.0.0" proxy-from-env "1.0.0"
request-progress "^3.0.0" request-progress "^3.0.0"
semver "^7.5.3" semver "^7.5.3"
@ -8544,11 +8543,6 @@ process-nextick-args@~2.0.0:
resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag== integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==
process@^0.11.10:
version "0.11.10"
resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
integrity sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==
prompts@^2.0.1: prompts@^2.0.1:
version "2.4.2" version "2.4.2"
resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.4.2.tgz#7b57e73b3a48029ad10ebd44f74b01722a4cb069" resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.4.2.tgz#7b57e73b3a48029ad10ebd44f74b01722a4cb069"