Skip to content

Commit d09080e

Browse files
simonlabareresimonlabarere
committed
CCM-13675: Fix component tests
1 parent c834692 commit d09080e

11 files changed

+54
-48
lines changed

‎tests/playwright/digital-letters-component-tests/core-notify.component.spec.ts‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,10 @@ import {
99
SENDER_ID_THAT_TRIGGERS_ERROR_IN_NOTIFY_SANDBOX,
1010
SENDER_ID_VALID_FOR_NOTIFY_SANDBOX,
1111
} from 'constants/tests-constants';
12-
import { PDMResourceAvailable } from 'digital-letters-events';
13-
import messagePDMResourceAvailableValidator from 'digital-letters-events/PDMResourceAvailable.js';
12+
import {
13+
PDMResourceAvailable,
14+
validatePDMResourceAvailable,
15+
} from 'digital-letters-events';
1416
import { getLogsFromCloudwatch } from 'helpers/cloudwatch-helpers';
1517
import eventPublisher from 'helpers/event-bus-helpers';
1618
import expectToPassEventually from 'helpers/expectations';
@@ -63,7 +65,7 @@ test.describe('Digital Letters - Core Notify', () => {
6365
},
6466
},
6567
],
66-
messagePDMResourceAvailableValidator,
68+
validatePDMResourceAvailable,
6769
);
6870

6971
// Verify the event is processed and a message appears in the Lambda logs
@@ -116,7 +118,7 @@ test.describe('Digital Letters - Core Notify', () => {
116118
},
117119
},
118120
],
119-
messagePDMResourceAvailableValidator,
121+
validatePDMResourceAvailable,
120122
);
121123

122124
// Verify the event is processed and a message appears in the Lambda logs
@@ -168,7 +170,7 @@ test.describe('Digital Letters - Core Notify', () => {
168170
},
169171
},
170172
],
171-
messagePDMResourceAvailableValidator,
173+
validatePDMResourceAvailable,
172174
);
173175

174176
// Verify the event is published in the event bus
@@ -206,7 +208,7 @@ test.describe('Digital Letters - Core Notify', () => {
206208
},
207209
},
208210
],
209-
messagePDMResourceAvailableValidator,
211+
validatePDMResourceAvailable,
210212
);
211213

212214
await Promise.all([

‎tests/playwright/digital-letters-component-tests/file-scanner.component.spec.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import {
55
PREFIX_DL_FILES,
66
REGION,
77
} from 'constants/backend-constants';
8-
import itemDequeuedValidator from 'digital-letters-events/ItemDequeued.js';
98
import eventPublisher from 'helpers/event-bus-helpers';
109
import expectToPassEventually from 'helpers/expectations';
1110
import { expectMessageContainingString, purgeQueue } from 'helpers/sqs-helpers';
@@ -15,6 +14,7 @@ import {
1514
getS3ObjectMetadata,
1615
putDataS3,
1716
} from 'utils';
17+
import { validateItemDequeued } from 'digital-letters-events';
1818

1919
const DOCUMENT_REFERENCE_BUCKET = `nhs-${process.env.AWS_ACCOUNT_ID}-${REGION}-${ENV}-dl-pii-data`;
2020
const UNSCANNED_FILES_BUCKET = `nhs-${process.env.AWS_ACCOUNT_ID}-${REGION}-main-acct-digi-unscanned-files`;
@@ -77,7 +77,7 @@ test('should extract PDF from DocumentReference and store in unscanned bucket wi
7777
},
7878
},
7979
],
80-
itemDequeuedValidator,
80+
validateItemDequeued,
8181
);
8282

8383
await expectToPassEventually(async () => {
@@ -143,7 +143,7 @@ test('should handle validation errors by sending messages to DLQ', async () => {
143143
},
144144
},
145145
],
146-
itemDequeuedValidator,
146+
validateItemDequeued,
147147
);
148148

149149
// Verify the file was NOT processed successfully

‎tests/playwright/digital-letters-component-tests/mesh-acknowledge.component.spec.ts‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,10 @@ import {
55
NON_PII_S3_BUCKET_NAME,
66
} from 'constants/backend-constants';
77
import { SENDER_ID_SKIPS_NOTIFY } from 'constants/tests-constants';
8-
import { MESHInboxMessageDownloaded } from 'digital-letters-events';
9-
import messageDownloadedValidator from 'digital-letters-events/MESHInboxMessageDownloaded.js';
8+
import {
9+
MESHInboxMessageDownloaded,
10+
validateMESHInboxMessageDownloaded,
11+
} from 'digital-letters-events';
1012
import { getLogsFromCloudwatch } from 'helpers/cloudwatch-helpers';
1113
import eventPublisher from 'helpers/event-bus-helpers';
1214
import expectToPassEventually from 'helpers/expectations';
@@ -68,7 +70,7 @@ test.describe('Digital Letters - Mesh Acknowledger', () => {
6870
},
6971
},
7072
],
71-
messageDownloadedValidator,
73+
validateMESHInboxMessageDownloaded,
7274
);
7375

7476
// The mailbox ID matches the Mock MESH config in SSM.
@@ -126,7 +128,7 @@ test.describe('Digital Letters - Mesh Acknowledger', () => {
126128
},
127129
},
128130
],
129-
messageDownloadedValidator,
131+
validateMESHInboxMessageDownloaded,
130132
);
131133

132134
await expectMessageContainingString(

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ import { invokeLambda } from 'helpers/lambda-helpers';
1313
import { downloadFromS3, uploadToS3 } from 'helpers/s3-helpers';
1414
import { expectMessageContainingString } from 'helpers/sqs-helpers';
1515
import { v4 as uuidv4 } from 'uuid';
16-
import messageMessageReceived from 'digital-letters-events/MESHInboxMessageReceived.js';
1716
import { SENDER_ID_SKIPS_NOTIFY } from 'constants/tests-constants';
17+
import { validateMESHInboxMessageReceived } from 'digital-letters-events';
1818

1919
test.describe('Digital Letters - MESH Poll and Download', () => {
2020
const senderId = SENDER_ID_SKIPS_NOTIFY;
@@ -142,7 +142,7 @@ test.describe('Digital Letters - MESH Poll and Download', () => {
142142
},
143143
},
144144
],
145-
messageMessageReceived,
145+
validateMESHInboxMessageReceived,
146146
);
147147

148148
await expectMessageContainingString(

‎tests/playwright/digital-letters-component-tests/pdm-poll.component.spec.ts‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,10 @@ import {
44
PDM_POLL_DLQ_NAME,
55
PDM_POLL_LAMBDA_LOG_GROUP_NAME,
66
} from 'constants/backend-constants';
7-
import pdmResourceSubmittedValidator from 'digital-letters-events/PDMResourceSubmitted.js';
8-
import pdmResourceUnavailableValidator from 'digital-letters-events/PDMResourceUnavailable.js';
7+
import {
8+
validatePDMResourceSubmitted,
9+
validatePDMResourceUnavailable,
10+
} from 'digital-letters-events';
911
import { getLogsFromCloudwatch } from 'helpers/cloudwatch-helpers';
1012
import eventPublisher from 'helpers/event-bus-helpers';
1113
import expectToPassEventually from 'helpers/expectations';
@@ -65,7 +67,7 @@ test.describe('PDM Poll', () => {
6567
},
6668
},
6769
],
68-
pdmResourceSubmittedValidator,
70+
validatePDMResourceSubmitted,
6971
);
7072

7173
await expectToPassEventually(async () => {
@@ -102,7 +104,7 @@ test.describe('PDM Poll', () => {
102104
},
103105
},
104106
],
105-
pdmResourceSubmittedValidator,
107+
validatePDMResourceSubmitted,
106108
);
107109

108110
await expectToPassEventually(async () => {
@@ -141,7 +143,7 @@ test.describe('PDM Poll', () => {
141143
},
142144
},
143145
],
144-
pdmResourceUnavailableValidator,
146+
validatePDMResourceUnavailable,
145147
);
146148

147149
await expectToPassEventually(async () => {
@@ -179,7 +181,7 @@ test.describe('PDM Poll', () => {
179181
},
180182
},
181183
],
182-
pdmResourceUnavailableValidator,
184+
validatePDMResourceUnavailable,
183185
);
184186

185187
await expectToPassEventually(async () => {
@@ -216,7 +218,7 @@ test.describe('PDM Poll', () => {
216218
},
217219
},
218220
],
219-
pdmResourceUnavailableValidator,
221+
validatePDMResourceUnavailable,
220222
);
221223

222224
await expectToPassEventually(async () => {

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ import {
55
PDM_UPLOADER_DLQ_NAME,
66
PDM_UPLOADER_LAMBDA_LOG_GROUP_NAME,
77
} from 'constants/backend-constants';
8-
import messageDownloadedValidator from 'digital-letters-events/MESHInboxMessageDownloaded.js';
98
import { getLogsFromCloudwatch } from 'helpers/cloudwatch-helpers';
109
import eventPublisher from 'helpers/event-bus-helpers';
1110
import expectToPassEventually from 'helpers/expectations';
1211
import { expectMessageContainingString, purgeQueue } from 'helpers/sqs-helpers';
1312
import { v4 as uuidv4 } from 'uuid';
1413
import { SENDER_ID_SKIPS_NOTIFY } from 'constants/tests-constants';
1514
import { putDataS3 } from 'utils';
15+
import { validateMESHInboxMessageDownloaded } from 'digital-letters-events';
1616

1717
const pdmRequest = {
1818
resourceType: 'DocumentReference',
@@ -84,7 +84,7 @@ test.describe('Digital Letters - Upload to PDM', () => {
8484
},
8585
},
8686
],
87-
messageDownloadedValidator,
87+
validateMESHInboxMessageDownloaded,
8888
);
8989

9090
await expectToPassEventually(async () => {
@@ -150,7 +150,7 @@ test.describe('Digital Letters - Upload to PDM', () => {
150150
},
151151
},
152152
],
153-
messageDownloadedValidator,
153+
validateMESHInboxMessageDownloaded,
154154
);
155155

156156
await expectToPassEventually(async () => {

‎tests/playwright/digital-letters-component-tests/print-analyser.component.spec.ts‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@ import eventPublisher from 'helpers/event-bus-helpers';
1010
import expectToPassEventually from 'helpers/expectations';
1111
import { fivePagePdf } from 'helpers/pdf-helpers';
1212
import { v4 as uuidv4 } from 'uuid';
13-
import fileSafeValidator from 'digital-letters-events/FileSafe.js';
14-
import { FileSafe } from 'digital-letters-events';
13+
import { FileSafe, validateFileSafe } from 'digital-letters-events';
1514
import { expectMessageContainingString, purgeQueue } from 'helpers/sqs-helpers';
1615
import { putFileS3 } from 'utils';
1716

@@ -64,7 +63,7 @@ test.describe('Print analyser', () => {
6463
},
6564
};
6665

67-
await eventPublisher.sendEvents<FileSafe>([event], fileSafeValidator);
66+
await eventPublisher.sendEvents<FileSafe>([event], validateFileSafe);
6867

6968
await expectToPassEventually(async () => {
7069
const eventLogEntry = await getLogsFromCloudwatch(

‎tests/playwright/digital-letters-component-tests/print-sender.component.spec.ts‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@ import {
44
PRINT_SENDER_DLQ_NAME,
55
PRINT_SENDER_LAMBDA_LOG_GROUP_NAME,
66
} from 'constants/backend-constants';
7-
import { PDFAnalysed } from 'digital-letters-events';
8-
import pdfAnalysedValidator from 'digital-letters-events/PDFAnalysed.js';
7+
import { PDFAnalysed, validatePDFAnalysed } from 'digital-letters-events';
98
import { getLogsFromCloudwatch } from 'helpers/cloudwatch-helpers';
109
import eventPublisher from 'helpers/event-bus-helpers';
1110
import expectToPassEventually from 'helpers/expectations';
@@ -52,7 +51,7 @@ test.describe('Digital Letters - Print Sender', () => {
5251
},
5352
},
5453
],
55-
pdfAnalysedValidator,
54+
validatePDFAnalysed,
5655
);
5756

5857
// Verify letter prepared event published

‎tests/playwright/digital-letters-component-tests/send-reports-trust.component.spec.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ import expectToPassEventually from 'helpers/expectations';
1111
import { downloadFromS3, uploadToS3 } from 'helpers/s3-helpers';
1212
import { expectMessageContainingString } from 'helpers/sqs-helpers';
1313
import { v4 as uuidv4 } from 'uuid';
14-
import reportGenerated from 'digital-letters-events/ReportGenerated.js';
1514
import { SENDER_ID_SKIPS_NOTIFY } from 'constants/tests-constants';
15+
import { validateReportGenerated } from 'digital-letters-events';
1616

1717
test.describe('Digital Letters - Send reports to Trust', () => {
1818
const senderId = SENDER_ID_SKIPS_NOTIFY;
@@ -44,7 +44,7 @@ test.describe('Digital Letters - Send reports to Trust', () => {
4444
},
4545
},
4646
],
47-
reportGenerated,
47+
validateReportGenerated,
4848
);
4949
}
5050

‎tests/playwright/digital-letters-component-tests/ttl-create.component.spec.ts‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,10 @@ import {
88
SENDER_ID_SKIPS_NOTIFY,
99
SENDER_ID_VALID_FOR_NOTIFY_SANDBOX,
1010
} from 'constants/tests-constants';
11-
import { MESHInboxMessageDownloaded } from 'digital-letters-events';
12-
import messageDownloadedValidator from 'digital-letters-events/MESHInboxMessageDownloaded.js';
11+
import {
12+
MESHInboxMessageDownloaded,
13+
validateMESHInboxMessageDownloaded,
14+
} from 'digital-letters-events';
1315
import { getLogsFromCloudwatch } from 'helpers/cloudwatch-helpers';
1416
import { getTtl } from 'helpers/dynamodb-helpers';
1517
import eventPublisher from 'helpers/event-bus-helpers';
@@ -61,7 +63,7 @@ test.describe('Digital Letters - Create TTL', () => {
6163
},
6264
},
6365
],
64-
messageDownloadedValidator,
66+
validateMESHInboxMessageDownloaded,
6567
);
6668

6769
// Verify TTL created
@@ -102,7 +104,7 @@ test.describe('Digital Letters - Create TTL', () => {
102104
},
103105
},
104106
],
105-
messageDownloadedValidator,
107+
validateMESHInboxMessageDownloaded,
106108
);
107109

108110
// Verify TTL created
@@ -185,7 +187,7 @@ test.describe('Digital Letters - Create TTL', () => {
185187
},
186188
},
187189
],
188-
messageDownloadedValidator,
190+
validateMESHInboxMessageDownloaded,
189191
);
190192

191193
await Promise.all([

0 commit comments

Comments
 (0)