Skip to content

Commit bbb2880

Browse files
committed
CCM-12666: break test into suites
1 parent 3703d44 commit bbb2880

11 files changed

+305
-312
lines changed

package-lock.json

Lines changed: 261 additions & 293 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

scripts/tests/accessibility.sh

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,37 @@ cp ./utils/utils/src/email-templates/* ./frontend/public/testing/
1313
npm run app:start --prefix frontend
1414
npm run app:wait --prefix frontend
1515

16+
journeys=(
17+
landingPageTests
18+
allTemplatesTests
19+
chooseTemplateTests
20+
nhsAppTests
21+
smsTests
22+
emailTests
23+
lettersTests
24+
userEmailsTests
25+
errorsTests
26+
routingTests
27+
templatesPagesWithRoutingContentEnabledTests
28+
)
29+
1630
TEST_EXIT_CODE=0
17-
npm run test:accessibility -w tests/accessibility || TEST_EXIT_CODE=$?
18-
echo "TEST_EXIT_CODE=$TEST_EXIT_CODE"
31+
32+
for journey in "${journeys[@]}"; do
33+
echo "==== ▶️ Running Pa11y journey: $journey ====="
34+
35+
report_dir="./.reports/accessibility/$journey"
36+
mkdir -p "$report_dir"
37+
38+
JOURNEY="$journey" REPORT_DEST="$report_dir" \
39+
npm run test:accessibility -w tests/accessibility
40+
41+
exit_code=$?
42+
if [[ $exit_code -ne 0 ]]; then
43+
TEST_EXIT_CODE=$exit_code
44+
fi
45+
echo;
46+
done
1947

2048
mkdir -p ./tests/acceptance-test-report
2149
cp -r ./tests/accessibility/.reports/accessibility ./tests/acceptance-test-report

tests/accessibility/.pa11y-ci.js

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -196,17 +196,20 @@ const selectedJourney = process.env.JOURNEY && allJourneys[process.env.JOURNEY]
196196
? [process.env.JOURNEY]
197197
: Object.keys(allJourneys);
198198

199+
const reportDest =
200+
process.env.REPORT_DEST || './.reports/accessibility';
201+
199202
module.exports = {
200203
urls: selectedJourney
201204
.flatMap(journey => allJourneys[journey] || [])
202-
.map(performCheck),
205+
.map((config) => performCheck({...config, reportDest})),
203206
defaults: {
204207
reporters: [
205208
'cli',
206209
[
207210
'pa11y-ci-reporter-html',
208211
{
209-
destination: './.reports/accessibility',
212+
destination: reportDest,
210213
includeZeroIssues: true,
211214
},
212215
],
@@ -217,6 +220,6 @@ module.exports = {
217220
},
218221
standard: 'WCAG2AA',
219222
agent: 'pa11y',
220-
concurrency: 4,
223+
concurrency: 2,
221224
},
222225
};

tests/accessibility/actions/create-message-plan.actions.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
const pageActions = [
2-
'wait for element .nhsuk-button to be visible',
3-
];
1+
const pageActions = ['wait for element .nhsuk-button to be visible'];
42

53
const createMessagePlanPage = (url) => ({
64
name: 'create-message-plan',

tests/accessibility/actions/message-plans.actions.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
const pageActions = [
2-
'wait for element .nhsuk-button to be visible',
3-
];
1+
const pageActions = ['wait for element .nhsuk-button to be visible'];
42

53
const messagePlansPage = (url) => ({
64
name: 'message-plans',

tests/accessibility/actions/message-templates.actions.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
const pageActions = [
2-
'wait for element #create-template-button to be visible',
3-
];
1+
const pageActions = ['wait for element #create-template-button to be visible'];
42

53
const messageTemplatesPage = (url) => ({
64
name: 'message-templates',

tests/accessibility/actions/submit-nhs-app-template.actions.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ const pageActions = [
1212
];
1313

1414
const submitNHSAppTemplatePage = (url) => ({
15-
name: 'preview-nhs-app-template',
15+
name: 'submit-nhs-app-template',
1616
url,
1717
actions: pageActions,
1818
});

tests/accessibility/actions/view-proofs-available-letter-template.actions.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ const pageActions = [
88
];
99

1010
const viewAvailableProofsForLetterTemplatePage = (url) => ({
11-
name: 'proof-available-letter-template',
11+
name: 'view-available-proofs-for-letter-template',
1212
url,
1313
actions: pageActions,
1414
});

tests/accessibility/actions/waiting-for-proofs-letter-template.actions.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ const pageActions = [
88
];
99

1010
const waitingForProofsLetterTemplatePage = (url) => ({
11-
name: 'proof-available-letter-template',
11+
name: 'waiting-for-proofs-letter-template',
1212
url,
1313
actions: pageActions,
1414
});

tests/accessibility/helpers.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ function performCheck(options) {
1414
return {
1515
...defaultOptions,
1616
url: `${defaultOptions.url}?pageName=${defaultOptions.name}`,
17-
screenCapture: `./.reports/accessibility/${defaultOptions.name}.png`,
17+
screenCapture: `./${defaultOptions.reportDest}/${defaultOptions.name}.png`,
1818
};
1919
}
2020

0 commit comments

Comments
 (0)