Skip to content

Commit e17a6f0

Browse files
committed
CCM-11492 Update test function
1 parent cfa1881 commit e17a6f0

File tree

2 files changed

+9
-10
lines changed

2 files changed

+9
-10
lines changed

tests/test-team/pages/template-mgmt-base-page-dynamic.ts

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,14 @@ export abstract class TemplateMgmtBasePageDynamic extends TemplateMgmtBasePage {
1919
await this.navigateTo(`/${appUrlSegment}/${pageUrlSegment}/${idParameter}`);
2020
}
2121

22-
static getIdFromUrl(
23-
fullUrl: string,
24-
pageSegment: string
25-
): string | undefined {
26-
// eslint-disable-next-line security/detect-non-literal-regexp
27-
const match = fullUrl.match(new RegExp(`${pageSegment}/([^#/?]+)`));
22+
getIdFromUrl(): string | undefined {
23+
const { pageUrlSegment } = this
24+
.constructor as typeof TemplateMgmtBasePageDynamic;
25+
26+
const match = this.page
27+
.url()
28+
// eslint-disable-next-line security/detect-non-literal-regexp
29+
.match(new RegExp(`${pageUrlSegment}/([^#/?]+)`));
2830
const id = match ? match[1] : undefined;
2931
return id;
3032
}

tests/test-team/template-mgmt-routing-component-tests/choose-templates.routing-component.spec.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -266,10 +266,7 @@ test.describe('Routing - Choose Templates page', () => {
266266
/\/templates\/message-plans\/choose-templates\//
267267
);
268268

269-
const routingConfigId = TemplateMgmtBasePageDynamic.getIdFromUrl(
270-
page.url(),
271-
'choose-templates'
272-
);
269+
const routingConfigId = chooseTemplatesPage.getIdFromUrl();
273270

274271
await test.step('app channel with no template has only choose link', async () => {
275272
await expect(chooseTemplatesPage.nhsApp.templateName).toBeHidden();

0 commit comments

Comments
 (0)