Skip to content

Commit 069a504

Browse files
alexnuttallalexnuttall
committed
CCM-8601: pa11y and pw fixes
1 parent 6d0e4b2 commit 069a504

File tree

33 files changed

+139
-127
lines changed

33 files changed

+139
-127
lines changed

‎frontend/src/__tests__/components/forms/PreviewEmailTemplate/__snapshots__/PreviewEmailTemplate.test.tsx.snap‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ exports[`Preview email form renders matches error snapshot 1`] = `
6767
</ul>
6868
</div>
6969
<h1
70-
class="review__heading"
70+
class="preview__heading"
7171
data-testid="preview-message__heading"
7272
>
7373
test-template-email
@@ -341,7 +341,7 @@ exports[`Preview email form renders matches snapshot when navigating from edit s
341341
Template saved
342342
</div>
343343
<h1
344-
class="review__heading"
344+
class="preview__heading"
345345
data-testid="preview-message__heading"
346346
>
347347
test-template-email
@@ -598,7 +598,7 @@ exports[`Preview email form renders matches snapshot when navigating from manage
598598
class="nhsuk-grid-column-full"
599599
>
600600
<h1
601-
class="review__heading"
601+
class="preview__heading"
602602
data-testid="preview-message__heading"
603603
>
604604
test-template-email

‎frontend/src/__tests__/components/forms/PreviewEmailTemplate/server-action.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ const initialState: EmailTemplate = {
2323
message: 'template-message',
2424
};
2525

26-
describe('reviewEmailTemplateAction server action', () => {
26+
describe('previewEmailTemplateAction server action', () => {
2727
beforeEach(jest.resetAllMocks);
2828

2929
it('should return state when validation fails', async () => {

‎frontend/src/__tests__/components/forms/PreviewLetterTemplate/__snapshots__/PreviewLetterTemplate.test.tsx.snap‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ exports[`Preview letter form renders matches error snapshot 1`] = `
6767
</ul>
6868
</div>
6969
<h1
70-
class="review__heading"
70+
class="preview__heading"
7171
data-testid="preview-message__heading"
7272
>
7373
test-template-letter
@@ -367,7 +367,7 @@ exports[`Preview letter form renders matches snapshot when navigating from edit
367367
Template saved
368368
</div>
369369
<h1
370-
class="review__heading"
370+
class="preview__heading"
371371
data-testid="preview-message__heading"
372372
>
373373
test-template-letter
@@ -650,7 +650,7 @@ exports[`Preview letter form renders matches snapshot when navigating from manag
650650
class="nhsuk-grid-column-full"
651651
>
652652
<h1
653-
class="review__heading"
653+
class="preview__heading"
654654
data-testid="preview-message__heading"
655655
>
656656
test-template-letter

‎frontend/src/__tests__/components/forms/PreviewSMSTemplate/__snapshots__/PreviewSMSTemplate.test.tsx.snap‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ exports[`Review sms form renders matches error snapshot 1`] = `
6767
</ul>
6868
</div>
6969
<h1
70-
class="review__heading"
70+
class="preview__heading"
7171
data-testid="preview-message__heading"
7272
>
7373
test-template-sms
@@ -315,7 +315,7 @@ exports[`Review sms form renders matches snapshot when navigating from edit scre
315315
Template saved
316316
</div>
317317
<h1
318-
class="review__heading"
318+
class="preview__heading"
319319
data-testid="preview-message__heading"
320320
>
321321
test-template-sms
@@ -546,7 +546,7 @@ exports[`Review sms form renders matches snapshot when navigating from manage te
546546
class="nhsuk-grid-column-full"
547547
>
548548
<h1
549-
class="review__heading"
549+
class="preview__heading"
550550
data-testid="preview-message__heading"
551551
>
552552
test-template-sms

‎frontend/src/__tests__/components/forms/PreviewSMSTemplate/server-action.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ const initialState: SMSTemplate = {
2222
message: 'template-message',
2323
};
2424

25-
describe('reviewSmsTemplateAction server action', () => {
25+
describe('previewSmsTemplateAction server action', () => {
2626
beforeEach(jest.resetAllMocks);
2727

2828
it('should return state when validation fails', async () => {

‎frontend/src/__tests__/components/forms/ReviewNHSAppTemplate/__snapshots__/ReviewNHSAppTemplate.test.tsx.snap‎

Lines changed: 47 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ exports[`Preview nhs app form renders matches error snapshot 1`] = `
6767
</ul>
6868
</div>
6969
<h1
70-
class="review__heading"
70+
class="preview__heading"
7171
data-testid="preview-message__heading"
7272
>
7373
test-template-nhs app
@@ -178,39 +178,51 @@ exports[`Preview nhs app form renders matches error snapshot 1`] = `
178178
value="no_token"
179179
/>
180180
<div
181-
class="nhsuk-form-group"
181+
class="nhsuk-form-group nhsuk-form-group--error"
182182
>
183183
<fieldset
184184
class="nhsuk-fieldset"
185185
>
186186
<legend
187187
class="nhsuk-fieldset__legend nhsuk-fieldset__legend--m"
188-
data-testid="reviewNHSAppTemplateAction-form__legend"
188+
data-testid="previewNHSAppTemplateAction-form__legend"
189189
>
190190
What would you like to do next?
191191
</legend>
192192
<div
193-
class="nhsuk-form-group"
193+
class="nhsuk-form-group nhsuk-form-group--error"
194194
>
195+
<span
196+
class="nhsuk-error-message"
197+
id="previewNHSAppTemplateAction--error-message"
198+
>
199+
<span
200+
class="nhsuk-u-visually-hidden"
201+
>
202+
Error:
203+
</span>
204+
Select an option
205+
</span>
195206
<div
207+
aria-describedby="previewNHSAppTemplateAction--error-message"
196208
class="nhsuk-radios"
197-
id="reviewNHSAppTemplateAction"
209+
id="previewNHSAppTemplateAction"
198210
>
199211
<div
200212
class="nhsuk-radios__item"
201213
>
202214
<input
203215
class="nhsuk-radios__input"
204216
data-testid="nhsapp-edit-radio"
205-
id="reviewNHSAppTemplateAction-nhsapp-edit"
206-
name="reviewNHSAppTemplateAction"
217+
id="previewNHSAppTemplateAction-nhsapp-edit"
218+
name="previewNHSAppTemplateAction"
207219
type="radio"
208220
value="nhsapp-edit"
209221
/>
210222
<label
211223
class="nhsuk-label nhsuk-radios__label"
212-
for="reviewNHSAppTemplateAction-nhsapp-edit"
213-
id="reviewNHSAppTemplateAction-nhsapp-edit--label"
224+
for="previewNHSAppTemplateAction-nhsapp-edit"
225+
id="previewNHSAppTemplateAction-nhsapp-edit--label"
214226
>
215227
Edit template
216228
</label>
@@ -221,15 +233,15 @@ exports[`Preview nhs app form renders matches error snapshot 1`] = `
221233
<input
222234
class="nhsuk-radios__input"
223235
data-testid="nhsapp-submit-radio"
224-
id="reviewNHSAppTemplateAction-nhsapp-submit"
225-
name="reviewNHSAppTemplateAction"
236+
id="previewNHSAppTemplateAction-nhsapp-submit"
237+
name="previewNHSAppTemplateAction"
226238
type="radio"
227239
value="nhsapp-submit"
228240
/>
229241
<label
230242
class="nhsuk-label nhsuk-radios__label"
231-
for="reviewNHSAppTemplateAction-nhsapp-submit"
232-
id="reviewNHSAppTemplateAction-nhsapp-submit--label"
243+
for="previewNHSAppTemplateAction-nhsapp-submit"
244+
id="previewNHSAppTemplateAction-nhsapp-submit--label"
233245
>
234246
Submit template
235247
</label>
@@ -303,7 +315,7 @@ exports[`Preview nhs app form renders matches snapshot when navigating from edit
303315
Template saved
304316
</div>
305317
<h1
306-
class="review__heading"
318+
class="preview__heading"
307319
data-testid="preview-message__heading"
308320
>
309321
test-template-nhs app
@@ -421,7 +433,7 @@ exports[`Preview nhs app form renders matches snapshot when navigating from edit
421433
>
422434
<legend
423435
class="nhsuk-fieldset__legend nhsuk-fieldset__legend--m"
424-
data-testid="reviewNHSAppTemplateAction-form__legend"
436+
data-testid="previewNHSAppTemplateAction-form__legend"
425437
>
426438
What would you like to do next?
427439
</legend>
@@ -430,23 +442,23 @@ exports[`Preview nhs app form renders matches snapshot when navigating from edit
430442
>
431443
<div
432444
class="nhsuk-radios"
433-
id="reviewNHSAppTemplateAction"
445+
id="previewNHSAppTemplateAction"
434446
>
435447
<div
436448
class="nhsuk-radios__item"
437449
>
438450
<input
439451
class="nhsuk-radios__input"
440452
data-testid="nhsapp-edit-radio"
441-
id="reviewNHSAppTemplateAction-nhsapp-edit"
442-
name="reviewNHSAppTemplateAction"
453+
id="previewNHSAppTemplateAction-nhsapp-edit"
454+
name="previewNHSAppTemplateAction"
443455
type="radio"
444456
value="nhsapp-edit"
445457
/>
446458
<label
447459
class="nhsuk-label nhsuk-radios__label"
448-
for="reviewNHSAppTemplateAction-nhsapp-edit"
449-
id="reviewNHSAppTemplateAction-nhsapp-edit--label"
460+
for="previewNHSAppTemplateAction-nhsapp-edit"
461+
id="previewNHSAppTemplateAction-nhsapp-edit--label"
450462
>
451463
Edit template
452464
</label>
@@ -457,15 +469,15 @@ exports[`Preview nhs app form renders matches snapshot when navigating from edit
457469
<input
458470
class="nhsuk-radios__input"
459471
data-testid="nhsapp-submit-radio"
460-
id="reviewNHSAppTemplateAction-nhsapp-submit"
461-
name="reviewNHSAppTemplateAction"
472+
id="previewNHSAppTemplateAction-nhsapp-submit"
473+
name="previewNHSAppTemplateAction"
462474
type="radio"
463475
value="nhsapp-submit"
464476
/>
465477
<label
466478
class="nhsuk-label nhsuk-radios__label"
467-
for="reviewNHSAppTemplateAction-nhsapp-submit"
468-
id="reviewNHSAppTemplateAction-nhsapp-submit--label"
479+
for="previewNHSAppTemplateAction-nhsapp-submit"
480+
id="previewNHSAppTemplateAction-nhsapp-submit--label"
469481
>
470482
Submit template
471483
</label>
@@ -534,7 +546,7 @@ exports[`Preview nhs app form renders matches snapshot when navigating from mana
534546
class="nhsuk-grid-column-full"
535547
>
536548
<h1
537-
class="review__heading"
549+
class="preview__heading"
538550
data-testid="preview-message__heading"
539551
>
540552
test-template-nhs app
@@ -652,7 +664,7 @@ exports[`Preview nhs app form renders matches snapshot when navigating from mana
652664
>
653665
<legend
654666
class="nhsuk-fieldset__legend nhsuk-fieldset__legend--m"
655-
data-testid="reviewNHSAppTemplateAction-form__legend"
667+
data-testid="previewNHSAppTemplateAction-form__legend"
656668
>
657669
What would you like to do next?
658670
</legend>
@@ -661,23 +673,23 @@ exports[`Preview nhs app form renders matches snapshot when navigating from mana
661673
>
662674
<div
663675
class="nhsuk-radios"
664-
id="reviewNHSAppTemplateAction"
676+
id="previewNHSAppTemplateAction"
665677
>
666678
<div
667679
class="nhsuk-radios__item"
668680
>
669681
<input
670682
class="nhsuk-radios__input"
671683
data-testid="nhsapp-edit-radio"
672-
id="reviewNHSAppTemplateAction-nhsapp-edit"
673-
name="reviewNHSAppTemplateAction"
684+
id="previewNHSAppTemplateAction-nhsapp-edit"
685+
name="previewNHSAppTemplateAction"
674686
type="radio"
675687
value="nhsapp-edit"
676688
/>
677689
<label
678690
class="nhsuk-label nhsuk-radios__label"
679-
for="reviewNHSAppTemplateAction-nhsapp-edit"
680-
id="reviewNHSAppTemplateAction-nhsapp-edit--label"
691+
for="previewNHSAppTemplateAction-nhsapp-edit"
692+
id="previewNHSAppTemplateAction-nhsapp-edit--label"
681693
>
682694
Edit template
683695
</label>
@@ -688,15 +700,15 @@ exports[`Preview nhs app form renders matches snapshot when navigating from mana
688700
<input
689701
class="nhsuk-radios__input"
690702
data-testid="nhsapp-submit-radio"
691-
id="reviewNHSAppTemplateAction-nhsapp-submit"
692-
name="reviewNHSAppTemplateAction"
703+
id="previewNHSAppTemplateAction-nhsapp-submit"
704+
name="previewNHSAppTemplateAction"
693705
type="radio"
694706
value="nhsapp-submit"
695707
/>
696708
<label
697709
class="nhsuk-label nhsuk-radios__label"
698-
for="reviewNHSAppTemplateAction-nhsapp-submit"
699-
id="reviewNHSAppTemplateAction-nhsapp-submit--label"
710+
for="previewNHSAppTemplateAction-nhsapp-submit"
711+
id="previewNHSAppTemplateAction-nhsapp-submit--label"
700712
>
701713
Submit template
702714
</label>

‎frontend/src/__tests__/components/molecules/__snapshots__/PreviewTemplateDetails.test.tsx.snap‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
exports[`PreviewTemplateDetails component matches not yet submitted snapshot 1`] = `
44
<DocumentFragment>
55
<h1
6-
class="review__heading"
6+
class="preview__heading"
77
data-testid="preview-message__heading"
88
>
99
Example template
@@ -110,7 +110,7 @@ exports[`PreviewTemplateDetails component matches not yet submitted snapshot 1`]
110110
exports[`PreviewTemplateDetails component matches submitted snapshot 1`] = `
111111
<DocumentFragment>
112112
<h1
113-
class="review__heading"
113+
class="preview__heading"
114114
data-testid="preview-message__heading"
115115
>
116116
Example template
@@ -333,7 +333,7 @@ exports[`PreviewTemplate component renders letter template when testPersonalisat
333333
exports[`PreviewTemplate component renders without content preview 1`] = `
334334
<DocumentFragment>
335335
<h1
336-
class="review__heading"
336+
class="preview__heading"
337337
data-testid="preview-message__heading"
338338
>
339339
Example template

‎frontend/src/__tests__/components/molecules/__snapshots__/ViewEmailTemplate.test.tsx.snap‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ exports[`ViewEmailTemplate component matches submitted snapshot 1`] = `
3636
class="nhsuk-grid-column-full"
3737
>
3838
<h1
39-
class="review__heading"
39+
class="preview__heading"
4040
data-testid="preview-message__heading"
4141
>
4242
Example template

‎frontend/src/__tests__/components/molecules/__snapshots__/ViewNHSAppTemplate.test.tsx.snap‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ exports[`ViewNHSAppTemplate component matches submitted snapshot 1`] = `
3636
class="nhsuk-grid-column-full"
3737
>
3838
<h1
39-
class="review__heading"
39+
class="preview__heading"
4040
data-testid="preview-message__heading"
4141
>
4242
Example template

‎frontend/src/__tests__/components/molecules/__snapshots__/ViewSMSTemplate.test.tsx.snap‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ exports[`ViewNHSAppTemplate component matches submitted snapshot 1`] = `
3636
class="nhsuk-grid-column-full"
3737
>
3838
<h1
39-
class="review__heading"
39+
class="preview__heading"
4040
data-testid="preview-message__heading"
4141
>
4242
Example template

0 commit comments

Comments
 (0)