Merge branch 'TMMA-461-expand-cypress-tests' of github.com:MRCIEU/tem…

…mpo into TMMA-461-expand-cypress-tests

.github/workflows/check-python-dependcies.yml

@@ -40,7 +40,7 @@ jobs:
       with:
         branch: python-package-updates
         title: Pending python dependency updates
-        # path: lib/test/src/temmpo/
         commit-message: "Automated pip-tools & GitHub Action generated python dependency updates"
         body: "Automated python dependency updates by pip-tools and [create-pull-request](https://github.com/peter-evans/create-pull-request) GitHub action"
-        reviewers: asset-web
+        assignees: asset-web
+    # TMMA-465 Workaround bug triggering follow on workflows, ref: https://github.com/peter-evans/create-pull-request/blob/v5/docs/concepts-guidelines.md#triggering-further-workflow-runs

.github/workflows/docker.yml

@@ -4,6 +4,7 @@ name: Docker build
 # Or can be triggered manualy
 on:
   workflow_dispatch:
+  pull_request:
   push:
     paths:
       # TODO: Review scope of GitHub action grows

.github/workflows/run-django-test.yml

@@ -7,7 +7,6 @@ on:
       - demo_stable
       - prod_stable
   pull_request:
-    types: [review_requested]
   workflow_dispatch:
 
 jobs:

.github/workflows/run-fabric-test.yml

@@ -7,7 +7,6 @@ on:
       - demo_stable
       - prod_stable
   pull_request:
-    types: [review_requested]
   workflow_dispatch:
 
 jobs:

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=""'
                 }
             }

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=""'
                 }
             }

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=""'
                 }
             }

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
 

cypress.example.env.json

@@ -0,0 +1,4 @@
+{
+    "CREDENTIALS_USR": "",
+    "CREDENTIALS_PSW": ""
+}

requirements/requirements.txt

@@ -301,37 +301,37 @@ mysqlclient==2.2.0 \
     --hash=sha256:955dba905a7443ce4788c63fdb9f8d688316260cf60b20ff51ac3b1c77616ede \
     --hash=sha256:9c6b142836c7dba4f723bf9c93cc46b6e5081d65b2af807f400dda9eb85a16d0
     # via -r requirements/requirements.in
-numexpr==2.8.5 \
-    --hash=sha256:1510da20e6f5f45333610b1ded44c566e2690c6c437c84f2a212ca09627c7e01 \
-    --hash=sha256:178b85ad373c6903e55d75787d61b92380439b70d94b001cb055a501b0821335 \
-    --hash=sha256:183d5430db76826e54465c69db93a3c6ecbf03cda5aa1bb96eaad0147e9b68dc \
-    --hash=sha256:283ce8609a7ccbadf91a68f3484558b3e36d27c93c98a41ec205efb0ab43c872 \
-    --hash=sha256:34af2a0e857d02a4bc5758bc037a777d50dacb13bcd57c7905268a3e44994ed6 \
-    --hash=sha256:39ce106f92ccea5b07b1d6f2f3c4370f05edf27691dc720a63903484a2137e48 \
-    --hash=sha256:3c00be69f747f44a631830215cab482f0f77f75af2925695adff57c1cc0f9a68 \
-    --hash=sha256:45ed41e55a0abcecf3d711481e12a5fb7a904fe99d42bc282a17cc5f8ea510be \
-    --hash=sha256:4ed0e1c1ef5f34381448539f1fe9015906d21c9cfa2797c06194d4207dadb465 \
-    --hash=sha256:51f3ab160c3847ebcca93cd88f935a7802b54a01ab63fe93152994a64d7a6cf2 \
-    --hash=sha256:558390fea6370003ac749ed9d0f38d708aa096f5dcb707ddb6e0ca5a0dd37da1 \
-    --hash=sha256:55983806815035eb63c5039520688c49536bb7f3cc3fc1d7d64c6a00cf3f353e \
-    --hash=sha256:578fe4008e4d5d6ff01bbeb2d7b7ba1ec658a5cda9c720cd26a9a8325f8ef438 \
-    --hash=sha256:5a8dad2bfaad5a5c34a2e8bbf62b9df1dfab266d345fda1feb20ff4e264b347a \
-    --hash=sha256:62b4faf8e0627673b0210a837792bddd23050ecebc98069ab23eb0633ff1ef5f \
-    --hash=sha256:6df184d40d4cf9f21c71f429962f39332f7398147762588c9f3a5c77065d0c06 \
-    --hash=sha256:783324ba40eb804ecfc9ebae86120a1e339ab112d0ab8a1f0d48a26354d5bf9b \
-    --hash=sha256:894b027438b8ec88dea32a19193716c79f4ff8ddb92302dcc9731b51ba3565a8 \
-    --hash=sha256:9e8b5bf7bcb4e8dcd66522d8fc96e1db7278f901cb4fd2e155efbe62a41dde08 \
-    --hash=sha256:aea6ab45c87c0a7041183c08a798f0ad4d7c5eccbce20cfe79ce6f1a45ef3702 \
-    --hash=sha256:b594dc9e2d6291a0bc5c065e6d9caf3eee743b5663897832e9b17753c002947a \
-    --hash=sha256:b93f5a866cd13a808bc3d3a9c487d94cd02eec408b275ff0aa150f2e8e5191f8 \
-    --hash=sha256:bf85ba1327eb87ec82ae7936f13c8850fb969a0ca34f3ba9fa3897c09d5c80d7 \
-    --hash=sha256:c46350dcdb93e32f033eea5a21269514ffcaf501d9abd6036992d37e48a308b0 \
-    --hash=sha256:cbfd833ee5fdb0efb862e152aee7e6ccea9c596d5c11d22604c2e6307bff7cad \
-    --hash=sha256:db5c65417d69414f1ab31302ea01d3548303ef31209c38b4849d145be4e1d1ba \
-    --hash=sha256:dd57ab1a3d3aaa9274aff1cefbf93b8ddacc7973afef5b125905f6bf18fabab0 \
-    --hash=sha256:de29c77f674e4eb8f0846525a475cab64008c227c8bc4ba5153ab3f72441cc63 \
-    --hash=sha256:eb36ffcfa1606e41aa08d559b4277bcad0e16b83941d1a4fee8d2bd5a34f8e0e \
-    --hash=sha256:ef621b4ee366a5c6a484f6678c9259f5b826569f8bfa0b89ba2306d5055468bb
+numexpr==2.8.6 \
+    --hash=sha256:15469dc722b5ceb92324ec8635411355ebc702303db901ae8cc87f47c5e3a124 \
+    --hash=sha256:18b1804923cfa3be7bbb45187d01c0540c8f6df4928c22a0f786e15568e9ebc5 \
+    --hash=sha256:1967c16f61c27df1cdc43ba3c0ba30346157048dd420b4259832276144d0f64e \
+    --hash=sha256:211804ec25a9f6d188eadf4198dd1a92b2f61d7d20993c6c7706139bc4199c5b \
+    --hash=sha256:27782177a0081bd0aab229be5d37674e7f0ab4264ef576697323dd047432a4cd \
+    --hash=sha256:31cf610c952eec57081171f0b4427f9bed2395ec70ec432bbf45d260c5c0cdeb \
+    --hash=sha256:38b8b90967026bbc36c7aa6e8ca3b8906e1990914fd21f446e2a043f4ee3bc06 \
+    --hash=sha256:47b45da5aa25600081a649f5e8b2aa640e35db3703f4631f34bb1f2f86d1b5b4 \
+    --hash=sha256:6336f8dba3f456e41a4ffc3c97eb63d89c73589ff6e1707141224b930263260d \
+    --hash=sha256:681812e2e71ff1ba9145fac42d03f51ddf6ba911259aa83041323f68e7458002 \
+    --hash=sha256:6d7003497d82ef19458dce380b36a99343b96a3bd5773465c2d898bf8f5a38f9 \
+    --hash=sha256:6e884687da8af5955dc9beb6a12d469675c90b8fb38b6c93668c989cfc2cd982 \
+    --hash=sha256:80acbfefb68bd92e708e09f0a02b29e04d388b9ae72f9fcd57988aca172a7833 \
+    --hash=sha256:84979bf14143351c2db8d9dd7fef8aca027c66ad9df9cb5e75c93bf5f7b5a338 \
+    --hash=sha256:8564186aad5a2c88d597ebc79b8171b52fd33e9b085013e1ff2208f7e4b387e3 \
+    --hash=sha256:8e3e6f1588d6c03877cb3b3dcc3096482da9d330013b886b29cb9586af5af3eb \
+    --hash=sha256:95b9da613761e4fc79748535b2a1f58cada22500e22713ae7d9571fa88d1c2e2 \
+    --hash=sha256:95c09e814b0d6549de98b5ded7cdf7d954d934bb6b505432ff82e83a6d330bda \
+    --hash=sha256:9ef7e8aaa84fce3aba2e65f243d14a9f8cc92aafd5d90d67283815febfe43eeb \
+    --hash=sha256:aa0f661f5f4872fd7350cc9895f5d2594794b2a7e7f1961649a351724c64acc9 \
+    --hash=sha256:b5f96c89aa0b1f13685ec32fa3d71028db0b5981bfd99a0bbc271035949136b3 \
+    --hash=sha256:c48221b6a85494a7be5a022899764e58259af585dff031cecab337277278cc93 \
+    --hash=sha256:c8f37f7a6af3bdd61f2efd1cafcc083a9525ab0aaf5dc641e7ec8fc0ae2d3aa1 \
+    --hash=sha256:d126938c2c3784673c9c58d94e00b1570aa65517d9c33662234d442fc9fb5795 \
+    --hash=sha256:d36528a33aa9c23743b3ea686e57526a4f71e7128a1be66210e1511b09c4e4e9 \
+    --hash=sha256:d6a88d71c166e86b98d34701285d23e3e89d548d9f5ae3f4b60919ac7151949f \
+    --hash=sha256:dee04d72307c09599f786b9231acffb10df7d7a74b2ce3681d74a574880d13ce \
+    --hash=sha256:e640bc0eaf1b59f3dde52bc02bbfda98e62f9950202b0584deba28baf9f36bbb \
+    --hash=sha256:e93d64cd20940b726477c3cb64926e683d31b778a1e18f9079a5088fd0d8e7c8 \
+    --hash=sha256:ef6e8896457a60a539cb6ba27da78315a9bb31edb246829b25b5b0304bfcee91
     # via -r requirements/requirements.in
 numpy==1.24.4 \
     --hash=sha256:04640dab83f7c6c85abf9cd729c5b65f1ebd0ccf9de90b270cd61935eef0197f \
@@ -432,9 +432,9 @@ sqlparse==0.4.4 \
     --hash=sha256:5430a4fe2ac7d0f93e66f1efc6e1338a41884b7ddf2a350cedd20ccc4d9d28f3 \
     --hash=sha256:d446183e84b8349fa3061f0fe7f06ca94ba65b426946ffebe6e3e8295332420c
     # via django
-typing-extensions==4.7.1 \
-    --hash=sha256:440d5dd3af93b060174bf433bccd69b0babc3b15b1a8dca43789fd7f61514b36 \
-    --hash=sha256:b75ddc264f0ba5615db7ba217daeb99701ad295353c45f9e95963337ceeeffb2
+typing-extensions==4.8.0 \
+    --hash=sha256:8f92fc8806f9a6b641eaa5318da32b44d401efaac0f6678c9bc448ba3605faa0 \
+    --hash=sha256:df8e4339e9cb77357558cbdbceca33c303714cf861d1eef15e1070055ae8b7ef
     # via asgiref
 tzdata==2023.3 \
     --hash=sha256:11ef1e08e54acb0d4f95bdb1be05da659673de4acbd21bf9c69e94cc5e907a3a \