Skip to content

Commit 6c1cc77

Browse files
committed
CCM-8422: move url into page model
1 parent faff6f7 commit 6c1cc77

27 files changed

+161
-170
lines changed

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ import { TemplateMgmtBasePage } from '../template-mgmt-base-page';
33
import { TemplateMgmtMessageFormatting } from '../template-mgmt-message-formatting';
44

55
export class TemplateMgmtCreateEmailPage extends TemplateMgmtBasePage {
6+
static readonly pageUrlRoot = 'create-email-template';
7+
68
public readonly nameInput: Locator;
79

810
public readonly subjectLineInput: Locator;
@@ -39,6 +41,8 @@ export class TemplateMgmtCreateEmailPage extends TemplateMgmtBasePage {
3941
}
4042

4143
async loadPage() {
42-
await this.navigateTo('/templates/create-email-template');
44+
const { appRootUrl, pageUrlRoot } = TemplateMgmtCreateEmailPage;
45+
46+
await this.navigateTo(`/${appRootUrl}/${pageUrlRoot}`);
4347
}
4448
}

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ import { TemplateMgmtBasePage } from '../template-mgmt-base-page';
33
import { TemplateMgmtMessageFormatting } from '../template-mgmt-message-formatting';
44

55
export class TemplateMgmtEditEmailPage extends TemplateMgmtBasePage {
6+
static readonly pageUrlRoot = 'edit-email-template';
7+
68
public readonly nameInput: Locator;
79

810
public readonly subjectLineInput: Locator;
@@ -34,6 +36,8 @@ export class TemplateMgmtEditEmailPage extends TemplateMgmtBasePage {
3436
}
3537

3638
async loadPage(templateId: string) {
37-
await this.navigateTo(`/templates/edit-email-template/${templateId}`);
39+
const { appRootUrl, pageUrlRoot } = TemplateMgmtEditEmailPage;
40+
41+
await this.navigateTo(`/${appRootUrl}/${pageUrlRoot}/${templateId}`);
3842
}
3943
}

tests/test-team/pages/email/template-mgmt-preview-email-page.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ import { Locator, Page } from '@playwright/test';
22
import { TemplateMgmtPreviewBasePage } from '../template-mgmt-preview-base-page';
33

44
export class TemplateMgmtPreviewEmailPage extends TemplateMgmtPreviewBasePage {
5+
static readonly pageUrlRoot = 'preview-email-template';
6+
57
public readonly editRadioOption: Locator;
68

79
public readonly submitRadioOption: Locator;
@@ -26,6 +28,8 @@ export class TemplateMgmtPreviewEmailPage extends TemplateMgmtPreviewBasePage {
2628
}
2729

2830
async loadPage(templateId: string) {
29-
await this.navigateTo(`/templates/preview-email-template/${templateId}`);
31+
const { appRootUrl, pageUrlRoot } = TemplateMgmtPreviewEmailPage;
32+
33+
await this.navigateTo(`/${appRootUrl}/${pageUrlRoot}/${templateId}`);
3034
}
3135
}
Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
1-
import { Page } from '@playwright/test';
21
import { TemplateMgmtSubmitBasePage } from '../template-mgmt-submit-base-page';
32

43
export class TemplateMgmtSubmitEmailPage extends TemplateMgmtSubmitBasePage {
5-
constructor(page: Page) {
6-
super(page, 'email');
4+
static readonly pageUrlRoot = 'submit-email-template';
5+
6+
async loadPage(templateId: string) {
7+
const { appRootUrl, pageUrlRoot } = TemplateMgmtSubmitEmailPage;
8+
9+
await this.navigateTo(`/${appRootUrl}/${pageUrlRoot}/${templateId}`);
710
}
811
}
Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
1-
import { Page } from '@playwright/test';
21
import { TemplateMgmtTemplateSubmittedBasePage } from '../template-mgmt-template-submitted-base-page';
32

43
export class TemplateMgmtTemplateSubmittedEmailPage extends TemplateMgmtTemplateSubmittedBasePage {
5-
constructor(page: Page) {
6-
super(page, 'email');
4+
static readonly pageUrlRoot = 'email-template-submitted';
5+
6+
async loadPage(templateId: string) {
7+
const { appRootUrl, pageUrlRoot } =
8+
TemplateMgmtTemplateSubmittedEmailPage;
9+
10+
await this.navigateTo(`/${appRootUrl}/${pageUrlRoot}/${templateId}`);
711
}
812
}

tests/test-team/pages/email/template-mgmt-view-submitted-email-page.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ import { Locator, Page } from '@playwright/test';
22
import { TemplateMgmtViewSubmitedPage } from '../template-mgmt-view-submitted-page';
33

44
export class TemplateMgmtViewSubmittedEmailPage extends TemplateMgmtViewSubmitedPage {
5+
static readonly pageUrlRoot = 'view-submitted-email-template';
6+
57
public readonly subjectLineText: Locator;
68

79
public readonly messageText: Locator;
@@ -13,8 +15,8 @@ export class TemplateMgmtViewSubmittedEmailPage extends TemplateMgmtViewSubmited
1315
}
1416

1517
async loadPage(templateId: string) {
16-
await this.navigateTo(
17-
`/templates/view-submitted-email-template/${templateId}`
18-
);
18+
const { appRootUrl, pageUrlRoot } = TemplateMgmtViewSubmittedEmailPage;
19+
20+
await this.navigateTo(`/${appRootUrl}/${pageUrlRoot}/${templateId}`);
1921
}
2022
}

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ import { TemplateMgmtBasePage } from '../template-mgmt-base-page';
33
import { TemplateMgmtMessageFormatting } from '../template-mgmt-message-formatting';
44

55
export class TemplateMgmtCreateNhsAppPage extends TemplateMgmtBasePage {
6+
static readonly pageUrlRoot = 'create-nhs-app-template';
7+
68
public readonly nameInput: Locator;
79

810
public readonly messageTextArea: Locator;
@@ -38,6 +40,8 @@ export class TemplateMgmtCreateNhsAppPage extends TemplateMgmtBasePage {
3840
}
3941

4042
async loadPage() {
41-
await this.navigateTo('/templates/create-nhs-app-template');
43+
const { appRootUrl, pageUrlRoot } = TemplateMgmtCreateNhsAppPage;
44+
45+
await this.navigateTo(`/${appRootUrl}/${pageUrlRoot}`);
4246
}
4347
}

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ import { TemplateMgmtBasePage } from '../template-mgmt-base-page';
33
import { TemplateMgmtMessageFormatting } from '../template-mgmt-message-formatting';
44

55
export class TemplateMgmtEditNhsAppPage extends TemplateMgmtBasePage {
6+
static readonly pageUrlRoot = 'edit-nhs-app-template';
7+
68
public readonly nameInput: Locator;
79

810
public readonly messageTextArea: Locator;
@@ -33,6 +35,8 @@ export class TemplateMgmtEditNhsAppPage extends TemplateMgmtBasePage {
3335
}
3436

3537
async loadPage(templateId: string) {
36-
await this.navigateTo(`/templates/edit-nhs-app-template/${templateId}`);
38+
const { appRootUrl, pageUrlRoot } = TemplateMgmtEditNhsAppPage;
39+
40+
await this.navigateTo(`/${appRootUrl}/${pageUrlRoot}/${templateId}`);
3741
}
3842
}

tests/test-team/pages/nhs-app/template-mgmt-preview-nhs-app-page.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ import { Locator, Page } from '@playwright/test';
22
import { TemplateMgmtPreviewBasePage } from '../template-mgmt-preview-base-page';
33

44
export class TemplateMgmtPreviewNhsAppPage extends TemplateMgmtPreviewBasePage {
5+
static readonly pageUrlRoot = 'preview-nhs-app-template';
6+
57
public readonly editRadioOption: Locator;
68

79
public readonly submitRadioOption: Locator;
@@ -23,6 +25,8 @@ export class TemplateMgmtPreviewNhsAppPage extends TemplateMgmtPreviewBasePage {
2325
}
2426

2527
async loadPage(sessionId: string) {
26-
await this.navigateTo(`/templates/preview-nhs-app-template/${sessionId}`);
28+
const { appRootUrl, pageUrlRoot } = TemplateMgmtPreviewNhsAppPage;
29+
30+
await this.navigateTo(`/${appRootUrl}/${pageUrlRoot}/${sessionId}`);
2731
}
2832
}
Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
1-
import { Page } from '@playwright/test';
21
import { TemplateMgmtSubmitBasePage } from '../template-mgmt-submit-base-page';
32

43
export class TemplateMgmtSubmitNhsAppPage extends TemplateMgmtSubmitBasePage {
5-
constructor(page: Page) {
6-
super(page, 'nhs-app');
4+
static readonly pageUrlRoot = 'submit-nhs-app-template';
5+
6+
async loadPage(templateId: string) {
7+
const { appRootUrl, pageUrlRoot } = TemplateMgmtSubmitNhsAppPage;
8+
9+
await this.navigateTo(`/${appRootUrl}/${pageUrlRoot}/${templateId}`);
710
}
811
}

0 commit comments

Comments
 (0)