fix

Author: Namitha-Prabhu

tests/component-tests/events-tests/event-subscription.spec.ts

@@ -5,11 +5,12 @@ import { randomUUID } from "node:crypto";
 import { logger } from "tests/helpers/pino-logger";
 import { createValidRequestHeaders } from "tests/constants/request-headers";
 import getRestApiGatewayBaseUrl from "tests/helpers/aws-gateway-helper";
-import { SUPPLIER_LETTERS } from "tests/constants/api-constants";
+import { SUPPLIER_LETTERS, envName } from "tests/constants/api-constants";
 import {
   pollSupplierAllocatorLogForResolvedSpec,
   pollUpsertLetterLogForError,
 } from "tests/helpers/aws-cloudwatch-helper";
+import { supplierDataSetup } from "tests/helpers/suppliers-setup-helper";
 
 let baseUrl: string;
 
@@ -18,7 +19,7 @@ test.beforeAll(async () => {
 });
 
 test.describe("Event Subscription SNS Tests", () => {
-  test("Verify that the publish event to nhs-main-supapi-eventsub topic inserts data into db", async ({
+  test(`Verify that the publish event to nhs-${envName}-supapi-eventsub topic inserts data into db`, async ({
     request,
   }) => {
     const domainId = randomUUID();
@@ -43,6 +44,9 @@ test.describe("Event Subscription SNS Tests", () => {
       throw new Error("supplierId was not found in supplier allocator log");
     }
 
+    // check if supplier exists in suppliers table
+    await supplierDataSetup(supplierId);
+
     const headers = createValidRequestHeaders(supplierId);
     let statusCode = 0;
     let letterStatus: string | undefined;

tests/config/global-setup.ts

@@ -1,9 +1,6 @@
 import { logger } from "tests/helpers/pino-logger";
-import {
-  checkSupplierExists,
-  createSupplierEntry,
-  createTestData,
-} from "../helpers/generate-fetch-test-data";
+import { supplierDataSetup } from "tests/helpers/suppliers-setup-helper";
+import { createTestData } from "../helpers/generate-fetch-test-data";
 import { SUPPLIERID } from "../constants/api-constants";
 
 async function globalSetup() {
@@ -16,17 +13,7 @@ async function globalSetup() {
   await createTestData(SUPPLIERID, 10);
 
   // check supplier exists
-  const supplier = await checkSupplierExists(SUPPLIERID);
-  if (supplier) {
-    logger.info(`Supplier with ID ${SUPPLIERID} already exists.`);
-    logger.info("");
-    logger.info("*** GLOBAL SETUP COMPLETE ***");
-    logger.info("");
-    return;
-  }
-
-  logger.info(`Creating supplier entry with ID: ${SUPPLIERID}`);
-  await createSupplierEntry(SUPPLIERID);
+  await supplierDataSetup(SUPPLIERID);
 
   logger.info("");
   logger.info("*** GLOBAL SETUP COMPLETE ***");

tests/config/main.config.ts

@@ -10,10 +10,16 @@ const localConfig: PlaywrightTestConfig = {
   reporter: getReporters("api-test"),
   projects: [
     {
-      name: "component-tests",
-      testDir: path.resolve(__dirname, "../component-tests"),
+      name: "apiGateway-tests",
+      testDir: path.resolve(__dirname, "../component-tests/apiGateway-tests"),
       testMatch: "**/*.spec.ts",
     },
+    {
+      name: "events-tests",
+      testDir: path.resolve(__dirname, "../component-tests/events-tests"),
+      testMatch: "**/*.spec.ts",
+      dependencies: ["apiGateway-tests"],
+    },
   ],
 };
 

tests/helpers/suppliers-setup-helper.ts

@@ -0,0 +1,16 @@
+import { logger } from "tests/helpers/pino-logger";
+import {
+  checkSupplierExists,
+  createSupplierEntry,
+} from "./generate-fetch-test-data";
+
+export async function supplierDataSetup(supplierId: string) {
+  const supplier = await checkSupplierExists(supplierId);
+  if (supplier) {
+    logger.info(`Supplier with ID ${supplierId} already exists.`);
+    return;
+  }
+
+  logger.info(`Creating supplier entry with ID: ${supplierId}`);
+  await createSupplierEntry(supplierId);
+}

tests/package.json

@@ -43,7 +43,7 @@
     "clean": "rimraf $(pwd)/target",
     "lint": "eslint .",
     "lint:fix": "eslint . --fix",
-    "test:component": "playwright test --config=config/main.config.ts --max-failures=10 --project=component-tests",
+    "test:component": "playwright test --config=config/main.config.ts --max-failures=10",
     "test:pact": "./pact-tests/run-pact-tests.sh",
     "test:performance": "playwright test --config=config/performance/performance.config.ts --max-failures=10 --project=performance",
     "test:sandbox": "playwright test --config=config/sandbox.config.ts --max-failures=10 --project=sandbox",