improve test order, log, and retries

Author: francisco-videira-nhs

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

@@ -41,7 +41,7 @@ test.describe("Event Subscription SNS Tests", () => {
       supplierAllocatorLog.msg?.allocationDetails?.supplierSpec?.supplierId;
 
     logger.info(
-      `Supplier ${supplierId} allocated for domainId ${domainId} in supplier allocator lambda`,
+      `Supplier ${supplierId} allocated to letter ${domainId} in supplier allocator lambda`,
     );
     if (!supplierId) {
       throw new Error("supplierId was not found in supplier allocator log");
@@ -109,7 +109,7 @@ test.describe("Event Subscription SNS Tests", () => {
       supplierAllocatorLog.msg?.allocationDetails?.supplierSpec?.supplierId;
 
     logger.info(
-      `Supplier ${supplierId} allocated for domainId ${domainId} in supplier allocator lambda`,
+      `Supplier ${supplierId} allocated to letter ${domainId} in supplier allocator lambda`,
     );
     if (!supplierId) {
       throw new Error("supplierId was not found in supplier allocator log");

tests/config/main.config.ts

@@ -9,6 +9,11 @@ const localConfig: PlaywrightTestConfig = {
   /* Reporter to use. See https://playwright.dev/docs/test-reporters */
   reporter: getReporters("api-test"),
   projects: [
+    {
+      name: "integration-tests",
+      testDir: path.resolve(__dirname, "../component-tests/integration-tests"),
+      testMatch: "**/*.spec.ts",
+    },
     {
       name: "apiGateway-tests",
       testDir: path.resolve(__dirname, "../component-tests/apiGateway-tests"),
@@ -22,15 +27,10 @@ const localConfig: PlaywrightTestConfig = {
       dependencies: ["apiGateway-tests"],
     },
     {
-      name: "letterQueue-tests",
+      name: "letterQueue-tests", // Needs to run last as tests visibility timeout and can impact other tests if run before them
       testDir: path.resolve(__dirname, "../component-tests/letterQueue-tests"),
       testMatch: "**/*.spec.ts",
-      dependencies: ["apiGateway-tests"],
-    },
-    {
-      name: "integration-tests",
-      testDir: path.resolve(__dirname, "../component-tests/integration-tests"),
-      testMatch: "**/*.spec.ts",
+      dependencies: ["events-tests"],
     },
   ],
 };

tests/helpers/aws-cloudwatch-helper.ts

@@ -105,7 +105,7 @@ export async function supplierIdFromSupplierAllocatorLog(
     supplierAllocatorLog.msg?.allocationDetails?.supplierSpec?.supplierId;
 
   logger.info(
-    `Supplier ${supplierId} allocated for domainId ${domainId} in supplier allocator lambda`,
+    `Supplier ${supplierId} allocated to letter ${domainId} in supplier allocator lambda`,
   );
 
   if (!supplierId) {

tests/helpers/poll-for-letters-helper.ts

@@ -12,8 +12,8 @@ export async function pollForLetterStatus(
   const headers = createValidRequestHeaders(supplierId);
   let statusCode = 0;
   let letterStatus: string | undefined;
-  const RETRY_DELAY_MS = 10_000;
-  const MAX_ATTEMPTS = 6;
+  const RETRY_DELAY_MS = 15_000;
+  const MAX_ATTEMPTS = 5;
 
   for (let attempt = 1; attempt <= MAX_ATTEMPTS; attempt++) {
     const getLetterResponse = await request.get(