Skip to content

Commit d293c75

Browse files
committed
Merged in task/dspace-cris-2024_02_x/DSC-2740 (pull request DSpace#4118)
[DSC-2740] fix(pipeline): update Cypress browser images to version 22.21.0 Approved-by: Andrea Barbasso
2 parents 3d39530 + 48efcc0 commit d293c75

File tree

2 files changed

+12
-4
lines changed

2 files changed

+12
-4
lines changed

bitbucket-pipelines.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ definitions:
6262
- step: &angular-build
6363
name: angular-build
6464
image:
65-
name: cypress/browsers:node-18.20.3-chrome-125.0.6422.141-1-ff-126.0.1-edge-125.0.2535.85-1
65+
name: cypress/browsers:node-20.18.0-chrome-130.0.6723.69-1-ff-131.0.3-edge-130.0.2849.52-1
6666
run-as-user: 1000
6767
size: 4x
6868
caches:
@@ -78,7 +78,7 @@ definitions:
7878
- step: &unittest-code-checks
7979
name: test-code-checks
8080
image:
81-
name: cypress/browsers:node-18.20.3-chrome-125.0.6422.141-1-ff-126.0.1-edge-125.0.2535.85-1
81+
name: cypress/browsers:node-20.18.0-chrome-130.0.6723.69-1-ff-131.0.3-edge-130.0.2849.52-1
8282
run-as-user: 1000
8383
size: 4x
8484
caches:
@@ -96,7 +96,7 @@ definitions:
9696
- step: &run-e2e-tests
9797
name: Run E2E test
9898
image:
99-
name: cypress/browsers:node-18.20.3-chrome-125.0.6422.141-1-ff-126.0.1-edge-125.0.2535.85-1
99+
name: cypress/browsers:node-20.18.0-chrome-130.0.6723.69-1-ff-131.0.3-edge-130.0.2849.52-1
100100
run-as-user: 0
101101
size: 4x
102102
services:
@@ -105,6 +105,7 @@ definitions:
105105
- node-2024-02-x
106106
- cypress-2024-02-x
107107
script:
108+
- wget -q -O - https://dl.google.com/linux/linux_signing_key.pub | tee /etc/apt/trusted.gpg.d/google.asc >/dev/null
108109
- apt-get update && apt-get install -y curl
109110
- export HASH_COMMIT=${BITBUCKET_COMMIT:0:8}
110111
- echo "Running tests for commit $HASH_COMMIT"
@@ -145,7 +146,7 @@ definitions:
145146
- npx cypress install
146147
- yarn serve:ssr &
147148
- echo "Waiting for server to start..."
148-
- sleep 10
149+
- sleep 60
149150
- echo "Running Cypress tests..."
150151
- yarn cypress:run --env chromeFlags="$CHROME_FLAGS"
151152
- echo "Test execution completed"

cypress/support/e2e.ts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,13 @@ import 'cypress-axe';
2121

2222
import { DSPACE_XSRF_COOKIE } from 'src/app/core/xsrf/xsrf.constants';
2323

24+
// We might receive uncaught exceptions from external libraries (e.g. it happened before with a broken
25+
// version of the addToAny plugin). These should not cause our tests to fail, so we catch them here.
26+
Cypress.on('uncaught:exception', (err, runnable) => {
27+
// returning false here prevents Cypress from failing the test
28+
return false;
29+
});
30+
2431
// Runs once before all tests
2532
before(() => {
2633
// Cypress doesn't have access to the running application in Node.js.

0 commit comments

Comments
 (0)