CCM-12616: Adjust component test

Author: simonlabarere

tests/playwright/digital-letters-component-tests/mesh-poll-download.component.spec.ts

@@ -13,6 +13,7 @@ import { invokeLambda } from 'helpers/lambda-helpers';
 import { downloadFromS3, uploadToS3 } from 'helpers/s3-helpers';
 import { expectMessageContainingString } from 'helpers/sqs-helpers';
 import { v4 as uuidv4 } from 'uuid';
+import messageMessageReceived from 'digital-letters-events/MESHInboxMessageReceived.js';
 
 test.describe('Digital Letters - MESH Poll and Download', () => {
   const senderId = 'test-sender-1';
@@ -37,23 +38,6 @@ test.describe('Digital Letters - MESH Poll and Download', () => {
     await uploadToS3(messageContent, NON_PII_S3_BUCKET_NAME, key, meshMetadata);
   }
 
-  async function uploadMeshMessageWithSender(
-    meshMessageId: string,
-    messageReference: string,
-    messageContent: string,
-    senderMailboxId: string,
-  ): Promise<void> {
-    const key = `mock-mesh/${meshMailboxId}/in/${meshMessageId}`;
-    const meshMetadata = {
-      sender: senderMailboxId,
-      subject: '201',
-      workflow_id: 'NHS_NOTIFY_SEND_REQUEST',
-      local_id: messageReference,
-    };
-
-    await uploadToS3(messageContent, NON_PII_S3_BUCKET_NAME, key, meshMetadata);
-  }
-
   async function expectMeshInboxMessageReceivedEvent(
     meshMessageId: string,
   ): Promise<void> {
@@ -105,9 +89,7 @@ test.describe('Digital Letters - MESH Poll and Download', () => {
     await invokeLambda(MESH_POLL_LAMBDA_NAME);
 
     await expectMeshInboxMessageReceivedEvent(meshMessageId);
-    await expectMeshInboxMessageDownloadedEvent(
-      messageReference,
-    );
+    await expectMeshInboxMessageDownloadedEvent(messageReference);
 
     await expectToPassEventually(async () => {
       const storedMessage = await downloadFromS3(
@@ -139,23 +121,27 @@ test.describe('Digital Letters - MESH Poll and Download', () => {
         {
           id: uuidv4(),
           specversion: '1.0',
-          source: '/nhs/england/notify/development/primary/data-plane/digitalletters/mesh',
-          subject: 'customer/00000000-0000-0000-0000-000000000000/recipient/00000000-0000-0000-0000-000000000000',
+          source:
+            '/nhs/england/notify/development/primary/data-plane/digitalletters/mesh',
+          subject:
+            'customer/00000000-0000-0000-0000-000000000000/recipient/00000000-0000-0000-0000-000000000000',
           type: 'uk.nhs.notify.digital.letters.mesh.inbox.message.received.v1',
           time: '2026-01-20T15:48:21.636284+00:00',
           recordedtime: '2026-01-20T15:48:21.636284+00:00',
           severitynumber: 2,
           severitytext: 'INFO',
-          traceparent: '00-0af7651916cd43dd8448eb211c80319c-b7ad6b7169203331-01',
-          dataschema: 'https://notify.nhs.uk/cloudevents/schemas/digital-letters/2025-10-draft/data/digital-letters-mesh-inbox-message-received-data.schema.json',
+          traceparent:
+            '00-0af7651916cd43dd8448eb211c80319c-b7ad6b7169203331-01',
+          dataschema:
+            'https://notify.nhs.uk/cloudevents/schemas/digital-letters/2025-10-draft/data/digital-letters-mesh-inbox-message-received-data.schema.json',
           data: {
             meshMessageId: invalidMeshMessageId,
             senderId,
             messageReference,
           },
-        }
+        },
       ],
-      () => true,
+      messageMessageReceived,
     );
 
     await expectMessageContainingString(

tests/playwright/digital-letters-component-tests/pdm-uploader.component.spec.ts

@@ -194,7 +194,7 @@ test.describe('Digital Letters - Upload to PDM', () => {
           },
         },
       ],
-      () => true,
+      messageDownloadedValidator,
     );
 
     await expectToPassEventually(async () => {