Skip to content

Commit fa917a1

Browse files
chris-elliott-nhsdchris-elliott-nhsd
committed
CCM-12666: Fix linting and typecheck
1 parent dba099c commit fa917a1

File tree

3 files changed

+130
-108
lines changed

3 files changed

+130
-108
lines changed

‎tests/accessibility/pa11y-setup.ts‎

Lines changed: 102 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,11 @@ const generateDigitalTemplateData = (
9393
};
9494
};
9595

96-
const setupTestUser = async (testUserClient: TestUserClient, clientId: string, clientName: string) => {
96+
const setupTestUser = async (
97+
testUserClient: TestUserClient,
98+
clientId: string,
99+
clientName: string
100+
) => {
97101
const email = `nhs-notify-automated-test-accessibility-test-${randomUUID()}@nhs.net`;
98102
const password = generate({
99103
length: 20,
@@ -115,84 +119,84 @@ const setupTestUser = async (testUserClient: TestUserClient, clientId: string, c
115119
email,
116120
password,
117121
userId,
122+
clientId,
118123
};
119-
}
120-
121-
const getTestTemplates = (clientId: string) => ([
122-
generateLetterTemplateData(
123-
'pa11y-letter-pending-virus-check',
124-
clientId,
125-
'PENDING',
126-
'PENDING_UPLOAD'
127-
),
128-
generateLetterTemplateData(
129-
'pa11y-letter-failed-virus-check',
130-
clientId,
131-
'FAILED',
132-
'VIRUS_SCAN_FAILED'
133-
),
134-
generateLetterTemplateData(
135-
'pa11y-letter-pending-validation',
136-
clientId,
137-
'PASSED',
138-
'PENDING_VALIDATION'
139-
),
140-
generateLetterTemplateData(
141-
'pa11y-letter-failed-validation',
142-
clientId,
143-
'PASSED',
144-
'VALIDATION_FAILED'
145-
),
146-
generateLetterTemplateData(
147-
'pa11y-letter-passed-validation',
148-
clientId,
149-
'PASSED',
150-
'PENDING_PROOF_REQUEST'
151-
),
152-
generateLetterTemplateData(
153-
'pa11y-letter-proof-requested',
154-
clientId,
155-
'PASSED',
156-
'WAITING_FOR_PROOF'
157-
),
158-
generateLetterTemplateData(
159-
'pa11y-letter-proof-available',
160-
clientId,
161-
'PASSED',
162-
'PROOF_AVAILABLE'
163-
),
164-
generateLetterTemplateData(
165-
'pa11y-letter-proof-submitted',
166-
clientId,
167-
'PASSED',
168-
'SUBMITTED'
169-
),
170-
generateDigitalTemplateData(
171-
'pa11y-email-proof-submitted',
172-
clientId,
173-
'EMAIL',
174-
'SUBMITTED'
175-
),
176-
generateDigitalTemplateData(
177-
'pa11y-sms-proof-submitted',
178-
clientId,
179-
'SMS',
180-
'SUBMITTED'
181-
),
182-
generateDigitalTemplateData(
183-
'pa11y-nhsapp-proof-submitted',
184-
clientId,
185-
'NHS_APP',
186-
'SUBMITTED'
187-
),
188-
]);
124+
};
125+
126+
const getTestTemplates = (clientId: string) => [
127+
generateLetterTemplateData(
128+
'pa11y-letter-pending-virus-check',
129+
clientId,
130+
'PENDING',
131+
'PENDING_UPLOAD'
132+
),
133+
generateLetterTemplateData(
134+
'pa11y-letter-failed-virus-check',
135+
clientId,
136+
'FAILED',
137+
'VIRUS_SCAN_FAILED'
138+
),
139+
generateLetterTemplateData(
140+
'pa11y-letter-pending-validation',
141+
clientId,
142+
'PASSED',
143+
'PENDING_VALIDATION'
144+
),
145+
generateLetterTemplateData(
146+
'pa11y-letter-failed-validation',
147+
clientId,
148+
'PASSED',
149+
'VALIDATION_FAILED'
150+
),
151+
generateLetterTemplateData(
152+
'pa11y-letter-passed-validation',
153+
clientId,
154+
'PASSED',
155+
'PENDING_PROOF_REQUEST'
156+
),
157+
generateLetterTemplateData(
158+
'pa11y-letter-proof-requested',
159+
clientId,
160+
'PASSED',
161+
'WAITING_FOR_PROOF'
162+
),
163+
generateLetterTemplateData(
164+
'pa11y-letter-proof-available',
165+
clientId,
166+
'PASSED',
167+
'PROOF_AVAILABLE'
168+
),
169+
generateLetterTemplateData(
170+
'pa11y-letter-proof-submitted',
171+
clientId,
172+
'PASSED',
173+
'SUBMITTED'
174+
),
175+
generateDigitalTemplateData(
176+
'pa11y-email-proof-submitted',
177+
clientId,
178+
'EMAIL',
179+
'SUBMITTED'
180+
),
181+
generateDigitalTemplateData(
182+
'pa11y-sms-proof-submitted',
183+
clientId,
184+
'SMS',
185+
'SUBMITTED'
186+
),
187+
generateDigitalTemplateData(
188+
'pa11y-nhsapp-proof-submitted',
189+
clientId,
190+
'NHS_APP',
191+
'SUBMITTED'
192+
),
193+
];
189194

190195
const setup = async () => {
191196
const backendConfig = BackendConfigHelper.fromTerraformOutputsFile(
192197
path.join(__dirname, '..', '..', 'sandbox_tf_outputs.json')
193198
);
194199

195-
196200
const mainClientId = 'accessibility-test-client';
197201
const routingClientId = 'routing-accessibility-test-client';
198202

@@ -204,39 +208,45 @@ const setup = async () => {
204208
const mainUser = await setupTestUser(
205209
testUserClient,
206210
mainClientId,
207-
'NHS Accessibility',
211+
'NHS Accessibility'
208212
);
209213

210214
const routingUser = await setupTestUser(
211215
testUserClient,
212216
routingClientId,
213-
'NHS Routing Accessibility',
217+
'NHS Routing Accessibility'
214218
);
215219

216220
const ddbDocClient = DynamoDBDocumentClient.from(
217221
new DynamoDBClient({ region: 'eu-west-2' })
218222
);
219223

220-
const templateIdsList = await Promise.all([mainClientId, routingClientId].map(async (clientId) => {
221-
const templatesForClient = getTestTemplates(clientId);
224+
const templateIdsList = await Promise.all(
225+
[mainClientId, routingClientId].map(async (clientId) => {
226+
const templatesForClient = getTestTemplates(clientId);
222227

223-
await Promise.all(
224-
templatesForClient.map((template) =>
225-
ddbDocClient.send(
226-
new PutCommand({
227-
TableName: backendConfig.templatesTableName,
228-
Item: template,
229-
})
228+
await Promise.all(
229+
templatesForClient.map((template) =>
230+
ddbDocClient.send(
231+
new PutCommand({
232+
TableName: backendConfig.templatesTableName,
233+
Item: template,
234+
})
235+
)
230236
)
231-
)
232-
);
233-
234-
return [
235-
clientId, Object.fromEntries(
236-
templatesForClient.map((template) => [template.templateStatus, template.id])
237-
)
238-
];
239-
}));
237+
);
238+
239+
return [
240+
clientId,
241+
Object.fromEntries(
242+
templatesForClient.map((template) => [
243+
template.templateStatus,
244+
template.id,
245+
])
246+
),
247+
];
248+
})
249+
);
240250

241251
const templateIds = Object.fromEntries(templateIdsList);
242252

‎tests/accessibility/pa11y-teardown.ts‎

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,16 @@ const teardown = async () => {
1919
path.join(__dirname, '..', '..', 'sandbox_tf_outputs.json')
2020
);
2121

22-
const templatesToDelete = Object.entries(templateIds).flatMap(([clientId, templateIdsForClientMap]) => {
23-
const templateIdsForClient = Object.values(templateIdsForClientMap);
24-
25-
return templateIdsForClient.map(id => ({
26-
clientId,
27-
id,
28-
}));
29-
});
22+
const templatesToDelete = Object.entries(templateIds).flatMap(
23+
([clientId, templateIdsForClientMap]) => {
24+
const templateIdsForClient = Object.values(templateIdsForClientMap);
25+
26+
return templateIdsForClient.map((id) => ({
27+
clientId,
28+
id,
29+
}));
30+
}
31+
);
3032

3133
await Promise.all(
3234
templatesToDelete.map(({ clientId, id }) =>
@@ -42,10 +44,16 @@ const teardown = async () => {
4244
)
4345
);
4446

45-
await new TestUserClient(
47+
const testUserClient = new TestUserClient(
4648
backendConfig.userPoolId,
4749
backendConfig.clientSsmPathPrefix
48-
).deleteTestUser(email, clientId);
50+
);
51+
52+
await Promise.all(
53+
Object.values(users).map(({ email, clientId }) =>
54+
testUserClient.deleteTestUser(email, clientId)
55+
)
56+
);
4957
};
5058

5159
teardown();

‎tests/accessibility/types.ts‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
export type FixtureData = {
2-
users: Record<string, {
3-
email: string;
4-
password: string;
5-
userId: string;
6-
};
7-
templateIds: Record<string, Record<string, string>>;
2+
users: Record<
3+
string,
4+
{
5+
email: string;
6+
password: string;
7+
userId: string;
8+
clientId: string;
9+
}
10+
>;
11+
templateIds: Record<string, Record<string, string>>;
812
};

0 commit comments

Comments
 (0)