Skip to content

Commit cbdde7d

Browse files
bhansell1bhansell1
committed
CCM-11459: PR comments
1 parent 410ce79 commit cbdde7d

File tree

6 files changed

+84
-78
lines changed

6 files changed

+84
-78
lines changed

‎frontend/src/components/organisms/PreviewDigitalTemplate/PreviewDigitalTemplate.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ export function PreviewDigitalTemplate({
3636

3737
const { editButton } = content.components.previewDigitalTemplateEditOnly;
3838

39-
export function PreviewDigitalTemplateEditOnly({
40-
...props
41-
}: PreviewTemplateRoutingProps) {
39+
export function PreviewDigitalTemplateEditOnly(
40+
props: PreviewTemplateRoutingProps
41+
) {
4242
return (
4343
<>
4444
{props.sectionHeading && (

‎tests/test-team/helpers/auth/cognito-auth-helper.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,11 +111,11 @@ export const testUsers: Record<string, TestUserStaticDetails> = {
111111
clientKey: 'Client6',
112112
},
113113
/**
114-
* User9 has a routing enabled
114+
* RoutingEnabledUser has a routing enabled
115115
*/
116-
User9: {
117-
userId: 'User9',
118-
clientKey: 'Client7',
116+
RoutingEnabledUser: {
117+
userId: 'RoutingEnabledUser',
118+
clientKey: 'ClientWithRoutingEnabled',
119119
},
120120
};
121121

‎tests/test-team/helpers/client/client-helper.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ export type ClientConfiguration = {
1414
name?: string;
1515
};
1616

17-
export type ClientKey = `Client${1 | 2 | 3 | 4 | 5 | 6 | 7}`;
17+
export type ClientKey = `Client${1 | 2 | 3 | 4 | 5 | 6 | 'WithRoutingEnabled'}`;
1818

1919
type TestClients = Record<ClientKey, ClientConfiguration | undefined>;
2020

@@ -79,7 +79,7 @@ export const testClients = {
7979
routing: false,
8080
},
8181
},
82-
Client7: {
82+
ClientWithRoutingEnabled: {
8383
campaignId: 'Campaign7',
8484
name: 'NHS Test Client 7',
8585
features: {

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

Lines changed: 25 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { randomUUID } from 'node:crypto';
12
import { test, expect } from '@playwright/test';
23
import { TemplateStorageHelper } from '../../helpers/db/template-storage-helper';
34
import { TemplateMgmtPreviewEmailPage } from '../../pages/email/template-mgmt-preview-email-page';
@@ -25,7 +26,9 @@ let routingEnabledUser: TestUser;
2526
async function createTemplates() {
2627
const authHelper = createAuthHelper();
2728
const user = await authHelper.getTestUser(testUsers.User1.userId);
28-
routingEnabledUser = await authHelper.getTestUser(testUsers.User9.userId);
29+
routingEnabledUser = await authHelper.getTestUser(
30+
testUsers.RoutingEnabledUser.userId
31+
);
2932

3033
return {
3134
empty: {
@@ -47,10 +50,7 @@ async function createTemplates() {
4750
message: 'test-template-message',
4851
} as Template,
4952
routingEnabled: {
50-
...TemplateFactory.createEmailTemplate(
51-
'valid-email-preview-template',
52-
routingEnabledUser
53-
),
53+
...TemplateFactory.createEmailTemplate(randomUUID(), routingEnabledUser),
5454
name: 'test-template-email',
5555
subject: 'test-template-subject-line',
5656
message: 'test-template-message',
@@ -93,31 +93,33 @@ test.describe('Preview Email message template Page', () => {
9393
await expect(previewPage.messageText).toHaveText('test-template-message');
9494
});
9595

96-
test('when user visits page, then page is loaded, with routing Enabled', async ({
97-
baseURL,
98-
browser,
99-
}) => {
100-
const newBrowser = await browser.newContext({ storageState: undefined });
101-
const newPage = await newBrowser.newPage();
102-
await loginAsUser(routingEnabledUser, newPage);
96+
test.describe('Routing feature flag enabled', () => {
97+
test.use({ storageState: { cookies: [], origins: [] } });
10398

104-
const previewEmailTemplatePage = new TemplateMgmtPreviewEmailPage(newPage);
99+
test('when user visits page, then page is loaded', async ({
100+
page,
101+
baseURL,
102+
}) => {
103+
await loginAsUser(routingEnabledUser, page);
105104

106-
await previewEmailTemplatePage.loadPage(templates.routingEnabled.id);
105+
const previewEmailTemplatePage = new TemplateMgmtPreviewEmailPage(page);
107106

108-
await expect(newPage).toHaveURL(
109-
`${baseURL}/templates/preview-email-template/${templates.routingEnabled.id}`
110-
);
107+
await previewEmailTemplatePage.loadPage(templates.routingEnabled.id);
111108

112-
await expect(previewEmailTemplatePage.continueButton).toBeHidden();
109+
await expect(page).toHaveURL(
110+
`${baseURL}/templates/preview-email-template/${templates.routingEnabled.id}`
111+
);
113112

114-
await expect(previewEmailTemplatePage.editButton).toBeVisible();
113+
await expect(previewEmailTemplatePage.continueButton).toBeHidden();
115114

116-
await previewEmailTemplatePage.editButton.click();
115+
await expect(previewEmailTemplatePage.editButton).toBeVisible();
117116

118-
await expect(newPage).toHaveURL(
119-
`${baseURL}/templates/edit-email-template/${templates.routingEnabled.id}`
120-
);
117+
await previewEmailTemplatePage.editButton.click();
118+
119+
await expect(page).toHaveURL(
120+
`${baseURL}/templates/edit-email-template/${templates.routingEnabled.id}`
121+
);
122+
});
121123
});
122124

123125
test.describe('Page functionality', () => {

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

Lines changed: 25 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { randomUUID } from 'node:crypto';
12
import { test, expect } from '@playwright/test';
23
import { TemplateStorageHelper } from '../../helpers/db/template-storage-helper';
34
import { TemplateMgmtPreviewNhsAppPage } from '../../pages/nhs-app/template-mgmt-preview-nhs-app-page';
@@ -25,7 +26,9 @@ let routingEnabledUser: TestUser;
2526
async function createTemplates() {
2627
const authHelper = createAuthHelper();
2728
const user = await authHelper.getTestUser(testUsers.User1.userId);
28-
routingEnabledUser = await authHelper.getTestUser(testUsers.User9.userId);
29+
routingEnabledUser = await authHelper.getTestUser(
30+
testUsers.RoutingEnabledUser.userId
31+
);
2932

3033
return {
3134
empty: {
@@ -46,10 +49,7 @@ async function createTemplates() {
4649
message: 'test-template-message',
4750
},
4851
routingEnabled: {
49-
...TemplateFactory.createNhsAppTemplate(
50-
'valid-nhs-app-preview-template',
51-
routingEnabledUser
52-
),
52+
...TemplateFactory.createNhsAppTemplate(randomUUID(), routingEnabledUser),
5353
name: 'test-template-nhs-app',
5454
message: 'test-template-message',
5555
},
@@ -99,31 +99,33 @@ test.describe('Preview NHS App template Page', () => {
9999
);
100100
});
101101

102-
test('when user visits page, then page is loaded, with routing Enabled', async ({
103-
baseURL,
104-
browser,
105-
}) => {
106-
const newBrowser = await browser.newContext({ storageState: undefined });
107-
const newPage = await newBrowser.newPage();
108-
await loginAsUser(routingEnabledUser, newPage);
102+
test.describe('Routing feature flag enabled', () => {
103+
test.use({ storageState: { cookies: [], origins: [] } });
104+
105+
test('when user visits page, then page is loaded, with routing Enabled', async ({
106+
baseURL,
107+
page,
108+
}) => {
109+
await loginAsUser(routingEnabledUser, page);
109110

110-
const previewPage = new TemplateMgmtPreviewNhsAppPage(newPage);
111+
const previewPage = new TemplateMgmtPreviewNhsAppPage(page);
111112

112-
await previewPage.loadPage(templates.routingEnabled.id);
113+
await previewPage.loadPage(templates.routingEnabled.id);
113114

114-
await expect(newPage).toHaveURL(
115-
`${baseURL}/templates/preview-nhs-app-template/${templates.routingEnabled.id}`
116-
);
115+
await expect(page).toHaveURL(
116+
`${baseURL}/templates/preview-nhs-app-template/${templates.routingEnabled.id}`
117+
);
117118

118-
await expect(previewPage.continueButton).toBeHidden();
119+
await expect(previewPage.continueButton).toBeHidden();
119120

120-
await expect(previewPage.editButton).toBeVisible();
121+
await expect(previewPage.editButton).toBeVisible();
121122

122-
await previewPage.editButton.click();
123+
await previewPage.editButton.click();
123124

124-
await expect(newPage).toHaveURL(
125-
`${baseURL}/templates/edit-nhs-app-template/${templates.routingEnabled.id}`
126-
);
125+
await expect(page).toHaveURL(
126+
`${baseURL}/templates/edit-nhs-app-template/${templates.routingEnabled.id}`
127+
);
128+
});
127129
});
128130

129131
test.describe('Page functionality', () => {

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

Lines changed: 25 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { randomUUID } from 'node:crypto';
12
import { test, expect } from '@playwright/test';
23
import { TemplateStorageHelper } from '../../helpers/db/template-storage-helper';
34
import { TemplateMgmtPreviewSmsPage } from '../../pages/sms/template-mgmt-preview-sms-page';
@@ -25,7 +26,9 @@ let routingEnabledUser: TestUser;
2526
async function createTemplates() {
2627
const authHelper = createAuthHelper();
2728
const user = await authHelper.getTestUser(testUsers.User1.userId);
28-
routingEnabledUser = await authHelper.getTestUser(testUsers.User9.userId);
29+
routingEnabledUser = await authHelper.getTestUser(
30+
testUsers.RoutingEnabledUser.userId
31+
);
2932

3033
return {
3134
empty: {
@@ -43,10 +46,7 @@ async function createTemplates() {
4346
message: 'test-template-message',
4447
},
4548
routingEnabled: {
46-
...TemplateFactory.createSmsTemplate(
47-
'valid-sms-preview-template',
48-
routingEnabledUser
49-
),
49+
...TemplateFactory.createSmsTemplate(randomUUID(), routingEnabledUser),
5050
name: 'test-template-sms',
5151
message: 'test-template-message',
5252
},
@@ -91,31 +91,33 @@ test.describe('Preview SMS message template Page', () => {
9191
);
9292
});
9393

94-
test('when user visits page, then page is loaded, with routing Enabled', async ({
95-
baseURL,
96-
browser,
97-
}) => {
98-
const newBrowser = await browser.newContext({ storageState: undefined });
99-
const newPage = await newBrowser.newPage();
100-
await loginAsUser(routingEnabledUser, newPage);
94+
test.describe('Routing feature flag enabled', () => {
95+
test.use({ storageState: { cookies: [], origins: [] } });
10196

102-
const previewPage = new TemplateMgmtPreviewSmsPage(newPage);
97+
test('when user visits page, then page is loaded, with routing Enabled', async ({
98+
baseURL,
99+
page,
100+
}) => {
101+
await loginAsUser(routingEnabledUser, page);
103102

104-
await previewPage.loadPage(templates.routingEnabled.id);
103+
const previewPage = new TemplateMgmtPreviewSmsPage(page);
105104

106-
await expect(newPage).toHaveURL(
107-
`${baseURL}/templates/preview-text-message-template/${templates.routingEnabled.id}`
108-
);
105+
await previewPage.loadPage(templates.routingEnabled.id);
109106

110-
await expect(previewPage.continueButton).toBeHidden();
107+
await expect(page).toHaveURL(
108+
`${baseURL}/templates/preview-text-message-template/${templates.routingEnabled.id}`
109+
);
111110

112-
await expect(previewPage.editButton).toBeVisible();
111+
await expect(previewPage.continueButton).toBeHidden();
113112

114-
await previewPage.editButton.click();
113+
await expect(previewPage.editButton).toBeVisible();
115114

116-
await expect(newPage).toHaveURL(
117-
`${baseURL}/templates/edit-text-message-template/${templates.routingEnabled.id}`
118-
);
115+
await previewPage.editButton.click();
116+
117+
await expect(page).toHaveURL(
118+
`${baseURL}/templates/edit-text-message-template/${templates.routingEnabled.id}`
119+
);
120+
});
119121
});
120122

121123
test.describe('Page functionality', () => {

0 commit comments

Comments
 (0)