Development: Fix cypress dependency issue (#7196)

ls1intum · Sep 14, 2023 · 1fa8b4e · 1fa8b4e
1 parent a51749b
commit 1fa8b4e
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/.bamboo/E2E-tests/cleanup.sh → .ci/E2E-tests/cleanup.sh b/.bamboo/E2E-tests/cleanup.sh → .ci/E2E-tests/cleanup.sh
diff --git a/.bamboo/E2E-tests/execute.sh → .ci/E2E-tests/execute.sh b/.bamboo/E2E-tests/execute.sh → .ci/E2E-tests/execute.sh
@@ -4,10 +4,10 @@ DB=$1
 
 if [ "$DB" = "mysql" ]; then
   COMPOSE_FILE="cypress-E2E-tests-mysql.yml"
-elif [ "$DB" = "postgresql" ]; then
+elif [ "$DB" = "postgres" ]; then
   COMPOSE_FILE="cypress-E2E-tests-postgres.yml"
 else
-  echo "Invalid database type. Please choose either mysql or postgresql."
+  echo "Invalid database type. Please choose either mysql or postgres."
   exit 1
 fi
 

diff --git a/.bamboo/migration-check/cleanup.sh → .ci/migration-check/cleanup.sh b/.bamboo/migration-check/cleanup.sh → .ci/migration-check/cleanup.sh
diff --git a/.bamboo/migration-check/execute.sh → .ci/migration-check/execute.sh b/.bamboo/migration-check/execute.sh → .ci/migration-check/execute.sh
@@ -4,10 +4,10 @@ DB=$1
 
 if [ "$DB" = "mysql" ]; then
   COMPOSE_FILE="artemis-migration-check-mysql.yml"
-elif [ "$DB" = "postgresql" ]; then
+elif [ "$DB" = "postgres" ]; then
   COMPOSE_FILE="artemis-migration-check-postgres.yml"
 else
-  echo "Invalid database type. Please choose either mysql or postgresql."
+  echo "Invalid database type. Please choose either mysql or postgres."
   exit 1
 fi
 

diff --git a/docker/cypress-E2E-tests-mysql.yml b/docker/cypress-E2E-tests-mysql.yml
@@ -44,7 +44,7 @@ services:
         environment:
             CYPRESS_DB_TYPE: "MySQL"
             SORRY_CYPRESS_PROJECT_ID: "artemis-mysql"
-        command: sh -c "cd /app/artemis/src/test/cypress && chmod 777 /root && npm ci && npm run cypress:setup && (npm run cypress:record:mysql & sleep 60 && npm run cypress:record:mysql & wait)"
+        command: sh -c "cd /app/artemis/src/test/cypress && chmod 777 /root && npm ci --legacy-peer-deps && npm run cypress:setup && (npm run cypress:record:mysql & sleep 60 && npm run cypress:record:mysql & wait)"
 
 networks:
     artemis:

diff --git a/docker/cypress-E2E-tests-postgres.yml b/docker/cypress-E2E-tests-postgres.yml
@@ -44,7 +44,7 @@ services:
         environment:
             CYPRESS_DB_TYPE: "Postgres"
             SORRY_CYPRESS_PROJECT_ID: "artemis-postgres"
-        command: sh -c "cd /app/artemis/src/test/cypress && chmod 777 /root && npm ci && npm run cypress:setup && (npm run cypress:record:postgres & sleep 60 && npm run cypress:record:postgres & wait)"
+        command: sh -c "cd /app/artemis/src/test/cypress && chmod 777 /root && npm ci --legacy-peer-deps && npm run cypress:setup && (npm run cypress:record:postgres & sleep 60 && npm run cypress:record:postgres & wait)"
 
 networks:
     artemis:

diff --git a/src/test/cypress/package.json b/src/test/cypress/package.json
@@ -30,7 +30,7 @@
         "cypress:open": "cypress open",
         "cypress:run": "cypress run --browser=chrome",
         "cypress:setup": "cypress install && cypress run --quiet --spec init/ImportUsers.cy.ts",
-        "cypress:record:mysql": "npx cypress-cloud run --cloud-debug --parallel --record --ci-build-id \"${SORRY_CYPRESS_BRANCH_NAME} #${SORRY_CYPRESS_BUILD_ID} ${SORRY_CYPRESS_RERUN_COUNT} (MySQL)\"",
+        "cypress:record:mysql": "npx cypress-cloud run --parallel --record --ci-build-id \"${SORRY_CYPRESS_BRANCH_NAME} #${SORRY_CYPRESS_BUILD_ID} ${SORRY_CYPRESS_RERUN_COUNT} (MySQL)\"",
         "cypress:record:postgres": "npx cypress-cloud run --parallel --record --ci-build-id \"${SORRY_CYPRESS_BRANCH_NAME} #${SORRY_CYPRESS_BUILD_ID} ${SORRY_CYPRESS_RERUN_COUNT} (Postgres)\"",
         "update": "npm-upgrade"
     }