From 2b1d00957bbd379d6add2ea8d7013ec363bf0de1 Mon Sep 17 00:00:00 2001
From: ignatiusm <ignatius.menzies@gmail.com>
Date: Fri, 31 Jul 2026 13:58:45 +1200
Subject: [PATCH 1/3] Update e2e test to use new test data

---
 application/common/cypress/support/commands.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/common/cypress/support/commands.ts b/application/common/cypress/support/commands.ts
index ece42fc8..01b00d1d 100644
--- a/application/common/cypress/support/commands.ts
+++ b/application/common/cypress/support/commands.ts
@@ -33,8 +33,8 @@ Cypress.Commands.add('uploadCommonFile', (selector, fileName) => {
  */
 Cypress.Commands.add('loginAdminUI', () => {
   cy.visit(AppUrls.ADMIN_CLIENT)
-  cy.get('input[name="email"]').type(TestUsers.ADMIN.email)
-  cy.get('input[name="password"]').type(TestUsers.ADMIN.password)
+  cy.get('input[name="email"]').type(TestUsers.ORG_ADMIN.email)
+  cy.get('input[name="password"]').type(TestUsers.ORG_ADMIN.password)
   cy.get('button[type="submit"]').click()
   cy.url().should('include', '/surveys') // Wait for redirect after successful login
 })

From 719593710e73cdcf937f2d06cb670d38eb641612 Mon Sep 17 00:00:00 2001
From: ignatiusm <ignatius.menzies@gmail.com>
Date: Fri, 31 Jul 2026 14:10:51 +1200
Subject: [PATCH 2/3] Run e2e tests with `yarn test` This refactors
 `application/common/package.json` so that running `yarn test` includes the
 e2e tests. This will hopefully prevent similar bug being caught by CI first
 in the future.

---
 application/common/package.json | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/application/common/package.json b/application/common/package.json
index acfc6006..b6444a24 100644
--- a/application/common/package.json
+++ b/application/common/package.json
@@ -8,8 +8,9 @@
     "lint": "eslint .",
     "build": "true",
     "dev": "true",
-    "test": "jest",
-    "e2e": "CYPRESS_MODE=open bash scripts/run_e2e_tests.sh"
+    "jest": "jest",
+    "e2e": "CYPRESS_MODE=open bash scripts/run_e2e_tests.sh",
+    "test": "yarn run jest && yarn run e2e"
   },
   "devDependencies": {
     "@types/winston": "^2.4.4",

From e121f07c3d602cc7dd674c76fc3c3bcace3b654a Mon Sep 17 00:00:00 2001
From: ignatiusm <ignatius.menzies@gmail.com>
Date: Fri, 31 Jul 2026 15:45:48 +1200
Subject: [PATCH 3/3] Add test:ci yarn script to each workspace

---
 .github/workflows/check.yml           | 2 +-
 application/admin-client/package.json | 1 +
 application/backend/package.json      | 1 +
 application/common/package.json       | 3 ++-
 application/integrations/package.json | 3 ++-
 application/user-client/package.json  | 1 +
 6 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index bd538768..790f5c7f 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -61,7 +61,7 @@ jobs:
           cache: 'yarn'
       - run: yarn install
       - name: Run Tests
-        run: yarn workspace ${{ matrix.workspace }} test
+        run: yarn workspace ${{ matrix.workspace }} test:ci
       - uses: actions/upload-artifact@v4
         if: failure()
         with:
diff --git a/application/admin-client/package.json b/application/admin-client/package.json
index 24b3dff1..595cc3ec 100644
--- a/application/admin-client/package.json
+++ b/application/admin-client/package.json
@@ -60,6 +60,7 @@
     "cy:open": "cypress open",
     "cypress": "CYPRESS_MODE=open bash scripts/run_tests.sh",
     "test": "CYPRESS_MODE=run bash scripts/run_tests.sh",
+    "test:ci": "yarn run test",
     "cy:run": "cypress run"
   },
   "browserslist": {
diff --git a/application/backend/package.json b/application/backend/package.json
index acd16c32..c44ff3fd 100644
--- a/application/backend/package.json
+++ b/application/backend/package.json
@@ -7,6 +7,7 @@
     "type-check": "tsc -b",
     "lint": "eslint .",
     "test": "bash scripts/run_tests.sh",
+    "test:ci": "yarn run test",
     "tsoa:spec": "tsoa spec",
     "tsoa:routes": "tsoa routes",
     "build-docs": "yarn run tsoa:routes && yarn run tsoa:spec && tsx scripts/replace-refs.ts",
diff --git a/application/common/package.json b/application/common/package.json
index b6444a24..8285dd7a 100644
--- a/application/common/package.json
+++ b/application/common/package.json
@@ -10,7 +10,8 @@
     "dev": "true",
     "jest": "jest",
     "e2e": "CYPRESS_MODE=open bash scripts/run_e2e_tests.sh",
-    "test": "yarn run jest && yarn run e2e"
+    "test": "yarn run jest && yarn run e2e",
+    "test:ci": "yarn run jest"
   },
   "devDependencies": {
     "@types/winston": "^2.4.4",
diff --git a/application/integrations/package.json b/application/integrations/package.json
index 9a7d0925..96a66f1a 100644
--- a/application/integrations/package.json
+++ b/application/integrations/package.json
@@ -7,7 +7,8 @@
     "lint": "eslint .",
     "build": "true",
     "dev": "true",
-    "test": "jest"
+    "test": "jest",
+    "test:ci": "yarn run test"
   },
   "workspaces": [
     "packages/*"
diff --git a/application/user-client/package.json b/application/user-client/package.json
index cb7dac24..e2929ef3 100644
--- a/application/user-client/package.json
+++ b/application/user-client/package.json
@@ -11,6 +11,7 @@
     "cy:open": "cypress open",
     "cypress": "CYPRESS_MODE=open bash scripts/run_tests.sh",
     "test": "CYPRESS_MODE=run bash scripts/run_tests.sh",
+    "test:ci": "yarn run test",
     "cy:run": "cypress run"
   },
   "dependencies": {