Rename tests to testing to differentiate

connoravo-nhs · connoravo-nhs · commit 1b621bc39c7a · 2025-10-21T09:50:48.000Z
Signed-off-by: Connor Avery &lt;214469360+connoravo-nhs@users.noreply.github.com&gt;
diff --git a/SAMtemplates/parameters/main.yaml b/SAMtemplates/parameters/main.yaml
@@ -8,15 +8,15 @@ Parameters:
 
   TC007NHSNumberValue:
     Type: String
-    Default: " "
+    Default: "8396901627,9661034524" # 9992387920 can be used for a default
 
   TC008NHSNumberValue:
     Type: String
-    Default: " "
+    Default: "8618341568,7419356033" # 9992387920 can be used for a default
 
   TC009NHSNumberValue:
     Type: String
-    Default: " "
+    Default: "8548472367,2627847198" # 9992387920 can be used for a default
 
 Resources:
   TC007NHSNumberParameter:
diff --git a/jest.default.config.ts b/jest.default.config.ts
@@ -11,8 +11,8 @@ const jestConfig: JestConfigWithTsJest = {
   moduleFileExtensions: ["js", "json", "ts", "d.ts"],
   moduleNameMapper: {
     "^(\\.{1,2}/.*)\\.js$": "$1",
-    "^@common/tests$": "<rootDir>/../../packages/common/tests/lib/index.js",
-    "^@common/tests/(.*)$": "<rootDir>/../../packages/common/tests/lib/$1.js",
+    "^@common/testing$": "<rootDir>/../../packages/common/tests/lib/index.js",
+    "^@common/testing/(.*)$": "<rootDir>/../../packages/common/tests/lib/$1.js",
     "^@common/utilities$": "<rootDir>/../../packages/common/utilities/lib/index.js",
     "^@common/utilities/(.*)$": "<rootDir>/../../packages/common/utilities/lib/$1.js"
   },
diff --git a/packages/capabilityStatement/tests/test-handler.test.ts b/packages/capabilityStatement/tests/test-handler.test.ts
@@ -9,7 +9,7 @@ import {
   helloworldContext,
   test_append_trace_ids,
   test_mime_type
-} from "@common/tests"
+} from "@common/testing"
 
 const dummyContext = helloworldContext
 const mockEvent: APIGatewayProxyEvent = mockAPIGatewayProxyEvent
diff --git a/packages/common/tests/package.json b/packages/common/tests/package.json
@@ -1,5 +1,5 @@
 {
-    "name": "@common/tests",
+    "name": "@common/testing",
     "version": "1.0.0",
     "description": "Common resources for testing prescriptionsforpatients",
     "author": "NHS Digital",
diff --git a/packages/common/utilities/jest.config.ts b/packages/common/utilities/jest.config.ts
@@ -6,8 +6,8 @@ const jestConfig: JestConfigWithTsJest = {
   rootDir: "./",
   moduleNameMapper: {
     "^(\\.{1,2}/.*)\\.js$": "$1",
-    "^@common/tests$": "<rootDir>/../tests/lib/index.js",
-    "^@common/tests/(.*)$": "<rootDir>/../tests/lib/$1.js",
+    "^@common/testing$": "<rootDir>/../tests/lib/index.js",
+    "^@common/testing/(.*)$": "<rootDir>/../tests/lib/$1.js",
     "^@common/utilities$": "<rootDir>/lib/index.js",
     "^@common/utilities/(.*)$": "<rootDir>/lib/$1.js"
   }
diff --git a/packages/common/utilities/tests/config.test.ts b/packages/common/utilities/tests/config.test.ts
@@ -1,4 +1,4 @@
-import {createMockedPfPConfig, setupTestEnvironment, MockedPfPConfig} from "@common/tests"
+import {createMockedPfPConfig, setupTestEnvironment, MockedPfPConfig} from "@common/testing"
 import {
   expect,
   describe,
diff --git a/packages/distanceSelling/tests/distanceSelling.test.ts b/packages/distanceSelling/tests/distanceSelling.test.ts
@@ -6,7 +6,7 @@ import {
   Organization
 } from "fhir/r4"
 import {DistanceSelling, Entry, ServicesCache} from "../src/distanceSelling"
-import {mockInteractionResponseBody, mockPharmacy2uResponse} from "@common/tests"
+import {mockInteractionResponseBody, mockPharmacy2uResponse} from "@common/testing"
 import MockAdapter from "axios-mock-adapter"
 import axios from "axios"
 import {Logger} from "@aws-lambda-powertools/logger"
diff --git a/packages/enrichPrescriptions/tests/testStatusUpdate.test.ts b/packages/enrichPrescriptions/tests/testStatusUpdate.test.ts
@@ -38,7 +38,7 @@ import {
 import {Bundle, MedicationRequest} from "fhir/r4"
 import {Logger} from "@aws-lambda-powertools/logger"
 import {isolateMedicationRequests, isolatePrescriptions} from "../src/fhirUtils"
-import {createMockedPfPConfig, MockedPfPConfig, setupTestEnvironment} from "@common/tests"
+import {createMockedPfPConfig, MockedPfPConfig, setupTestEnvironment} from "@common/testing"
 
 const TC007_NHS_NUMBER = "9992032499"
 
diff --git a/packages/getMyPrescriptions/tests/fhirUtils.test.ts b/packages/getMyPrescriptions/tests/fhirUtils.test.ts
@@ -3,7 +3,7 @@
 import "jest"
 import {Bundle, Organization} from "fhir/r4"
 
-import {mockInteractionResponseBody} from "@common/tests"
+import {mockInteractionResponseBody} from "@common/testing"
 
 import {
   Entry,
diff --git a/packages/getMyPrescriptions/tests/statusUpdate.test.ts b/packages/getMyPrescriptions/tests/statusUpdate.test.ts
@@ -18,7 +18,7 @@ import {
   mockPharmacy2uResponse,
   mockPharmicaResponse,
   mockStateMachineInputEvent
-} from "@common/tests"
+} from "@common/testing"
 
 import {buildStatusUpdateData} from "../src/statusUpdate"
 import {StateMachineFunctionResponseBody} from "../src/responses"
@@ -30,7 +30,7 @@ import {
   stateMachineEventHandler
 } from "../src/getMyPrescriptions"
 import {EXPECTED_TRACE_IDS, SERVICE_SEARCH_PARAMS} from "./utils"
-import {createMockedPfPConfig, MockedPfPConfig, setupTestEnvironment} from "@common/tests"
+import {createMockedPfPConfig, MockedPfPConfig, setupTestEnvironment} from "@common/testing"
 import {LogLevel} from "@aws-lambda-powertools/logger/types"
 import {Logger} from "@aws-lambda-powertools/logger"
 import {createSpineClient} from "@NHSDigital/eps-spine-client"
diff --git a/packages/getMyPrescriptions/tests/test-handler.test.ts b/packages/getMyPrescriptions/tests/test-handler.test.ts
@@ -23,15 +23,15 @@ import {
   mockPharmicaResponse,
   helloworldContext,
   mockStateMachineInputEvent
-} from "@common/tests"
+} from "@common/testing"
 
 import {HEADERS, StateMachineFunctionResponseBody, TIMEOUT_RESPONSE} from "../src/responses"
 import "./toMatchJsonLogMessage"
 import {EXPECTED_TRACE_IDS} from "./utils"
 import {LogLevel} from "@aws-lambda-powertools/logger/types"
 import {createSpineClient} from "@NHSDigital/eps-spine-client"
 import {MiddyfiedHandler} from "@middy/core"
-import {createMockedPfPConfig, MockedPfPConfig, setupTestEnvironment} from "@common/tests"
+import {createMockedPfPConfig, MockedPfPConfig, setupTestEnvironment} from "@common/testing"
 
 const TC008_NHS_NUMBER = "9992387920"
 
diff --git a/packages/nhsd-pfp-sandbox/tests/test-handler.test.ts b/packages/nhsd-pfp-sandbox/tests/test-handler.test.ts
@@ -7,7 +7,7 @@ import {
   helloworldContext,
   test_append_trace_ids,
   test_mime_type
-} from "@common/tests"
+} from "@common/testing"
 
 const dummyContext = helloworldContext
 const mockEvent: APIGatewayProxyEvent = mockAPIGatewayProxyEvent
diff --git a/packages/serviceSearchClient/tests/live-serviceSearch-client.test.ts b/packages/serviceSearchClient/tests/live-serviceSearch-client.test.ts
@@ -3,7 +3,7 @@ import {jest} from "@jest/globals"
 import MockAdapter from "axios-mock-adapter"
 import axios, {AxiosError, AxiosRequestConfig, AxiosResponse} from "axios"
 import {Logger} from "@aws-lambda-powertools/logger"
-import {mockPharmacy2uResponse} from "@common/tests"
+import {mockPharmacy2uResponse} from "@common/testing"
 
 const mock = new MockAdapter(axios)
 
diff --git a/packages/statusLambda/tests/test-handler.test.ts b/packages/statusLambda/tests/test-handler.test.ts
@@ -12,7 +12,7 @@ import MockAdapter from "axios-mock-adapter"
 import axios from "axios"
 
 import {handler} from "../src/statusLambda"
-import {mockAPIGatewayProxyEvent, helloworldContext} from "@common/tests"
+import {mockAPIGatewayProxyEvent, helloworldContext} from "@common/testing"
 
 const mock = new MockAdapter(axios)
 
diff --git a/tsconfig.defaults.json b/tsconfig.defaults.json
@@ -18,8 +18,8 @@
     "paths": {
       "@common/utilities": ["./packages/common/utilities/lib/index.d.ts"],
       "@common/utilities/*": ["./packages/common/utilities/lib/*"],
-      "@common/tests": ["./packages/common/tests/lib/index.d.ts"],
-      "@common/tests/*": ["./packages/common/tests/lib/*"]
+      "@common/testing": ["./packages/common/tests/lib/index.d.ts"],
+      "@common/testing/*": ["./packages/common/tests/lib/*"]
     }
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "name": "@common/tests",`
	`2`	`+ "name": "@common/testing",`
`3`	`3`	`"version": "1.0.0",`
`4`	`4`	`"description": "Common resources for testing prescriptionsforpatients",`
`5`	`5`	`"author": "NHS Digital",`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import {createMockedPfPConfig, setupTestEnvironment, MockedPfPConfig} from "@common/tests"`
	`1`	`+import {createMockedPfPConfig, setupTestEnvironment, MockedPfPConfig} from "@common/testing"`
`2`	`2`	`import {`
`3`	`3`	`expect,`
`4`	`4`	`describe,`