Skip to content

Commit 507dc9f

Browse files
committed
CCM-8426: lint fixes
1 parent 181f67f commit 507dc9f

7 files changed

+26
-57
lines changed

tests/test-team/pages/sms/template-mgmt-edit-sms-page.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ export class TemplateMgmtEditSmsPage extends TemplateMgmtBasePage {
3737
}
3838

3939
async loadPage(templateId: string) {
40-
await this.navigateTo(`/templates/edit-text-message-template/${templateId}`);
40+
await this.navigateTo(
41+
`/templates/edit-text-message-template/${templateId}`
42+
);
4143
}
4244
}

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

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,7 @@ test.describe('Create Email message template Page', () => {
3434

3535
await createEmailTemplatePage.loadPage();
3636

37-
await expect(page).toHaveURL(
38-
`${baseURL}/templates/create-email-template`
39-
);
37+
await expect(page).toHaveURL(`${baseURL}/templates/create-email-template`);
4038

4139
expect(await createEmailTemplatePage.pageHeader.textContent()).toBe(
4240
'Create email template'
@@ -158,11 +156,9 @@ test.describe('Create Email message template Page', () => {
158156

159157
await createEmailTemplatePage.clickSubmitButton();
160158

161-
const previewPageRegex = "\\/templates\\/preview-email-template\\/([0-9a-fA-F-]+)(?:\\?from=edit)?$";
159+
const previewPageRegex = String.raw`\/templates\/preview-email-template\/([0-9a-fA-F-]+)(?:\?from=edit)?$`;
162160

163-
await expect(page).toHaveURL(
164-
RegExp(previewPageRegex)
165-
);
161+
await expect(page).toHaveURL(new RegExp(previewPageRegex));
166162

167163
const previewPageParts = page.url().match(previewPageRegex);
168164

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

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -117,9 +117,9 @@ test.describe('Edit Email message template Page', () => {
117117

118118
await editEmailTemplatePage.personalisationFields.click();
119119

120-
await expect(
121-
editEmailTemplatePage.personalisationFields
122-
).toHaveAttribute('open');
120+
await expect(editEmailTemplatePage.personalisationFields).toHaveAttribute(
121+
'open'
122+
);
123123
});
124124

125125
test('when user clicks "Message formatting" tool tips, then tool tips are displayed', async ({
@@ -157,15 +157,10 @@ test.describe('Edit Email message template Page', () => {
157157
baseURL,
158158
}) => {
159159
const editTemplatePage = new TemplateMgmtEditEmailPage(page);
160-
161-
await editTemplatePage.loadPage(templates.empty.id);
162-
160+
await editTemplatePage.loadPage('empty-email-template');
163161
const newTabPromise = page.waitForEvent('popup');
164-
165162
await page.getByRole('link', { name }).click();
166-
167163
const newTab = await newTabPromise;
168-
169164
await expect(newTab).toHaveURL(`${baseURL}/${url}`);
170165
});
171166
}
@@ -247,9 +242,9 @@ test.describe('Edit Email message template Page', () => {
247242

248243
await expect(editEmailTemplatePage.errorSummary).toBeVisible();
249244

250-
await expect(
251-
editEmailTemplatePage.errorSummary.locator('h2')
252-
).toHaveText('There is a problem');
245+
await expect(editEmailTemplatePage.errorSummary.locator('h2')).toHaveText(
246+
'There is a problem'
247+
);
253248

254249
await expect(
255250
editEmailTemplatePage.errorSummary.locator(
@@ -342,10 +337,9 @@ test.describe('Edit Email message template Page', () => {
342337

343338
await editEmailTemplatePage.clickSubmitButton();
344339

345-
const emailMessageErrorLink =
346-
editEmailTemplatePage.errorSummary.locator(
347-
'[href="#emailTemplateMessage"]'
348-
);
340+
const emailMessageErrorLink = editEmailTemplatePage.errorSummary.locator(
341+
'[href="#emailTemplateMessage"]'
342+
);
349343

350344
await expect(emailMessageErrorLink).toHaveText(errorMessage);
351345

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,9 @@ test.describe('Create NHS App Template Page', () => {
7474
.fill('This is an NHS App message');
7575
await createTemplatePage.clickSubmitButton();
7676

77-
const previewPageRegex = "\\/templates\\/preview-nhs-app-template\\/([0-9a-fA-F-]+)(?:\\?from=edit)?$";
77+
const previewPageRegex = String.raw`\/templates\/preview-nhs-app-template\/([0-9a-fA-F-]+)(?:\?from=edit)?$`;
7878

79-
await expect(page).toHaveURL(
80-
RegExp(previewPageRegex)
81-
);
79+
await expect(page).toHaveURL(new RegExp(previewPageRegex));
8280

8381
const previewPageParts = page.url().match(previewPageRegex);
8482
expect(previewPageParts?.length).toEqual(2);

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -262,15 +262,10 @@ test.describe('Edit NHS App Template Page', () => {
262262
baseURL,
263263
}) => {
264264
const editTemplatePage = new TemplateMgmtEditNhsAppPage(page);
265-
266-
await editTemplatePage.loadPage(templates.emptyTemplateData.id);
267-
265+
await editTemplatePage.loadPage('empty-nhs-app-template');
268266
const newTabPromise = page.waitForEvent('popup');
269-
270267
await page.getByRole('link', { name }).click();
271-
272268
const newTab = await newTabPromise;
273-
274269
await expect(newTab).toHaveURL(`${baseURL}/${url}`);
275270
});
276271
}

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

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import {
88
assertNotifyBannerLink,
99
assertSkipToMainContent,
1010
} from '../template-mgmt-common.steps';
11-
import { Template, TemplateType } from '../../helpers/types';
1211
import {
1312
createAuthHelper,
1413
TestUser,
@@ -27,9 +26,7 @@ test.describe('Create SMS message template Page', () => {
2726
await templateStorageHelper.deleteAdHocTemplates();
2827
});
2928

30-
test('when user visits page, then page is loaded', async ({
31-
page,
32-
}) => {
29+
test('when user visits page, then page is loaded', async ({ page }) => {
3330
const createSmsTemplatePage = new TemplateMgmtCreateSmsPage(page);
3431

3532
await createSmsTemplatePage.loadPage();
@@ -174,11 +171,9 @@ test.describe('Create SMS message template Page', () => {
174171

175172
await createSmsTemplatePage.clickSubmitButton();
176173

177-
const previewPageRegex = "\\/templates\\/preview-text-message-template\\/([0-9a-fA-F-]+)(?:\\?from=edit)?$";
174+
const previewPageRegex = String.raw`\/templates\/preview-text-message-template\/([0-9a-fA-F-]+)(?:\?from=edit)?$`;
178175

179-
await expect(page).toHaveURL(
180-
RegExp(previewPageRegex)
181-
);
176+
await expect(page).toHaveURL(new RegExp(previewPageRegex));
182177

183178
const previewPageParts = page.url().match(previewPageRegex);
184179
expect(previewPageParts?.length).toEqual(2);

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

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -189,15 +189,10 @@ test.describe('Edit SMS message template Page', () => {
189189
baseURL,
190190
}) => {
191191
const editTemplatePage = new TemplateMgmtEditSmsPage(page);
192-
193-
await editTemplatePage.loadPage(templates.empty.id);
194-
192+
await editTemplatePage.loadPage('empty-sms-template');
195193
const newTabPromise = page.waitForEvent('popup');
196-
197194
await page.getByRole('link', { name }).click();
198-
199195
const newTab = await newTabPromise;
200-
201196
await expect(newTab).toHaveURL(`${baseURL}/${url}`);
202197
});
203198
}
@@ -210,13 +205,9 @@ test.describe('Edit SMS message template Page', () => {
210205

211206
await editSmsTemplatePage.loadPage(templates.submit.id);
212207

213-
await editSmsTemplatePage.nameInput.fill(
214-
'This is an SMS template name'
215-
);
208+
await editSmsTemplatePage.nameInput.fill('This is an SMS template name');
216209

217-
await editSmsTemplatePage.messageTextArea.fill(
218-
'This is an SMS message'
219-
);
210+
await editSmsTemplatePage.messageTextArea.fill('This is an SMS message');
220211

221212
await editSmsTemplatePage.clickSubmitButton();
222213

@@ -269,9 +260,7 @@ test.describe('Edit SMS message template Page', () => {
269260
).toBeVisible();
270261

271262
await expect(
272-
editSmsTemplatePage.errorSummary.locator(
273-
`[href="#smsTemplateMessage"]`
274-
)
263+
editSmsTemplatePage.errorSummary.locator(`[href="#smsTemplateMessage"]`)
275264
).toBeVisible();
276265
});
277266

0 commit comments

Comments
 (0)