Merge branch 'master' into parameterise-truststore-bucket

package.json

@@ -31,8 +31,8 @@
   "devDependencies": {
     "@types/jest": "^29.5.13",
     "@types/node": "^22.7.4",
-    "@typescript-eslint/eslint-plugin": "^8.7.0",
-    "@typescript-eslint/parser": "^8.7.0",
+    "@typescript-eslint/eslint-plugin": "^8.8.0",
+    "@typescript-eslint/parser": "^8.8.0",
     "eslint": "^9.11.1",
     "eslint-plugin-import-newlines": "^1.4.0",
     "jest": "^29.7.0",

packages/coordinator/package.json

@@ -53,7 +53,7 @@
     "@types/mustache": "^4.2.5",
     "@types/uuid": "^10.0.0",
     "@types/xml-c14n": "^0.0.3",
-    "axios-mock-adapter": "^1.22.0",
+    "axios-mock-adapter": "^2.0.0",
     "jest-expect-message": "^1.1.3",
     "ts-node-dev": "^2.0.0"
   },

packages/tool/site/client/package.json

@@ -33,7 +33,7 @@
     "@types/react-dom": "^18.3.0",
     "@types/uuid": "^10.0.0",
     "@types/webpack": "^5.28.5",
-    "axios-mock-adapter": "^1.22.0",
+    "axios-mock-adapter": "^2.0.0",
     "babel-loader": "^9.2.1",
     "css-loader": "^7.1.2",
     "eslint-plugin-react": "^7.37.0",

packages/tool/site/client/tests/pages/prescriptionSearchPage.spec.tsx

@@ -135,7 +135,7 @@ test("Displays a message if summary search returns no results", async () => {
     total: 0,
     entry: []
   }
-  mock.onAny(taskTrackerBaseUrl, taskTrackerBaseUrl).reply(200, emptyBundle)
+  mock.onAny(taskTrackerBaseUrl).reply(200, emptyBundle)
 
   const container = await renderPage()
   await enterNhsNumber()
@@ -157,7 +157,7 @@ test("Displays an error message if summary search returns an error", async () =>
       diagnostics: "Invalid query parameters."
     }]
   }
-  mock.onAny(taskTrackerBaseUrl, taskTrackerBaseUrl).reply(400, errorResponse)
+  mock.onAny(taskTrackerBaseUrl).reply(400, errorResponse)
 
   const container = await renderPage()
   await enterNhsNumber()
@@ -168,7 +168,7 @@ test("Displays an error message if summary search returns an error", async () =>
 })
 
 test("Displays an error message if summary search returns invalid response", async () => {
-  mock.onAny(taskTrackerBaseUrl, taskTrackerBaseUrl).reply(500, null)
+  mock.onAny(taskTrackerBaseUrl).reply(500, null)
 
   const container = await renderPage()
   await enterNhsNumber()
@@ -179,7 +179,7 @@ test("Displays an error message if summary search returns invalid response", asy
 })
 
 test("Clicking back from the summary search results returns to the form", async () => {
-  mock.onAny(taskTrackerBaseUrl, taskTrackerBaseUrl).reply(200, summarySearchResult)
+  mock.onAny(taskTrackerBaseUrl).reply(200, summarySearchResult)
 
   const container = await renderPage()
   await enterNhsNumber()
@@ -203,7 +203,7 @@ test("Displays loading text while performing a detail search", async () => {
 })
 
 test("Displays results if detail search completes successfully without previous dispenses", async () => {
-  mock.onAny(taskTrackerBaseUrl, taskTrackerBaseUrl)
+  mock.onAny(taskTrackerBaseUrl)
     .replyOnce(200, summarySearchResult)
     .onAny(taskTrackerBaseUrl)
     .reply(200, detailSearchResult)
@@ -223,7 +223,7 @@ test("Displays results if detail search completes successfully without previous
 })
 
 test("Displays results if detail search completes successfully with previous dispenses", async () => {
-  mock.onAny(taskTrackerBaseUrl, taskTrackerBaseUrl)
+  mock.onAny(taskTrackerBaseUrl)
     .replyOnce(200, summarySearchResult)
     .onAny(taskTrackerBaseUrl)
     .reply(200, detailSearchResult)
@@ -243,7 +243,7 @@ test("Displays results if detail search completes successfully with previous dis
 })
 
 test("Clicking back from the detail search results returns to the summary search", async () => {
-  mock.onAny(taskTrackerBaseUrl, taskTrackerBaseUrl)
+  mock.onAny(taskTrackerBaseUrl)
     .replyOnce(200, summarySearchResult)
     .onAny(taskTrackerBaseUrl)
     .reply(200, detailSearchResult)