Skip to content

Commit 3c0ce6b

Browse files
nicki-nhsnicki-nhs
committed
CCM-11492 Fix unit tests
1 parent 44ddddc commit 3c0ce6b

File tree

6 files changed

+164
-140
lines changed

6 files changed

+164
-140
lines changed

‎frontend/src/__tests__/app/choose-templates/__snapshots__/page.test.tsx.snap‎

Lines changed: 138 additions & 108 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ exports[`ChooseTemplatesPage renders correctly for a message plan with multiple
2828
>
2929
<a
3030
data-testid="change-message-plan-name-link"
31-
href="/message-plans/create-message-plan"
31+
href="/message-plans/edit-message-plan/fbb81055-79b9-4759-ac07-d191ae57be34"
3232
>
3333
Change name
3434
</a>
@@ -98,40 +98,48 @@ exports[`ChooseTemplatesPage renders correctly for a message plan with multiple
9898
>
9999
NHS App
100100
</h3>
101-
<p>
101+
<p
102+
class="nhsuk-u-margin-bottom-2"
103+
data-testid="template-name-NHSAPP"
104+
>
102105
name
103-
<br />
104-
<a
105-
class="nhsuk-link nhsuk-link--no-visited-state"
106-
data-testid="change-template-link-NHSAPP"
107-
href="/message-plans/choose-nhs-app-template"
108-
>
109-
Change
110-
<span
111-
class="nhsuk-u-visually-hidden"
112-
>
113-
NHS App
114-
</span>
115-
116-
template
117-
</a>
118106
</p>
119-
<p>
120-
<a
121-
class="channel-template-link--remove nhsuk-link"
122-
data-testid="remove-template-link-NHSAPP"
123-
href="todo"
124-
>
125-
Remove
126-
<span
127-
class="nhsuk-u-visually-hidden"
107+
<ul
108+
class="channel-template-actions"
109+
>
110+
<li>
111+
<a
112+
class="nhsuk-link nhsuk-link--no-visited-state"
113+
data-testid="change-template-link-NHSAPP"
114+
href="/message-plans/choose-nhs-app-template/fbb81055-79b9-4759-ac07-d191ae57be34"
128115
>
129-
NHS App
130-
</span>
131-
132-
template
133-
</a>
134-
</p>
116+
Change
117+
<span
118+
class="nhsuk-u-visually-hidden"
119+
>
120+
NHS App
121+
</span>
122+
123+
template
124+
</a>
125+
</li>
126+
<li>
127+
<button
128+
class="channel-template-link--remove nhsuk-link"
129+
data-testid="remove-template-link-NHSAPP"
130+
type="button"
131+
>
132+
Remove
133+
<span
134+
class="nhsuk-u-visually-hidden"
135+
>
136+
NHS App
137+
</span>
138+
139+
template
140+
</button>
141+
</li>
142+
</ul>
135143
</div>
136144
</div>
137145
</li>
@@ -250,40 +258,48 @@ exports[`ChooseTemplatesPage renders correctly for a message plan with multiple
250258
>
251259
Text message (SMS)
252260
</h3>
253-
<p>
261+
<p
262+
class="nhsuk-u-margin-bottom-2"
263+
data-testid="template-name-SMS"
264+
>
254265
name
255-
<br />
256-
<a
257-
class="nhsuk-link nhsuk-link--no-visited-state"
258-
data-testid="change-template-link-SMS"
259-
href="/message-plans/choose-text-message-template"
260-
>
261-
Change
262-
<span
263-
class="nhsuk-u-visually-hidden"
264-
>
265-
Text message (SMS)
266-
</span>
267-
268-
template
269-
</a>
270266
</p>
271-
<p>
272-
<a
273-
class="channel-template-link--remove nhsuk-link"
274-
data-testid="remove-template-link-SMS"
275-
href="todo"
276-
>
277-
Remove
278-
<span
279-
class="nhsuk-u-visually-hidden"
267+
<ul
268+
class="channel-template-actions"
269+
>
270+
<li>
271+
<a
272+
class="nhsuk-link nhsuk-link--no-visited-state"
273+
data-testid="change-template-link-SMS"
274+
href="/message-plans/choose-text-message-template/fbb81055-79b9-4759-ac07-d191ae57be34"
280275
>
281-
Text message (SMS)
282-
</span>
283-
284-
template
285-
</a>
286-
</p>
276+
Change
277+
<span
278+
class="nhsuk-u-visually-hidden"
279+
>
280+
Text message (SMS)
281+
</span>
282+
283+
template
284+
</a>
285+
</li>
286+
<li>
287+
<button
288+
class="channel-template-link--remove nhsuk-link"
289+
data-testid="remove-template-link-SMS"
290+
type="button"
291+
>
292+
Remove
293+
<span
294+
class="nhsuk-u-visually-hidden"
295+
>
296+
Text message (SMS)
297+
</span>
298+
299+
template
300+
</button>
301+
</li>
302+
</ul>
287303
</div>
288304
</div>
289305
</li>
@@ -402,20 +418,26 @@ exports[`ChooseTemplatesPage renders correctly for a message plan with multiple
402418
>
403419
Email
404420
</h3>
405-
<a
406-
class="nhsuk-link nhsuk-link--no-visited-state"
407-
data-testid="choose-template-link-EMAIL"
408-
href="/message-plans/choose-email-template"
421+
<ul
422+
class="channel-template-actions"
409423
>
410-
Choose
411-
<span
412-
class="nhsuk-u-visually-hidden"
413-
>
414-
Email
415-
</span>
416-
417-
template
418-
</a>
424+
<li>
425+
<a
426+
class="nhsuk-link nhsuk-link--no-visited-state"
427+
data-testid="choose-template-link-EMAIL"
428+
href="/message-plans/choose-email-template/fbb81055-79b9-4759-ac07-d191ae57be34"
429+
>
430+
Choose
431+
<span
432+
class="nhsuk-u-visually-hidden"
433+
>
434+
Email
435+
</span>
436+
437+
template
438+
</a>
439+
</li>
440+
</ul>
419441
</div>
420442
</div>
421443
</li>
@@ -534,40 +556,48 @@ exports[`ChooseTemplatesPage renders correctly for a message plan with multiple
534556
>
535557
Letter
536558
</h3>
537-
<p>
559+
<p
560+
class="nhsuk-u-margin-bottom-2"
561+
data-testid="template-name-LETTER"
562+
>
538563
name
539-
<br />
540-
<a
541-
class="nhsuk-link nhsuk-link--no-visited-state"
542-
data-testid="change-template-link-LETTER"
543-
href="/message-plans/choose-standard-english-letter-template"
544-
>
545-
Change
546-
<span
547-
class="nhsuk-u-visually-hidden"
548-
>
549-
Letter
550-
</span>
551-
552-
template
553-
</a>
554564
</p>
555-
<p>
556-
<a
557-
class="channel-template-link--remove nhsuk-link"
558-
data-testid="remove-template-link-LETTER"
559-
href="todo"
560-
>
561-
Remove
562-
<span
563-
class="nhsuk-u-visually-hidden"
565+
<ul
566+
class="channel-template-actions"
567+
>
568+
<li>
569+
<a
570+
class="nhsuk-link nhsuk-link--no-visited-state"
571+
data-testid="change-template-link-LETTER"
572+
href="/message-plans/choose-standard-english-letter-template/fbb81055-79b9-4759-ac07-d191ae57be34"
564573
>
565-
Letter
566-
</span>
567-
568-
template
569-
</a>
570-
</p>
574+
Change
575+
<span
576+
class="nhsuk-u-visually-hidden"
577+
>
578+
Letter
579+
</span>
580+
581+
template
582+
</a>
583+
</li>
584+
<li>
585+
<button
586+
class="channel-template-link--remove nhsuk-link"
587+
data-testid="remove-template-link-LETTER"
588+
type="button"
589+
>
590+
Remove
591+
<span
592+
class="nhsuk-u-visually-hidden"
593+
>
594+
Letter
595+
</span>
596+
597+
template
598+
</button>
599+
</li>
600+
</ul>
571601
</div>
572602
</div>
573603
</li>
@@ -581,7 +611,7 @@ exports[`ChooseTemplatesPage renders correctly for a message plan with multiple
581611
class="nhsuk-button"
582612
data-testid="move-to-production-cta"
583613
draggable="false"
584-
href="/message-plans/move-to-production"
614+
href="/message-plans/move-to-production/fbb81055-79b9-4759-ac07-d191ae57be34"
585615
role="button"
586616
>
587617
Move to production

‎frontend/src/__tests__/components/organisms/CreateEditMessagePlan.test.tsx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,12 @@ import {
1212
LETTER_TEMPLATE,
1313
NHS_APP_TEMPLATE,
1414
} from '@testhelpers/helpers';
15+
import { randomUUID } from 'node:crypto';
1516

1617
const mockTemplates: MessagePlanTemplates = {} as MessagePlanTemplates;
1718

1819
function buildRoutingConfig({
19-
id = 'routing-config-123',
20+
id = randomUUID(),
2021
name = 'Test Campaign',
2122
status = 'DRAFT' as RoutingConfigStatus,
2223
channels = ['NHSAPP', 'EMAIL'] as Channel[],

‎frontend/src/__tests__/components/organisms/MessagePlanChannelList.test.tsx‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ describe('MessagePlanChannelList', () => {
5151
<MessagePlanChannelList
5252
messagePlan={messagePlan}
5353
templates={testTemplates}
54-
routingConfigId={messagePlan.id}
5554
/>
5655
);
5756

@@ -66,7 +65,6 @@ describe('MessagePlanChannelList', () => {
6665
<MessagePlanChannelList
6766
messagePlan={messagePlan}
6867
templates={testTemplates}
69-
routingConfigId={messagePlan.id}
7068
/>
7169
);
7270

@@ -93,7 +91,6 @@ describe('MessagePlanChannelList', () => {
9391
<MessagePlanChannelList
9492
messagePlan={messagePlan}
9593
templates={testTemplates}
96-
routingConfigId={messagePlan.id}
9794
/>
9895
);
9996

@@ -123,7 +120,6 @@ describe('MessagePlanChannelList', () => {
123120
<MessagePlanChannelList
124121
messagePlan={messagePlan}
125122
templates={testTemplates}
126-
routingConfigId={messagePlan.id}
127123
/>
128124
);
129125
expect(asFragment()).toMatchSnapshot();
@@ -136,7 +132,6 @@ describe('MessagePlanChannelList', () => {
136132
<MessagePlanChannelList
137133
messagePlan={messagePlan}
138134
templates={testTemplates}
139-
routingConfigId={messagePlan.id}
140135
/>
141136
);
142137
expect(asFragment()).toMatchSnapshot();

0 commit comments

Comments
 (0)