Skip to content

Commit a584e7f

Browse files
alexnuttallalexnuttall
authored
Merge pull request #318 from NHSDigital/feature/CCM-8601-view-letter-rename-review
CCM-8601: rename Review to Preview
2 parents a9e7d2f + 7c99634 commit a584e7f

File tree

73 files changed

+496
-473
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+496
-473
lines changed

‎frontend/src/__tests__/app/preview-email-template/page.test.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* @jest-environment node
33
*/
44
import PreviewEmailTemplatePage from '@app/preview-email-template/[templateId]/page';
5-
import { ReviewEmailTemplate } from '@forms/ReviewEmailTemplate';
5+
import { PreviewEmailTemplate } from '@forms/PreviewEmailTemplate';
66
import {
77
EmailTemplate,
88
TemplateType,
@@ -14,7 +14,7 @@ import { Language, LetterType, TemplateDTO } from 'nhs-notify-backend-client';
1414

1515
jest.mock('@utils/form-actions');
1616
jest.mock('next/navigation');
17-
jest.mock('@forms/ReviewEmailTemplate');
17+
jest.mock('@forms/PreviewEmailTemplate');
1818

1919
const redirectMock = jest.mocked(redirect);
2020
const getTemplateMock = jest.mocked(getTemplate);
@@ -49,7 +49,7 @@ describe('PreviewEmailTemplatePage', () => {
4949
}),
5050
});
5151

52-
expect(page).toEqual(<ReviewEmailTemplate initialState={emailTemplate} />);
52+
expect(page).toEqual(<PreviewEmailTemplate initialState={emailTemplate} />);
5353
});
5454

5555
it('should redirect to invalid-template when no templateId is found', async () => {

‎frontend/src/__tests__/app/preview-letter-template/page.test.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* @jest-environment node
33
*/
44
import PreviewLetterTemplatePage from '@app/preview-letter-template/[templateId]/page';
5-
import { ReviewLetterTemplate } from '@forms/ReviewLetterTemplate/ReviewLetterTemplate';
5+
import { PreviewLetterTemplate } from '@forms/PreviewLetterTemplate/PreviewLetterTemplate';
66
import {
77
type LetterTemplate,
88
TemplateType,
@@ -19,7 +19,7 @@ import {
1919

2020
jest.mock('@utils/form-actions');
2121
jest.mock('next/navigation');
22-
jest.mock('@forms/ReviewLetterTemplate/ReviewLetterTemplate');
22+
jest.mock('@forms/PreviewLetterTemplate/PreviewLetterTemplate');
2323

2424
const redirectMock = jest.mocked(redirect);
2525
const getTemplateMock = jest.mocked(getTemplate);
@@ -68,7 +68,7 @@ describe('PreviewLetterTemplatePage', () => {
6868
});
6969

7070
expect(page).toEqual(
71-
<ReviewLetterTemplate initialState={letterTemplate} />
71+
<PreviewLetterTemplate initialState={letterTemplate} />
7272
);
7373
});
7474

‎frontend/src/__tests__/app/preview-nhs-app-template/page.test.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* @jest-environment node
33
*/
44
import PreviewNhsAppTemplatePage from '@app/preview-nhs-app-template/[templateId]/page';
5-
import { ReviewNHSAppTemplate } from '@forms/ReviewNHSAppTemplate/ReviewNHSAppTemplate';
5+
import { PreviewNHSAppTemplate } from '@forms/PreviewNHSAppTemplate/PreviewNHSAppTemplate';
66
import {
77
NHSAppTemplate,
88
TemplateType,
@@ -14,7 +14,7 @@ import { Language, LetterType, TemplateDTO } from 'nhs-notify-backend-client';
1414

1515
jest.mock('@utils/form-actions');
1616
jest.mock('next/navigation');
17-
jest.mock('@forms/ReviewNHSAppTemplate/ReviewNHSAppTemplate');
17+
jest.mock('@forms/PreviewNHSAppTemplate/PreviewNHSAppTemplate');
1818

1919
const redirectMock = jest.mocked(redirect);
2020
const getTemplateMock = jest.mocked(getTemplate);
@@ -48,7 +48,7 @@ describe('PreviewNhsAppTemplatePage', () => {
4848
});
4949

5050
expect(page).toEqual(
51-
<ReviewNHSAppTemplate initialState={nhsAppTemplate} />
51+
<PreviewNHSAppTemplate initialState={nhsAppTemplate} />
5252
);
5353
});
5454

‎frontend/src/__tests__/app/preview-text-message-template/page.test.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* @jest-environment node
33
*/
44
import PreviewSMSTemplatePage from '@app/preview-text-message-template/[templateId]/page';
5-
import { ReviewSMSTemplate } from '@forms/ReviewSMSTemplate';
5+
import { PreviewSMSTemplate } from '@forms/PreviewSMSTemplate';
66
import {
77
SMSTemplate,
88
TemplateType,
@@ -14,7 +14,7 @@ import { Language, LetterType, TemplateDTO } from 'nhs-notify-backend-client';
1414

1515
jest.mock('@utils/form-actions');
1616
jest.mock('next/navigation');
17-
jest.mock('@forms/ReviewSMSTemplate');
17+
jest.mock('@forms/PreviewSMSTemplate');
1818

1919
const redirectMock = jest.mocked(redirect);
2020
const getTemplateMock = jest.mocked(getTemplate);
@@ -47,7 +47,7 @@ describe('PreviewSMSTemplatePage', () => {
4747
}),
4848
});
4949

50-
expect(page).toEqual(<ReviewSMSTemplate initialState={smsTemplate} />);
50+
expect(page).toEqual(<PreviewSMSTemplate initialState={smsTemplate} />);
5151
});
5252

5353
it('should redirect to invalid-template when no template is found', async () => {

frontend/src/__tests__/components/forms/ReviewEmailTemplate/ReviewEmailTemplate.test.tsx renamed to frontend/src/__tests__/components/forms/PreviewEmailTemplate/PreviewEmailTemplate.test.tsx

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
'use client';
22

33
import { render, screen } from '@testing-library/react';
4-
import { ReviewEmailTemplate } from '@forms/ReviewEmailTemplate';
4+
import { PreviewEmailTemplate } from '@forms/PreviewEmailTemplate';
55
import {
66
EmailTemplate,
77
TemplateFormState,
@@ -10,7 +10,7 @@ import { renderEmailMarkdown } from '@utils/markdownit';
1010
import { mockDeep } from 'jest-mock-extended';
1111
import { useSearchParams } from 'next/navigation';
1212

13-
jest.mock('@forms/ReviewEmailTemplate/server-actions');
13+
jest.mock('@forms/PreviewEmailTemplate/server-actions');
1414
jest.mock('@utils/markdownit');
1515

1616
jest.mock('react', () => {
@@ -34,10 +34,10 @@ jest.mock('next/navigation', () => ({
3434
})),
3535
}));
3636

37-
describe('Review email form renders', () => {
37+
describe('Preview email form renders', () => {
3838
it('matches snapshot when navigating from manage templates screen', () => {
3939
const container = render(
40-
<ReviewEmailTemplate
40+
<PreviewEmailTemplate
4141
initialState={mockDeep<TemplateFormState<EmailTemplate>>({
4242
validationError: undefined,
4343
name: 'test-template-email',
@@ -58,7 +58,7 @@ describe('Review email form renders', () => {
5858
}));
5959

6060
const container = render(
61-
<ReviewEmailTemplate
61+
<PreviewEmailTemplate
6262
initialState={mockDeep<TemplateFormState<EmailTemplate>>({
6363
validationError: undefined,
6464
name: 'test-template-email',
@@ -74,12 +74,12 @@ describe('Review email form renders', () => {
7474

7575
it('matches error snapshot', () => {
7676
const container = render(
77-
<ReviewEmailTemplate
77+
<PreviewEmailTemplate
7878
initialState={mockDeep<TemplateFormState<EmailTemplate>>({
7979
validationError: {
8080
formErrors: [],
8181
fieldErrors: {
82-
reviewEmailTemplateAction: ['Select an option'],
82+
previewEmailTemplateAction: ['Select an option'],
8383
},
8484
},
8585
name: 'test-template-email',
@@ -95,7 +95,7 @@ describe('Review email form renders', () => {
9595

9696
it('renders component correctly', () => {
9797
render(
98-
<ReviewEmailTemplate
98+
<PreviewEmailTemplate
9999
initialState={mockDeep<TemplateFormState<EmailTemplate>>({
100100
validationError: undefined,
101101
name: 'test-template-email',
@@ -125,7 +125,7 @@ describe('Review email form renders', () => {
125125
const message = 'email message body';
126126

127127
render(
128-
<ReviewEmailTemplate
128+
<PreviewEmailTemplate
129129
initialState={mockDeep<TemplateFormState<EmailTemplate>>({
130130
validationError: undefined,
131131
name: 'test-template-email',

0 commit comments

Comments
 (0)