Skip to content

Commit d396508

Browse files
Switch from pdf templates to authoring in tests
1 parent 215e0f0 commit d396508

7 files changed

Lines changed: 104 additions & 110 deletions

File tree

frontend/src/__tests__/app/message-plans/choose-british-sign-language-letter-template/__snapshots__/page.test.tsx.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ exports[`ChooseBritishSignLanguageLetterTemplate page renders British Sign Langu
165165
>
166166
Name
167167
</span>
168-
British Sign Language letter template name
168+
authoring letter template name
169169
</td>
170170
<td
171171
class="nhsuk-table__cell"

frontend/src/__tests__/app/message-plans/choose-british-sign-language-letter-template/preview-template/__snapshots__/page.test.tsx.snap

Lines changed: 76 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,14 @@ exports[`PreviewBritishSignLanguageLetterTemplateFromMessagePlan page renders Br
3434
<h1
3535
data-testid="preview-message__heading"
3636
>
37-
British Sign Language letter template name
37+
authoring letter template name
3838
</h1>
3939
</div>
4040
<div
4141
class="nhsuk-width-container nhsuk-u-margin-bottom-6 nhsuk-body-m"
4242
>
4343
<dl
44-
class="nhsuk-summary-list nhsuk-u-margin-bottom-4 preview"
44+
class="nhsuk-summary-list nhsuk-u-margin-bottom-4 preview authoringLetterDetails"
4545
>
4646
<div
4747
class="nhsuk-summary-list__row"
@@ -57,6 +57,9 @@ exports[`PreviewBritishSignLanguageLetterTemplateFromMessagePlan page renders Br
5757
>
5858
bsl-letter-template-id
5959
</dd>
60+
<dd
61+
class="nhsuk-summary-list__actions"
62+
/>
6063
</div>
6164
<div
6265
class="nhsuk-summary-list__row"
@@ -71,43 +74,92 @@ exports[`PreviewBritishSignLanguageLetterTemplateFromMessagePlan page renders Br
7174
>
7275
British Sign Language letter
7376
</dd>
77+
<dd
78+
class="nhsuk-summary-list__actions"
79+
/>
80+
</div>
81+
<div
82+
class="nhsuk-summary-list__row missing-value"
83+
id="campaign-id"
84+
>
85+
<dt
86+
class="nhsuk-summary-list__key"
87+
>
88+
Campaign
89+
</dt>
90+
<dd
91+
class="nhsuk-summary-list__value"
92+
/>
93+
<dd
94+
aria-hidden="true"
95+
class="nhsuk-summary-list__actions"
96+
/>
7497
</div>
7598
<div
7699
class="nhsuk-summary-list__row"
77100
>
78101
<dt
79102
class="nhsuk-summary-list__key"
80103
>
81-
Template file
104+
Total pages
82105
</dt>
83106
<dd
84107
class="nhsuk-summary-list__value"
85108
>
86-
<div
87-
class="container"
109+
2
110+
</dd>
111+
<dd
112+
class="nhsuk-summary-list__actions"
113+
/>
114+
</div>
115+
<div
116+
class="nhsuk-summary-list__row"
117+
>
118+
<dt
119+
class="nhsuk-summary-list__key"
120+
>
121+
Sheets
122+
</dt>
123+
<dd
124+
class="nhsuk-summary-list__value"
125+
>
126+
1
127+
</dd>
128+
<dd
129+
class="nhsuk-summary-list__actions nhsuk-u-padding-right-4"
130+
>
131+
<a
132+
data-testid="sheets-action"
133+
href="https://notify.nhs.uk/pricing-and-commercial/letters"
134+
rel="noopener noreferrer"
135+
target="_blank"
88136
>
89-
<svg
90-
aria-hidden="true"
91-
class="icon"
92-
fill="none"
93-
height="26"
94-
viewBox="0 0 20 26"
95-
width="20"
96-
xmlns="http://www.w3.org/2000/svg"
137+
Learn more
138+
<span
139+
class="nhsuk-u-visually-hidden"
97140
>
98-
<path
99-
d="M0 0V26H20V6.59375L19.7188 6.28125L13.7188 0.28125L13.4062 0H0ZM2 2H12V8H18V24H2V2ZM14 3.4375L16.5625 6H14V3.4375Z"
100-
fill="#4C6272"
101-
/>
102-
</svg>
103-
<p
104-
class="text"
105-
>
106-
bsl-template.pdf
107-
</p>
108-
</div>
141+
about sheets
142+
</span>
143+
</a>
109144
</dd>
110145
</div>
146+
<div
147+
class="nhsuk-summary-list__row missing-value"
148+
id="printing-and-postage"
149+
>
150+
<dt
151+
class="nhsuk-summary-list__key"
152+
>
153+
Printing and postage
154+
</dt>
155+
<dd
156+
class="nhsuk-summary-list__value"
157+
/>
158+
<dd
159+
aria-hidden="true"
160+
class="nhsuk-summary-list__actions"
161+
/>
162+
</div>
111163
</dl>
112164
</div>
113165
<a

frontend/src/__tests__/app/message-plans/preview-message-plan/page.test.tsx

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,11 @@ import {
1010
ORDINALS,
1111
} from 'nhs-notify-web-template-management-utils';
1212
import {
13+
BSL_LETTER_TEMPLATE,
1314
EMAIL_TEMPLATE,
14-
PDF_LETTER_TEMPLATE,
15+
LARGE_PRINT_LETTER_TEMPLATE,
1516
NHS_APP_TEMPLATE,
17+
PDF_LETTER_TEMPLATE,
1618
SMS_TEMPLATE,
1719
} from '@testhelpers/helpers';
1820
import { RoutingConfigFactory } from '@testhelpers/routing-config-factory';
@@ -90,12 +92,12 @@ const templates: MessagePlanTemplates = {
9092
templateStatus: 'SUBMITTED',
9193
},
9294
[largePrintTemplateId]: {
93-
...PDF_LETTER_TEMPLATE,
95+
...LARGE_PRINT_LETTER_TEMPLATE,
9496
id: largePrintTemplateId,
9597
templateStatus: 'SUBMITTED',
9698
},
9799
[bslTemplateId]: {
98-
...PDF_LETTER_TEMPLATE,
100+
...BSL_LETTER_TEMPLATE,
99101
id: bslTemplateId,
100102
templateStatus: 'SUBMITTED',
101103
},

frontend/src/__tests__/app/message-plans/review-and-move-to-production/page.test.tsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,11 @@ import '@testing-library/jest-dom';
55

66
import { RoutingConfig } from 'nhs-notify-web-template-management-types';
77
import {
8+
BSL_LETTER_TEMPLATE,
89
EMAIL_TEMPLATE,
9-
PDF_LETTER_TEMPLATE,
10+
LARGE_PRINT_LETTER_TEMPLATE,
1011
NHS_APP_TEMPLATE,
12+
PDF_LETTER_TEMPLATE,
1113
SMS_TEMPLATE,
1214
} from '@testhelpers/helpers';
1315
import { RoutingConfigFactory } from '@testhelpers/routing-config-factory';
@@ -69,14 +71,12 @@ const templates: MessagePlanTemplates = {
6971
[kuTemplateId]: { ...PDF_LETTER_TEMPLATE, id: kuTemplateId },
7072
[sqTemplateId]: { ...PDF_LETTER_TEMPLATE, id: sqTemplateId },
7173
[largePrintTemplateId]: {
72-
...PDF_LETTER_TEMPLATE,
74+
...LARGE_PRINT_LETTER_TEMPLATE,
7375
id: largePrintTemplateId,
74-
templateStatus: 'SUBMITTED',
7576
},
7677
[bslTemplateId]: {
77-
...PDF_LETTER_TEMPLATE,
78+
...BSL_LETTER_TEMPLATE,
7879
id: bslTemplateId,
79-
templateStatus: 'SUBMITTED',
8080
},
8181
};
8282

frontend/src/__tests__/helpers/helpers.ts

Lines changed: 12 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -101,28 +101,7 @@ export const LARGE_PRINT_LETTER_TEMPLATE: PdfLetterTemplate = {
101101
lockNumber: 1,
102102
} as const;
103103

104-
export const BSL_LETTER_TEMPLATE: PdfLetterTemplate = {
105-
id: 'bsl-letter-template-id',
106-
templateType: 'LETTER',
107-
templateStatus: 'NOT_YET_SUBMITTED',
108-
letterType: 'q4',
109-
language: 'en',
110-
letterVersion: 'PDF',
111-
files: {
112-
pdfTemplate: {
113-
fileName: 'bsl-template.pdf',
114-
currentVersion: '9BDED347C6BF',
115-
virusScanStatus: 'PASSED',
116-
},
117-
},
118-
name: 'British Sign Language letter template name',
119-
createdAt: '2025-01-13T10:19:25.579Z',
120-
updatedAt: '2025-01-13T10:19:25.579Z',
121-
lockNumber: 1,
122-
} as const;
123-
124-
export const AUTHORING_LETTER_TEMPLATE: AuthoringLetterTemplate = {
125-
id: 'authoring-letter-template-id',
104+
const BASE_AUTHORING_LETTER_TEMPLATE: Omit<AuthoringLetterTemplate, 'id'> = {
126105
clientId: 'client-1',
127106
templateType: 'LETTER',
128107
templateStatus: 'NOT_YET_SUBMITTED',
@@ -150,6 +129,17 @@ export const AUTHORING_LETTER_TEMPLATE: AuthoringLetterTemplate = {
150129
lockNumber: 1,
151130
} as const;
152131

132+
export const AUTHORING_LETTER_TEMPLATE: AuthoringLetterTemplate = {
133+
...BASE_AUTHORING_LETTER_TEMPLATE,
134+
id: 'authoring-letter-template-id',
135+
} as const;
136+
137+
export const BSL_LETTER_TEMPLATE: AuthoringLetterTemplate = {
138+
...BASE_AUTHORING_LETTER_TEMPLATE,
139+
id: 'bsl-letter-template-id',
140+
letterType: 'q4',
141+
} as const;
142+
153143
export const ROUTING_CONFIG: RoutingConfig = {
154144
id: 'fbb81055-79b9-4759-ac07-d191ae57be34',
155145
name: 'Autumn Campaign Plan',

frontend/src/__tests__/utils/routing-utils.test.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ import {
3232
LARGE_PRINT_LETTER_TEMPLATE,
3333
PDF_LETTER_TEMPLATE,
3434
NHS_APP_TEMPLATE,
35+
BSL_LETTER_TEMPLATE,
3536
} from '@testhelpers/helpers';
3637
import { randomUUID } from 'node:crypto';
3738

@@ -1880,8 +1881,8 @@ describe('getAccessibleTemplatesForCascadeItem', () => {
18801881
],
18811882
};
18821883

1883-
const template = { ...PDF_LETTER_TEMPLATE, id };
1884-
const bslTemplate = { ...PDF_LETTER_TEMPLATE, id: id2 };
1884+
const template = { ...LARGE_PRINT_LETTER_TEMPLATE, id };
1885+
const bslTemplate = { ...BSL_LETTER_TEMPLATE, id: id2 };
18851886
const templates: MessagePlanTemplates = {
18861887
[id]: template,
18871888
[id2]: bslTemplate,

tests/test-team/template-mgmt-routing-component-tests/letter/preview-british-sign-language-letter-template.routing-component.spec.ts

Lines changed: 2 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -38,24 +38,16 @@ function createTemplates(user: TestUser) {
3838
user,
3939
'Email template name'
4040
),
41-
STANDARD_LETTER: TemplateFactory.uploadLetterTemplate(
41+
STANDARD_LETTER: TemplateFactory.createAuthoringLetterTemplate(
4242
randomUUID(),
4343
user,
4444
'Standard letter template name'
4545
),
46-
BSL_LETTER: TemplateFactory.uploadLetterTemplate(
46+
BSL_LETTER: TemplateFactory.createAuthoringLetterTemplate(
4747
randomUUID(),
4848
user,
4949
'BSL letter template name',
5050
'SUBMITTED',
51-
'PASSED',
52-
{ letterType: 'q4' }
53-
),
54-
AUTHORING_BSL_LETTER: TemplateFactory.createAuthoringLetterTemplate(
55-
randomUUID(),
56-
user,
57-
'Authoring BSL letter template name',
58-
'SUBMITTED',
5951
{ letterType: 'q4' }
6052
),
6153
};
@@ -162,49 +154,6 @@ test.describe('Routing - Preview British Sign Language letter template page', ()
162154
await expect(previewBSLLetterTemplatePage.campaignId).toContainText(
163155
templates.BSL_LETTER.campaignId!
164156
);
165-
166-
await expect(
167-
page.getByText(templates.BSL_LETTER.files!.pdfTemplate!.fileName)
168-
).toBeVisible();
169-
170-
await expect(
171-
page.getByText(templates.BSL_LETTER.files!.testDataCsv!.fileName)
172-
).toBeVisible();
173-
});
174-
175-
test('loads the AUTHORING BSL letter template', async ({ page, baseURL }) => {
176-
const previewBSLLetterTemplatePage =
177-
new RoutingPreviewBritishSignLanguageLetterTemplatePage(page);
178-
await previewBSLLetterTemplatePage
179-
.setPathParam('messagePlanId', messagePlans.LETTER_ROUTING_CONFIG.id)
180-
.setPathParam('templateId', templates.AUTHORING_BSL_LETTER.id)
181-
.setSearchParam('lockNumber', '0')
182-
.loadPage();
183-
184-
await expect(page).toHaveURL(
185-
`${baseURL}/templates/message-plans/choose-british-sign-language-letter-template/${messagePlans.LETTER_ROUTING_CONFIG.id}/preview-template/${templates.AUTHORING_BSL_LETTER.id}?lockNumber=0`
186-
);
187-
188-
await expect(previewBSLLetterTemplatePage.templateCaption).toContainText(
189-
'Template'
190-
);
191-
192-
await expect(previewBSLLetterTemplatePage.pageHeading).toContainText(
193-
templates.AUTHORING_BSL_LETTER.name
194-
);
195-
196-
await expect(previewBSLLetterTemplatePage.templateId).toBeVisible();
197-
await expect(previewBSLLetterTemplatePage.templateId).toContainText(
198-
templates.AUTHORING_BSL_LETTER.id
199-
);
200-
201-
await expect(previewBSLLetterTemplatePage.summaryList).toBeVisible();
202-
203-
expect(templates.AUTHORING_BSL_LETTER.campaignId).toBeTruthy();
204-
205-
await expect(previewBSLLetterTemplatePage.campaignId).toContainText(
206-
templates.AUTHORING_BSL_LETTER.campaignId!
207-
);
208157
});
209158

210159
test.describe('redirects to invalid template page', () => {

0 commit comments

Comments
 (0)