From aea945b5e114f9140b53a26a57414ba539639833 Mon Sep 17 00:00:00 2001 From: Hans-Georg Winkler Date: Tue, 29 Oct 2024 15:06:30 +0100 Subject: [PATCH] chore(cypress): upgrade cypress and remove self build cypress image (#1445) --- e2e/cypress.config.js | 11 +---------- e2e/run.sh | 5 ++--- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/e2e/cypress.config.js b/e2e/cypress.config.js index ffe14d4f1d..e1e0e5a6f4 100644 --- a/e2e/cypress.config.js +++ b/e2e/cypress.config.js @@ -1,10 +1,10 @@ // https://docs.cypress.io/guides/references/configuration const { defineConfig } = require("cypress") -const { cloudPlugin } = require("cypress-cloud/plugin") module.exports = defineConfig({ e2e: { defaultCommandTimeout: 20000, + pageLoadTimeout: 20000, viewportWidth: 1300, viewportHeight: 1100, videoCompression: 20, @@ -12,14 +12,5 @@ module.exports = defineConfig({ includeShadowDom: true, supportFile: "cypress/support/index.js", // Path to file to load before spec files load. This file is compiled and bundled. (Pass false to disable) specPattern: "cypress/integration/**/*.{js,jsx}", // A String or Array of glob patterns of the test files to load. - setupNodeEvents(on, config) { - on("task", { - log(message) { - console.log(message) - return null - }, - }) - return cloudPlugin(on, config) - }, }, }) diff --git a/e2e/run.sh b/e2e/run.sh index f26ac2d381..05ff6015c1 100755 --- a/e2e/run.sh +++ b/e2e/run.sh @@ -211,7 +211,6 @@ docker run --rm -it \ --env CYPRESS_TEST_DOMAIN="$TEST_DOMAIN" \ --entrypoint $CY_CMD \ --network=host \ - keppel.eu-de-1.cloud.sap/ccloud/cypress-client:latest run "${CY_OPTIONS[@]}" --spec "$SPECS_FOLDER" --browser "$CYPRESS_BROWSER" + keppel.eu-de-1.cloud.sap/ccloud-dockerhub-mirror/cypress/included:12.17.3 run "${CY_OPTIONS[@]}" --spec "$SPECS_FOLDER" --browser "$CYPRESS_BROWSER" # NOTE: for testing and debug inside the container use --entrypoint /bin/bash -# https://github.wdf.sap.corp/cc/secrets/tree/master/ci/cypress-dashboard/Dockerfile -# https://main.ci.eu-de-2.cloud.sap/teams/services/pipelines/cypress-dashboard/jobs/build-cypress-client-image/ +# https://hub.docker.com/r/cypress/included/tags?name=12.17.3