Skip to content

Commit ab2791b

Browse files
Merge pull request #157 from NHSDigital/feature/sms-tests
CCM-7099: Add SMS component tests
2 parents 8fe1837 + a06539a commit ab2791b

File tree

22 files changed

+987
-351
lines changed

22 files changed

+987
-351
lines changed

src/__tests__/app/email-template-submitted/__snapshots__/page.test.tsx.snap

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ exports[`EmailTemplateSubmitted 1`] = `
6464
<p>
6565
<a
6666
href="https://nhsdigitallive.service-now.com/nhs_digital?id=sc_cat_item&sys_id=6208dbce1be759102eee65b9bd4bcbf5"
67+
id="servicenow-link"
6768
>
6869
Raise a request with the service desk
6970
</a>

src/__tests__/app/nhs-app-template-submitted/__snapshots__/page.test.tsx.snap

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ exports[`NhsAppTemplateSubmittedPage 1`] = `
6464
<p>
6565
<a
6666
href="https://nhsdigitallive.service-now.com/nhs_digital?id=sc_cat_item&sys_id=6208dbce1be759102eee65b9bd4bcbf5"
67+
id="servicenow-link"
6768
>
6869
Raise a request with the service desk
6970
</a>

src/__tests__/app/text-message-template-submitted/__snapshots__/page.test.tsx.snap

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ exports[`SmsTemplateSubmitted 1`] = `
6464
<p>
6565
<a
6666
href="https://nhsdigitallive.service-now.com/nhs_digital?id=sc_cat_item&sys_id=6208dbce1be759102eee65b9bd4bcbf5"
67+
id="servicenow-link"
6768
>
6869
Raise a request with the service desk
6970
</a>

src/__tests__/components/forms/CreateSmsTemplate/__snapshots__/CreateSmsTemplate.test.tsx.snap

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,7 @@ exports[`CreateSmsTemplate component renders page 1`] = `
155155
>
156156
<p
157157
class="nhsuk-u-margin-bottom-0"
158+
id="character-count"
158159
>
159160
0 characters
160161
</p>
@@ -508,6 +509,7 @@ exports[`CreateSmsTemplate component renders page one error 1`] = `
508509
>
509510
<p
510511
class="nhsuk-u-margin-bottom-0"
512+
id="character-count"
511513
>
512514
0 characters
513515
</p>
@@ -875,6 +877,7 @@ exports[`CreateSmsTemplate component renders page with multiple errors 1`] = `
875877
>
876878
<p
877879
class="nhsuk-u-margin-bottom-0"
880+
id="character-count"
878881
>
879882
0 characters
880883
</p>
@@ -1186,6 +1189,7 @@ exports[`CreateSmsTemplate component renders page with preloaded field values 1`
11861189
>
11871190
<p
11881191
class="nhsuk-u-margin-bottom-0"
1192+
id="character-count"
11891193
>
11901194
16 characters
11911195
</p>

src/app/preview-text-message-template/[sessionId]/page.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import { ReviewSMSTemplate } from '@forms/ReviewSMSTemplate';
77

88
const isValid = (session?: Session) =>
99
session?.templateType === TemplateType.SMS &&
10-
session?.smsTemplateMessage !== undefined &&
11-
session?.smsTemplateName !== undefined;
10+
Boolean(session?.smsTemplateName) &&
11+
Boolean(session?.smsTemplateMessage);
1212

1313
const PreviewSMSTemplatePage = async ({ params: { sessionId } }: PageProps) => {
1414
const session = await getSession(sessionId);

src/app/submit-text-message-template/[sessionId]/page.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import { getSession } from '@utils/form-actions';
77

88
const isValid = (session?: Session) =>
99
session?.templateType === TemplateType.SMS &&
10-
session?.smsTemplateMessage !== undefined &&
11-
session?.smsTemplateName !== undefined;
10+
Boolean(session?.smsTemplateName) &&
11+
Boolean(session?.smsTemplateMessage);
1212

1313
const SubmitSmsTemplatePage = async ({ params: { sessionId } }: PageProps) => {
1414
const session = await getSession(sessionId);

src/components/forms/CreateSmsTemplate/CreateSmsTemplate.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ export const CreateSmsTemplate: FC<PageComponentProps> = ({ initialState }) => {
7777
errorProps={{ id: 'smsTemplateMessage-error-message' }}
7878
/>
7979
<div style={useJsEnabledStyle()} id='smsMessageCharacterCount'>
80-
<p className='nhsuk-u-margin-bottom-0'>
80+
<p className='nhsuk-u-margin-bottom-0' id='character-count'>
8181
{smsTemplateMessage.length} characters
8282
</p>
8383
<p>

src/components/molecules/TemplateSubmitted/TemplateSubmitted.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,10 @@ export const TemplateSubmitted = ({
5252
<p>{notLiveText}</p>
5353
<h3>{liveHeading}</h3>
5454
<p>
55-
<Link href='https://nhsdigitallive.service-now.com/nhs_digital?id=sc_cat_item&sys_id=6208dbce1be759102eee65b9bd4bcbf5'>
55+
<Link
56+
id='servicenow-link'
57+
href='https://nhsdigitallive.service-now.com/nhs_digital?id=sc_cat_item&sys_id=6208dbce1be759102eee65b9bd4bcbf5'
58+
>
5659
{liveLinkText}
5760
</Link>{' '}
5861
{liveText}

tests/test-team/helpers/session-factory.ts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,13 @@ export const SessionFactory = {
88
});
99
},
1010

11+
createSmsSession: (id: string): Session => {
12+
return SessionFactory.create({
13+
id,
14+
templateType: TemplateType.SMS,
15+
});
16+
},
17+
1118
create: ({
1219
id,
1320
templateType,

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

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,11 @@
1-
import { Template, TemplateType } from './types';
1+
import { Template } from './types';
22

33
type BaseTemplateFields = Omit<
44
Template,
55
'version' | '__typename' | 'createdAt' | 'updatedAt'
66
>;
77

88
export const TemplateFactory = {
9-
createEmailTemplate: (props: Omit<BaseTemplateFields, 'type'>): Template => {
10-
return TemplateFactory.create({
11-
...props,
12-
type: TemplateType.EMAIL,
13-
});
14-
},
15-
169
create: (props: BaseTemplateFields): Template => {
1710
return {
1811
...props,

0 commit comments

Comments
 (0)