From 08a16f2b473823b67d4cf683e14b29ab04818218 Mon Sep 17 00:00:00 2001 From: Tessa Alexander Date: Thu, 14 Sep 2023 12:44:15 +0100 Subject: [PATCH] Update Cypress and add helper README info for running Cypress tests locally --- Jenkinsfile.demo | 2 +- Jenkinsfile.prod | 2 +- Jenkinsfile.test | 2 +- README.md | 4 ++-- cypress.example.env.json | 4 ++++ 5 files changed, 9 insertions(+), 5 deletions(-) create mode 100644 cypress.example.env.json diff --git a/Jenkinsfile.demo b/Jenkinsfile.demo index 5279de84..5a01eb37 100644 --- a/Jenkinsfile.demo +++ b/Jenkinsfile.demo @@ -16,7 +16,7 @@ pipeline { stage('Demo: Cypress tests') { agent { docker { - image 'cypress/included:13.0.0' + image 'cypress/included:13.2.0' args '--add-host py-web-d0.epi.bris.ac.uk:172.25.2.76 --entrypoint=""' } } diff --git a/Jenkinsfile.prod b/Jenkinsfile.prod index dc89860c..4f33f817 100644 --- a/Jenkinsfile.prod +++ b/Jenkinsfile.prod @@ -17,7 +17,7 @@ pipeline { stage('Production: Cypress tests') { agent { docker { - image 'cypress/included:13.0.0' + image 'cypress/included:13.2.0' args '--add-host temmpo.org.uk:172.25.2.104 --entrypoint=""' } } diff --git a/Jenkinsfile.test b/Jenkinsfile.test index a76e5e72..cc859cde 100644 --- a/Jenkinsfile.test +++ b/Jenkinsfile.test @@ -16,7 +16,7 @@ pipeline { stage('Test: Cypress tests') { agent { docker { - image 'cypress/included:13.0.0' + image 'cypress/included:13.2.0' args '--add-host py-web-t0.epi.bris.ac.uk:172.25.2.77 --entrypoint=""' } } diff --git a/README.md b/README.md index 7f211346..603317f5 100644 --- a/README.md +++ b/README.md @@ -196,13 +196,13 @@ e.g. Run selenium tests only Using a locally instally node environment -NB: Some tests require these environment variables `CREDENTIALS_USR` and `CREDENTIALS_PSW` to be defined, to be able log into the site being tested. +NB: Some tests require these environment variables `CREDENTIALS_USR` and `CREDENTIALS_PSW` to be defined, to be able log into the site being tested. These details can be found in Research IT's LastPass account. Based on the `cypress.example.env.json` create a `cypress.env.json` file and fill in the details required from LastPass. npx cypress open Using docker and electron browser - docker run -it -v $PWD:/e2e -w /e2e cypress/included:13.0.0 + docker run -it -v $PWD:/e2e -w /e2e cypress/included:13.2.0 ## Warnings diff --git a/cypress.example.env.json b/cypress.example.env.json new file mode 100644 index 00000000..36459440 --- /dev/null +++ b/cypress.example.env.json @@ -0,0 +1,4 @@ +{ + "CREDENTIALS_USR": "", + "CREDENTIALS_PSW": "" +} \ No newline at end of file