Move to /testing

Signed-off-by: Connor Avery <[email protected]>

Author: connoravo-nhs

.pre-commit-config.yaml

@@ -86,10 +86,10 @@ repos:
         types_or: [ts, tsx, javascript, jsx, json]
         pass_filenames: false
 
-      - id: lint-common
-        name: Lint common testing
+      - id: lint-common-utilities
+        name: Lint common utilities
         entry: npm
-        args: ["run", "--prefix=packages/common", "lint"]
+        args: ["run", "--prefix=packages/common/utilities", "lint"]
         language: system
         files: ^packages\/common\/src
         types_or: [ts, tsx, javascript, jsx, json]
@@ -98,7 +98,7 @@ repos:
       - id: lint-common-testing
         name: Lint common testing
         entry: npm
-        args: ["run", "--prefix=packages/common/tests", "lint"]
+        args: ["run", "--prefix=packages/common/testing", "lint"]
         language: system
         files: ^packages\/common\/testing
         types_or: [ts, tsx, javascript, jsx, json]

Makefile

@@ -126,7 +126,7 @@ lint-node: compile-node
 	npm run lint --workspace packages/statusLambda
 	npm run lint --workspace packages/serviceSearchClient
 	npm run lint --workspace packages/common/utilities
-	npm run lint --workspace packages/common/tests
+	npm run lint --workspace packages/common/testing
 	npm run lint --workspace packages/distanceSelling
 
 lint-samtemplates:
@@ -149,7 +149,7 @@ test: compile
 	npm run test --workspace packages/serviceSearchClient
 	npm run test --workspace packages/distanceSelling
 	npm run test --workspace packages/common/utilities
-	npm run test --workspace packages/common/tests
+	npm run test --workspace packages/common/testing
 
 clean:
 	rm -rf packages/capabilityStatement/coverage
@@ -159,7 +159,7 @@ clean:
 	rm -rf packages/serviceSearchClient/coverage
 	rm -rf packages/distanceSelling/coverage
 	rm -rf packages/statusLambda/coverage
-	rm -rf packages/common/tests/coverage
+	rm -rf packages/common/testing/coverage
 	rm -rf packages/capabilityStatement/lib
 	rm -rf packages/getMyPrescriptions/lib
 	rm -rf packages/enrichPrescriptions/lib
@@ -169,7 +169,7 @@ clean:
 	rm -rf packages/statusLambda/lib
 	rm -rf packages/getSecretLayer/lib
 	rm -rf packages/common/utilities/lib
-	rm -rf packages/common/tests/lib
+	rm -rf packages/common/testing/lib
 	rm -rf .aws-sam
 
 deep-clean: clean

jest.default.config.ts

@@ -11,8 +11,8 @@ const jestConfig: JestConfigWithTsJest = {
   moduleFileExtensions: ["js", "json", "ts", "d.ts"],
   moduleNameMapper: {
     "^(\\.{1,2}/.*)\\.js$": "$1",
-    "^@common/testing$": "<rootDir>/../../packages/common/tests/lib/index.js",
-    "^@common/testing/(.*)$": "<rootDir>/../../packages/common/tests/lib/$1.js",
+    "^@common/testing$": "<rootDir>/../../packages/common/testing/lib/index.js",
+    "^@common/testing/(.*)$": "<rootDir>/../../packages/common/testing/lib/$1.js",
     "^@common/utilities$": "<rootDir>/../../packages/common/utilities/lib/index.js",
     "^@common/utilities/(.*)$": "<rootDir>/../../packages/common/utilities/lib/$1.js"
   },

package-lock.json

@@ -21,7 +21,7 @@
     "packages/statusLambda",
     "packages/serviceSearchClient",
     "packages/common/utilities",
-    "packages/common/tests",
+    "packages/common/testing",
     "packages/distanceSelling"
   ],
   "devDependencies": {

package.json

@@ -21,6 +21,6 @@
     "@nhs/fhir-middy-error-handler": "^2.1.53"
   },
   "devDependencies": {
-    "@common/tests": "^1.0.0"
+    "@common/testing": "^1.0.0"
   }
 }

packages/capabilityStatement/package.json

@@ -6,7 +6,7 @@
   },
   "references": [
     { "path": "../common/utilities" },
-    { "path": "../common/tests" }
+    { "path": "../common/testing" }
   ],
   "include": ["src/**/*", "tests/**/*", "examples/CapabilityStatement/apim-medicines-prescriptionsforpatients.json"],
   "exclude": ["node_modules"]

packages/capabilityStatement/tsconfig.json

@@ -7,7 +7,7 @@
     "main": "lib/index.js",
     "type": "module",
     "scripts": {
-        "unit": "echo 'No tests in common/tests package - it provides test utilities only'",
+        "unit": "echo 'No tests in common/testing package - it provides test utilities only'",
         "lint": "eslint  --max-warnings 0 --fix --config ../../../eslint.config.mjs .",
         "compile": "tsc",
         "test": "npm run compile && npm run unit",