CCM-14205 - Refactored test imports

Author: rhyscoxnhs

eslint.config.mjs

@@ -200,7 +200,7 @@ export default defineConfig([
     },
   },
   {
-    files: ["**/utils/**", "tests/test-team/**", "lambdas/**/src/**"],
+    files: ["**/utils/**", "tests/test-team/**", "tests/performance/helpers/**", "lambdas/**/src/**"],
     rules: {
       "import-x/prefer-default-export": 0,
     },
@@ -214,21 +214,14 @@ export default defineConfig([
     },
   },
   {
-    // Files inside helpers/ are loaded transitively by globalSetup/globalTeardown which run
-    // outside Jest's module system, so moduleNameMapper does not apply — relative imports only
-    files: ["tests/integration/helpers/**", "tests/performance/helpers/**", "tests/test-support/helpers/**"],
-    rules: {
-      "no-relative-import-paths/no-relative-import-paths": 0,
-    },
-  },
-  {
-    // globalSetup/globalTeardown run outside Jest's module system so moduleNameMapper
-    // does not apply — relative imports are the only way to reach local helpers
+    // helpers/ files use relative imports between each other; test files import
+    // directly from local helpers using relative paths
     files: [
-      "tests/integration/jest.global-setup.ts",
-      "tests/integration/jest.global-teardown.ts",
-      "tests/performance/jest.global-setup.ts",
-      "tests/performance/jest.global-teardown.ts",
+      "tests/integration/helpers/**",
+      "tests/integration/*.test.ts",
+      "tests/performance/helpers/**",
+      "tests/performance/*.test.ts",
+      "tests/test-support/helpers/**",
     ],
     rules: {
       "no-relative-import-paths/no-relative-import-paths": 0,

tests/integration/dlq-redrive.test.ts

@@ -1,24 +1,26 @@
 import { GetQueueAttributesCommand, SQSClient } from "@aws-sdk/client-sqs";
+import { CloudWatchLogsClient } from "@aws-sdk/client-cloudwatch-logs";
 import type {
   MessageStatusData,
   StatusPublishEvent,
 } from "@nhs-notify-client-callbacks/models";
 import {
-  awaitSignedCallbacksFromWebhookLogGroup,
   buildInboundEventQueueUrl,
   buildLambdaLogGroupName,
   buildMockClientDlqQueueUrl,
-  computeExpectedSignature,
   createCloudWatchLogsClient,
-  createMessageStatusPublishEvent,
   createSqsClient,
-  ensureInboundQueueIsEmpty,
   getDeploymentDetails,
+} from "@nhs-notify-client-callbacks/test-support/helpers";
+import { awaitSignedCallbacksFromWebhookLogGroup } from "./helpers/cloudwatch";
+import { createMessageStatusPublishEvent } from "./helpers/event-factories";
+import sendEventToDlqAndRedrive from "./helpers/redrive";
+import { computeExpectedSignature } from "./helpers/signature";
+import {
+  ensureInboundQueueIsEmpty,
   purgeQueues,
-  sendEventToDlqAndRedrive,
   sendSqsEvent,
-} from "helpers";
-import { CloudWatchLogsClient } from "@aws-sdk/client-cloudwatch-logs";
+} from "./helpers/sqs";
 
 describe("DLQ Redrive", () => {
   let sqsClient: SQSClient;

tests/integration/event-bus-to-webhook.test.ts

@@ -1,29 +1,35 @@
 import { DeleteMessageCommand, SQSClient } from "@aws-sdk/client-sqs";
+import { CloudWatchLogsClient } from "@aws-sdk/client-cloudwatch-logs";
 import {
   type ChannelStatusData,
   type MessageStatusData,
   type StatusPublishEvent,
 } from "@nhs-notify-client-callbacks/models";
 import {
-  awaitQueueMessage,
-  awaitQueueMessageByMessageId,
   buildInboundEventDlqQueueUrl,
   buildInboundEventQueueUrl,
   buildLambdaLogGroupName,
   buildMockClientDlqQueueUrl,
-  computeExpectedSignature,
-  createChannelStatusPublishEvent,
   createCloudWatchLogsClient,
-  createMessageStatusPublishEvent,
   createSqsClient,
-  ensureInboundQueueIsEmpty,
   getDeploymentDetails,
-  processChannelStatusEvent,
-  processMessageStatusEvent,
+} from "@nhs-notify-client-callbacks/test-support/helpers";
+import { computeExpectedSignature } from "./helpers/signature";
+import {
+  createChannelStatusPublishEvent,
+  createMessageStatusPublishEvent,
+} from "./helpers/event-factories";
+import {
+  awaitQueueMessage,
+  awaitQueueMessageByMessageId,
+  ensureInboundQueueIsEmpty,
   purgeQueues,
   sendSqsEvent,
-} from "helpers";
-import { CloudWatchLogsClient } from "@aws-sdk/client-cloudwatch-logs";
+} from "./helpers/sqs";
+import {
+  processChannelStatusEvent,
+  processMessageStatusEvent,
+} from "./helpers/status-events";
 
 describe("SQS to Webhook Integration", () => {
   let sqsClient: SQSClient;

tests/integration/helpers/clients.ts

@@ -11,12 +11,6 @@ import {
 import { logger } from "@nhs-notify-client-callbacks/logger";
 import { waitUntil } from "async-wait-until";
 
-export {
-  buildInboundEventDlqQueueUrl,
-  buildInboundEventQueueUrl,
-  buildMockClientDlqQueueUrl,
-} from "@nhs-notify-client-callbacks/test-support/helpers/sqs";
-
 const QUEUE_WAIT_TIMEOUT_MS = 60_000;
 const POLL_INTERVAL_MS = 500;
 const SQS_MAX_NUMBER_OF_MESSAGES = 1;

tests/integration/helpers/deployment.ts

@@ -4,7 +4,7 @@ import {
   buildSubscriptionConfigBucketName,
   createS3Client,
   getDeploymentDetails,
-} from "helpers";
+} from "@nhs-notify-client-callbacks/test-support/helpers";
 
 describe("Infrastructure exists", () => {
   let s3Client: S3Client;

tests/integration/helpers/index.ts

@@ -9,9 +9,6 @@ export default {
     ...(nodeJestConfig.coveragePathIgnorePatterns ?? []),
     "/helpers/",
   ],
-  moduleNameMapper: {
-    "^helpers$": "<rootDir>/helpers/index",
-  },
   setupFilesAfterEnv: [
     ...(nodeJestConfig.setupFilesAfterEnv ?? []),
     "<rootDir>/jest.setup.ts",

tests/integration/helpers/sqs.ts

@@ -3,7 +3,7 @@ import {
   buildSubscriptionConfigBucketName,
   createS3Client,
   getDeploymentDetails,
-} from "./helpers";
+} from "@nhs-notify-client-callbacks/test-support/helpers";
 
 const mockClientSubscriptionKey = "client_subscriptions/mock-client.json";