Skip to content

Commit 6abfc30

Browse files
ClareJonesBJSSClareJonesBJSS
committed
CCM-8961: Fix integration test letter template creation
1 parent 09fc3de commit 6abfc30

File tree

6 files changed

+17
-186
lines changed

6 files changed

+17
-186
lines changed

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

Lines changed: 0 additions & 155 deletions
Original file line numberDiff line numberDiff line change
@@ -1,160 +1,5 @@
11
// Jest Snapshot v1, https://goo.gl/fbAQLP
22

3-
exports[`PreviewLetterTemplate component matches snapshot 1`] = `
4-
<DocumentFragment>
5-
<div
6-
class="nhsuk-back-link"
7-
>
8-
<a
9-
class="nhsuk-back-link__link"
10-
href="/templates/message-templates"
11-
id="back-link"
12-
>
13-
<svg
14-
aria-hidden="true"
15-
class="nhsuk-icon nhsuk-icon__chevron-left"
16-
height="24"
17-
viewBox="0 0 24 24"
18-
width="24"
19-
xmlns="http://www.w3.org/2000/svg"
20-
>
21-
<path
22-
d="M8.5 12c0-.3.1-.5.3-.7l5-5c.4-.4 1-.4 1.4 0s.4 1 0 1.4L10.9 12l4.3 4.3c.4.4.4 1 0 1.4s-1 .4-1.4 0l-5-5c-.2-.2-.3-.4-.3-.7z"
23-
/>
24-
</svg>
25-
Back to all templates
26-
</a>
27-
</div>
28-
<main
29-
class="nhsuk-main-wrapper"
30-
id="maincontent"
31-
role="main"
32-
>
33-
<div
34-
class="nhsuk-grid-row"
35-
>
36-
<div
37-
class="nhsuk-grid-column-full"
38-
>
39-
<h1
40-
class="preview__heading"
41-
data-testid="preview-message__heading"
42-
>
43-
letter
44-
</h1>
45-
<div
46-
class="nhsuk-width-container nhsuk-u-margin-bottom-6 nhsuk-body-m"
47-
>
48-
<dl
49-
class="nhsuk-summary-list nhsuk-u-margin-bottom-4 preview"
50-
>
51-
<div
52-
class="nhsuk-summary-list__row"
53-
>
54-
<dt
55-
class="nhsuk-summary-list__key"
56-
>
57-
Template ID
58-
</dt>
59-
<dd
60-
class="nhsuk-summary-list__value"
61-
>
62-
53525D03-1BC1-4563-ABF9-A74FF04142AF
63-
</dd>
64-
</div>
65-
<div
66-
class="nhsuk-summary-list__row"
67-
>
68-
<dt
69-
class="nhsuk-summary-list__key"
70-
>
71-
Type
72-
</dt>
73-
<dd
74-
class="nhsuk-summary-list__value"
75-
>
76-
British Sign Language letter - Arabic
77-
</dd>
78-
</div>
79-
<div
80-
class="nhsuk-summary-list__row"
81-
>
82-
<dt
83-
class="nhsuk-summary-list__key"
84-
>
85-
Status
86-
</dt>
87-
<dd
88-
class="nhsuk-summary-list__value"
89-
>
90-
<strong
91-
class="nhsuk-tag"
92-
>
93-
Not yet submitted
94-
</strong>
95-
</dd>
96-
</div>
97-
<div
98-
class="nhsuk-summary-list__row"
99-
>
100-
<dt
101-
class="nhsuk-summary-list__key"
102-
>
103-
Template file
104-
</dt>
105-
<dd
106-
class="nhsuk-summary-list__value"
107-
>
108-
<div
109-
class="container"
110-
>
111-
<svg
112-
class="icon"
113-
fill="none"
114-
height="26"
115-
viewBox="0 0 20 26"
116-
width="20"
117-
xmlns="http://www.w3.org/2000/svg"
118-
>
119-
<path
120-
d="M0 0V26H20V6.59375L19.7188 6.28125L13.7188 0.28125L13.4062 0H0ZM2 2H12V8H18V24H2V2ZM14 3.4375L16.5625 6H14V3.4375Z"
121-
fill="#4C6272"
122-
/>
123-
</svg>
124-
<p
125-
class="text"
126-
>
127-
file.pdf
128-
</p>
129-
</div>
130-
</dd>
131-
</div>
132-
</dl>
133-
</div>
134-
<a
135-
aria-disabled="false"
136-
class="nhsuk-button"
137-
data-testid="preview-letter-template-cta"
138-
draggable="false"
139-
href="/templates/submit-letter-template/53525D03-1BC1-4563-ABF9-A74FF04142AF"
140-
id="preview-letter-template-cta"
141-
role="button"
142-
>
143-
Submit template
144-
</a>
145-
<p>
146-
<a
147-
href="/message-templates"
148-
>
149-
Back to all templates
150-
</a>
151-
</p>
152-
</div>
153-
</div>
154-
</main>
155-
</DocumentFragment>
156-
`;
157-
1583
exports[`PreviewLetterTemplate component matches snapshot when template status is NOT_YET_SUBMITTED 1`] = `
1594
<DocumentFragment>
1605
<div

‎frontend/src/components/molecules/MessageTemplates/MessageTemplates.tsx‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import {
1313
templateStatusToDisplayMappings,
1414
templateTypeDisplayMappings,
1515
previewSubmittedTemplatePages,
16-
templateStatusToColourMappings,
1716
} from 'nhs-notify-web-template-management-utils';
1817
import { TemplateDto } from 'nhs-notify-backend-client';
1918
import style from './MessageTemplates.module.scss';

‎tests/test-team/helpers/factories/template-factory.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ export const TemplateFactory = {
7676
}
7777
): Template => {
7878
return {
79-
templateStatus: 'PENDING_UPLOAD',
79+
templateStatus: 'NOT_YET_SUBMITTED',
8080
version: 1,
8181
createdAt: new Date().toISOString(),
8282
updatedAt: new Date().toISOString(),

‎tests/test-team/template-mgmt-component-tests/letter/template-mgmt-preview-letter-page.component.spec.ts‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,19 +44,22 @@ async function createTemplates() {
4444
'pending-letter-preview-template',
4545
user.userId,
4646
'test-pending-template-letter',
47-
'PENDING_UPLOAD'
47+
'PENDING_UPLOAD',
48+
'PENDING'
4849
),
4950
virus: TemplateFactory.createLetterTemplate(
5051
'virus-letter-preview-template',
5152
user.userId,
5253
'test-virus-template-letter',
53-
'VIRUS_SCAN_FAILED'
54+
'VIRUS_SCAN_FAILED',
55+
'FAILED'
5456
),
5557
invalid: TemplateFactory.createLetterTemplate(
5658
'invalid-letter-preview-template',
5759
user.userId,
5860
'test-invalid-template-letter',
59-
'VALIDATION_FAILED'
61+
'VALIDATION_FAILED',
62+
'PASSED'
6063
),
6164
};
6265
}

‎tests/test-team/template-mgmt-e2e-tests/template-mgmt-letter-file-validation.e2e.spec.ts‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ test.describe('letter file validation', () => {
109109
page.reload();
110110

111111
await expect(page.locator('.nhsuk-error-summary')).toBeHidden();
112-
await expect(page.getByTestId('submit-button')).toBeVisible();
112+
await expect(page.getByTestId('preview-letter-template-cta')).toBeVisible();
113113
});
114114

115115
test('PDF only - Uploaded pdf file is virus scanned - if scan passes, file is copied to the internal bucket and validated', async ({
@@ -179,7 +179,7 @@ test.describe('letter file validation', () => {
179179
page.reload();
180180

181181
await expect(page.locator('.nhsuk-error-summary')).toBeHidden();
182-
await expect(page.getByTestId('submit-button')).toBeVisible();
182+
await expect(page.getByTestId('preview-letter-template-cta')).toBeVisible();
183183
});
184184

185185
test('Uploaded pdf template files and test data csv files are virus scanned - if threat detected, files are deleted from quarantine and not copied, file and template status updated in database', async ({
@@ -256,7 +256,7 @@ test.describe('letter file validation', () => {
256256
page.reload();
257257

258258
await expect(page.locator('.nhsuk-error-summary')).toBeVisible();
259-
await expect(page.getByTestId('submit-button')).toBeHidden();
259+
await expect(page.getByTestId('preview-letter-template-cta')).toBeHidden();
260260
});
261261

262262
test('Uploaded pdf template files and test data csv files are virus scanned - if password protected, files are deleted from quarantine and not copied, file and template status updated in database', async ({
@@ -330,7 +330,7 @@ test.describe('letter file validation', () => {
330330
page.reload();
331331

332332
await expect(page.locator('.nhsuk-error-summary')).toBeVisible();
333-
await expect(page.getByTestId('submit-button')).toBeHidden();
333+
await expect(page.getByTestId('preview-letter-template-cta')).toBeHidden();
334334
});
335335

336336
test('validation fails if pdf parameters and test data parameters do not match', async ({
@@ -385,7 +385,7 @@ test.describe('letter file validation', () => {
385385
page.reload();
386386

387387
await expect(page.locator('.nhsuk-error-summary')).toBeVisible();
388-
await expect(page.getByTestId('submit-button')).toBeHidden();
388+
await expect(page.getByTestId('preview-letter-template-cta')).toBeHidden();
389389
});
390390

391391
test('validation fails if unexpected csv is uploaded', async ({ page }) => {
@@ -438,7 +438,7 @@ test.describe('letter file validation', () => {
438438
page.reload();
439439

440440
await expect(page.locator('.nhsuk-error-summary')).toBeVisible();
441-
await expect(page.getByTestId('submit-button')).toBeHidden();
441+
await expect(page.getByTestId('preview-letter-template-cta')).toBeHidden();
442442
});
443443

444444
test('validation fails if expected csv is not uploaded', async ({ page }) => {
@@ -486,7 +486,7 @@ test.describe('letter file validation', () => {
486486
page.reload();
487487

488488
await expect(page.locator('.nhsuk-error-summary')).toBeVisible();
489-
await expect(page.getByTestId('submit-button')).toBeHidden();
489+
await expect(page.getByTestId('preview-letter-template-cta')).toBeHidden();
490490
});
491491

492492
test('validation fails if pdf has incomplete address', async ({ page }) => {
@@ -534,7 +534,7 @@ test.describe('letter file validation', () => {
534534
page.reload();
535535

536536
await expect(page.locator('.nhsuk-error-summary')).toBeVisible();
537-
await expect(page.getByTestId('submit-button')).toBeHidden();
537+
await expect(page.getByTestId('preview-letter-template-cta')).toBeHidden();
538538
});
539539

540540
test('validation fails if pdf has empty parameters', async ({ page }) => {
@@ -587,7 +587,7 @@ test.describe('letter file validation', () => {
587587
page.reload();
588588

589589
await expect(page.locator('.nhsuk-error-summary')).toBeVisible();
590-
await expect(page.getByTestId('submit-button')).toBeHidden();
590+
await expect(page.getByTestId('preview-letter-template-cta')).toBeHidden();
591591
});
592592

593593
test('validation fails if pdf has non-sensible parameters', async ({
@@ -642,6 +642,6 @@ test.describe('letter file validation', () => {
642642
page.reload();
643643

644644
await expect(page.locator('.nhsuk-error-summary')).toBeVisible();
645-
await expect(page.getByTestId('submit-button')).toBeHidden();
645+
await expect(page.getByTestId('preview-letter-template-cta')).toBeHidden();
646646
});
647647
});

‎utils/utils/src/__tests__/enum.test.ts‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -105,22 +105,6 @@ describe('alphabeticalLanguageList', () => {
105105
});
106106
});
107107

108-
describe('templateStatusToColourMappings', () => {
109-
test('NOT_YET_SUBMITTED', () => {
110-
expect(templateStatusToColourMappings('NOT_YET_SUBMITTED')).toEqual(
111-
undefined
112-
);
113-
});
114-
115-
test('SUBMITTED', () => {
116-
expect(templateStatusToColourMappings('SUBMITTED')).toEqual('grey');
117-
});
118-
119-
test('VIRUS_SCAN_FAILED', () => {
120-
expect(templateStatusToColourMappings('VIRUS_SCAN_FAILED')).toEqual('red');
121-
});
122-
});
123-
124108
describe('templateStatusToDisplayMappings', () => {
125109
test('NOT_YET_SUBMITTED', () => {
126110
expect(templateStatusToDisplayMappings('NOT_YET_SUBMITTED')).toEqual(

0 commit comments

Comments
 (0)