Skip to content

Commit 706ade0

Browse files
prabhamuthu15prabhamuthu15
authored
UI Test Update For EXUI change (#6140)
* fixthevariablenamemismatch * DFPL-2835-Fix flaky tests in firefox * ToRunUITestPointToPreviewForSRT * RerunFailedTestsINPreviousBuild * Remove @CCDTest tag to enable all test * remove only tag * ChangeURLPathAndLinkType * UpdateUITestForLinkElementType * EnableAllNightlyTest * Update playwright.config.ts * uncommentDocUploadStep * Update smoke-test.spec.ts * Update smoke-test.spec.ts * FixFormatting * FixSpellingMistakeAndUpdatedEnvVarInJenkinFile
1 parent 6a82ae6 commit 706ade0

File tree

8 files changed

+32
-27
lines changed

8 files changed

+32
-27
lines changed

‎Jenkinsfile_nightly‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,8 @@ withNightlyPipeline(type, product, component) {
8080
env.MANAGE_ORG_SERVICE_URL = "http://rd-professional-api-${env.ENVIRONMENT}.service.core-compute-${env.ENVIRONMENT}.internal/"
8181
env.ACCESS_MANAGEMENT_URL ="http://am-role-assignment-service-${env.ENVIRONMENT}.service.core-compute-${env.ENVIRONMENT}.internal/am/role-assignments"
8282
env.IDAM_WEB_URL = "https://idam-web-public.${env.ENVIRONMENT}.platform.hmcts.net"
83+
env.JURISDICTIONS = "PUBLICLAW"
84+
env.CASE_TYPE = "CARE_SUPERVISION_EPO"
8385

8486

8587
loadVaultSecrets(integrationTestSecrets)

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
"test:functional-galaxyS4": " yarn playwright install chromium && yarn playwright test --project=GalaxyS4 ",
5151
"test:functional-nightly-preview": "yarn playwright install msedge && yarn playwright test --project=preview ",
5252
"test:smoke": "yarn npm audit --recursive --environment production && MOCHAWESOME_REPORTFILENAME=smoke REPORT_DIR=test-results/smokeTest REPORT_FILE=test-results/smokeTest/results.xml codeceptjs run --grep '@smoke-tests' --reporter mocha-multi --verbose",
53-
"test:local": "yarn playwright test --project=chromium --headed --repeat-each 1",
53+
"test:local": "yarn playwright test --project=chrome --headed --repeat-each 1",
5454
"test:api-test": "yarn playwright test --config=playwright.api.config.ts",
5555
"prepare": "husky install",
5656
"yarn-update": "yarn set version 3.x",

‎playwright-e2e/pages/manage-orders/manage-orders-review.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ export class ManageOrdersReview extends BasePage {
99

1010
constructor(page: Page) {
1111
super(page);
12-
this.orderPdfLabel = page.getByRole('link', { name: /\.pdf$/i });
12+
this.orderPdfLabel = page.getByRole('button', { name: /\.pdf$/i });
1313
this.orderCloseCaseGroup = page.getByRole('group', { name: 'Does this order close the case?' });
1414
this.closeCaseYesRadioButton = this.orderCloseCaseGroup.getByRole('radio', { name: 'Yes' });
1515
this.closeCaseNoRadioButton = this.orderCloseCaseGroup.getByRole('radio', { name: 'No' });

‎playwright-e2e/pages/orders.ts‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ export class Orders extends BasePage {
291291

292292
async openOrderDoc(docLink: string) {
293293
const newPagePromise = this.page.context().waitForEvent('page');
294-
await this.page.getByRole('link', { name: `${docLink}` }).click();
294+
await this.page.getByRole('button', { name: `${docLink}` }).click();
295295
this.orderPage = await newPagePromise;
296296
await this.orderPage.waitForLoadState();
297297
}
@@ -333,7 +333,6 @@ export class Orders extends BasePage {
333333
async ctscFamilyAssistanceOrder() {
334334
await expect(this.page.getByText(' Add issuing details', { exact: true })).toBeVisible();
335335
await this.issuingJudge.getByLabel('Yes').check();
336-
await this.page.pause();
337336
await this.clickContinue();
338337
await this.page.pause();
339338
await this.isAllChildrenInvolved.getByLabel('Yes').check();
@@ -353,7 +352,6 @@ export class Orders extends BasePage {
353352
async judgeUploadsFamilyAssistanceOrder() {
354353
await expect(this.page.getByText(' Add issuing details', { exact: true })).toBeVisible();
355354
await this.issuingJudge.getByLabel('Yes').check();
356-
await this.page.pause();
357355
await this.clickContinue();
358356
await this.isAllChildrenInvolved.getByLabel('Yes').check();
359357
await this.clickContinue();

‎playwright-e2e/pages/sign-in.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ export class SignInPage extends BasePage {
3636
}
3737

3838
async navigateTOCaseDetails(caseNumber: string) {
39-
await this.page.goto(`${urlConfig.frontEndBaseURL}/case-details/${caseNumber}`);
39+
await this.page.goto(`${urlConfig.frontEndBaseURL}/cases/case-details/${urlConfig.jurisdiction}/${urlConfig.caseType}/${caseNumber}`);
40+
await this.page.waitForLoadState();
4041
}
4142

4243
async login(email: string, password: string) {

‎playwright-e2e/settings/urls.ts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,17 @@ const env = process.env.ENVIRONMENT || "aat";
33
const e2ePw: string = process.env.E2E_TEST_PASSWORD || "";
44
const defaultPwd: string = process.env.SYSTEM_UPDATE_USER_PASSWORD || "";
55
const judgePwd: string = process.env.E2E_TEST_JUDGE_PASSWORD || "";
6+
const jurisdiction:string = process.env.JURISDICTIONS || "PUBLICLAW";
7+
const caseType:string = process.env.CASE_TYPE || "CARE_SUPERVISION_EPO";
68

79
interface UrlConfig {
810
[key: string]: string;
911
}
1012

1113
export const urlConfig: UrlConfig = {
1214
env: env,
15+
jurisdiction: process.env.JURIDICTION ||jurisdiction,
16+
caseType: process.env.CASE_TYPE || caseType,
1317
idamUrl: process.env.IDAM_API_URL || `https://idam-api.${env}.platform.hmcts.net`,
1418
serviceUrl: process.env.CASE_SERVICE_URL || `http://fpl-case-service-${env}.service.core-compute-${env}.internal`,
1519
frontEndBaseURL: process.env.FE_BASE_URL || `https://manage-case.${env}.platform.hmcts.net`,

‎playwright-e2e/tests/manage-orders.spec.ts‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ test.describe('manage orders', () => {
8080
await orders.clickContinue();
8181
await expect(orders.page.getByRole('heading', { name: 'Download order' })).toBeVisible();
8282
await expect(orders.page.getByText('Open the attached order in PDF-Xchange Editor to make changes.', { exact: true })).toBeVisible();
83-
await expect(orders.page.getByRole('link', { name: 'C23 - Emergency protection order' })).toBeVisible();
83+
await expect(orders.page.getByRole('button', { name: 'C23 - Emergency protection order' })).toBeVisible();
8484
await orders.clickContinue();
8585

8686
await expect(orders.page.getByRole('heading', { name: 'Replace old order' })).toBeVisible();
@@ -91,7 +91,7 @@ test.describe('manage orders', () => {
9191
await orders.tabNavigation('Orders');
9292
await expect(orders.page.getByText('Amended', { exact: true })).toBeVisible();
9393
await expect(orders.page.locator('#case-viewer-field-read--orderCollection')).toContainText(orders.getCurrentDate());
94-
await expect(orders.page.getByRole('link', { name: 'amended_C23 - Emergency' })).toBeVisible();
94+
await expect(orders.page.getByRole('button', { name: 'amended_C23 - Emergency' })).toBeVisible();
9595
await orders.openOrderDoc('amended_C23 - Emergency');
9696
await expect(orders.orderPage.getByText('Amended under the slip rule')).toBeVisible();
9797
})
@@ -120,7 +120,7 @@ test.describe('manage orders', () => {
120120
await orders.tabNavigation('Orders');
121121
await expect(orders.page.getByRole('cell', { name: 'Other', exact: true })).toBeVisible();
122122
await expect(orders.page.getByText('Uploaded Other Order')).toBeVisible();
123-
await expect(orders.page.getByRole('link', { name: 'other_order.pdf' })).toBeVisible();
123+
await expect(orders.page.getByRole('button', { name: 'other_order.pdf' })).toBeVisible();
124124
await orders.openOrderDoc('other_order.pdf');
125125
await orders.assertOrderSealScreenshot();
126126

@@ -162,7 +162,7 @@ test.describe('manage orders', () => {
162162
await orders.tabNavigation('Orders');
163163
await expect(page.getByText('Order 1', { exact: true })).toBeVisible();
164164
await expect(page.getByText('Care order (C32A)')).toBeVisible();
165-
await expect(page.getByRole('link', { name: 'c32a_care_order.pdf' })).toBeVisible();
165+
await expect(page.getByRole('button', { name: 'c32a_care_order.pdf' })).toBeVisible();
166166

167167
//assert the state of the case
168168
// await orders.tabNavigation('History'); EXUI issue with tab lables having the hint text . it has to rollback when the issue fixed
@@ -275,7 +275,7 @@ test.describe('manage orders', () => {
275275
await orders.checkYourAnsAndSubmit();
276276
await orders.tabNavigation('Orders');
277277
await expect(page.getByText('Authority to keep a child in')).toBeVisible();
278-
await expect(page.getByRole('link', { name: 'c26_secure_accommodation_order.pdf' })).toBeVisible();
278+
await expect(page.getByRole('button', { name: 'c26_secure_accommodation_order.pdf' })).toBeVisible();
279279

280280
})
281281

@@ -310,7 +310,7 @@ test.describe('manage orders', () => {
310310

311311
await orders.tabNavigation('Orders');
312312
await expect(page.getByText('Child assessment order (C39)')).toBeVisible();
313-
await expect(page.getByRole('link', { name: 'c39_child_assessment_order.pdf' })).toBeVisible();
313+
await expect(page.getByRole('button', { name: 'c39_child_assessment_order.pdf' })).toBeVisible();
314314

315315
})
316316

@@ -348,7 +348,7 @@ test.describe('manage orders', () => {
348348
await orders.tabNavigation('Orders');
349349
await expect(page.getByText('Blank order (C21)')).toBeVisible();
350350
await expect(page.getByText('Prohibited Steps Order')).toBeVisible();
351-
await expect(page.getByRole('link', { name: 'c21_blank_order.pdf' })).toBeVisible();
351+
await expect(page.getByRole('button', { name: 'c21_blank_order.pdf' })).toBeVisible();
352352

353353
})
354354

@@ -375,7 +375,7 @@ test.describe('manage orders', () => {
375375
await orders.checkYourAnsAndSubmit();
376376

377377
await orders.tabNavigation('Orders');
378-
await expect(page.getByRole('link', { name: 'transparency_order.pdf' })).toBeVisible();
378+
await expect(page.getByRole('button', { name: 'transparency_order.pdf' })).toBeVisible();
379379
})
380380

381381
test('Judge uploads Transparency Order ', async ({ page, signInPage, orders }) => {
@@ -401,7 +401,7 @@ test.describe('manage orders', () => {
401401
await orders.checkYourAnsAndSubmit();
402402

403403
await orders.tabNavigation('Orders');
404-
await expect(page.getByRole('link', { name: 'transparency_order.pdf' })).toBeVisible();
404+
await expect(page.getByRole('button', { name: 'transparency_order.pdf' })).toBeVisible();
405405
})
406406

407407
test('CTSC uploads Family assistance order', async ({ page, signInPage, orders }) => {
@@ -473,7 +473,7 @@ test.describe('manage orders', () => {
473473
await orders.checkYourAnsAndSubmit();
474474

475475
await orders.tabNavigation('Orders');
476-
await expect(page.getByRole('link', { name: 'c33_interim_care_order.pdf', exact: true })).toBeVisible();
476+
await expect(page.getByRole('button', { name: 'c33_interim_care_order.pdf', exact: true })).toBeVisible();
477477

478478
})
479479

@@ -498,7 +498,7 @@ test.describe('manage orders', () => {
498498
await orders.checkYourAnsAndSubmit();
499499

500500
await orders.tabNavigation('Orders');
501-
await expect(page.getByRole('link', { name: 'c33_interim_care_order.pdf', exact: true })).toBeVisible();
501+
await expect(page.getByRole('button', { name: 'c33_interim_care_order.pdf', exact: true })).toBeVisible();
502502

503503
})
504504

@@ -560,8 +560,8 @@ test.describe('manage orders', () => {
560560
await submit.clickSaveAndContinue();
561561

562562
await orders.tabNavigation('Orders');
563-
await expect(page.getByRole('link', { name: 'c43_child_arrangements.pdf', exact: true })).toBeVisible();
564-
await expect(page.getByRole('link', { name: 'c43_child_arrangements.pdf', exact: true })).toBeEnabled();
563+
await expect(page.getByRole('button', { name: 'c43_child_arrangements.pdf', exact: true })).toBeVisible();
564+
await expect(page.getByRole('button', { name: 'c43_child_arrangements.pdf', exact: true })).toBeEnabled();
565565
})
566566

567567
test('CTSC uploads Interim supervision order (C35B)', async ({ page, signInPage, orders }) => {
@@ -585,7 +585,7 @@ test.describe('manage orders', () => {
585585
await orders.checkYourAnsAndSubmit();
586586

587587
await orders.tabNavigation('Orders');
588-
await expect(page.getByRole('link', { name: 'c35b_interim_supervision_order.pdf', exact: true })).toBeVisible();
588+
await expect(page.getByRole('button', { name: 'c35b_interim_supervision_order.pdf', exact: true })).toBeVisible();
589589

590590
})
591591

@@ -610,7 +610,7 @@ test.describe('manage orders', () => {
610610
await orders.checkYourAnsAndSubmit();
611611

612612
await orders.tabNavigation('Orders');
613-
await expect(page.getByRole('link', { name: 'c35b_interim_supervision_order.pdf', exact: true })).toBeVisible();
613+
await expect(page.getByRole('button', { name: 'c35b_interim_supervision_order.pdf', exact: true })).toBeVisible();
614614

615615
})
616616

@@ -635,7 +635,7 @@ test.describe('manage orders', () => {
635635
await orders.checkYourAnsAndSubmit();
636636

637637
await orders.tabNavigation('Orders');
638-
await expect(page.getByRole('link', { name: 'c45a_parental_responsibility_order.pdf', exact: true })).toBeVisible();
638+
await expect(page.getByRole('button', { name: 'c45a_parental_responsibility_order.pdf', exact: true })).toBeVisible();
639639

640640
})
641641

@@ -660,7 +660,7 @@ test.describe('manage orders', () => {
660660
await orders.checkYourAnsAndSubmit();
661661

662662
await orders.tabNavigation('Orders');
663-
await expect(page.getByRole('link', { name: 'c45a_parental_responsibility_order.pdf', exact: true })).toBeVisible();
663+
await expect(page.getByRole('button', { name: 'c45a_parental_responsibility_order.pdf', exact: true })).toBeVisible();
664664

665665
})
666666

@@ -684,6 +684,6 @@ test.describe('manage orders', () => {
684684
await orders.checkYourAnsAndSubmit();
685685

686686
await orders.tabNavigation('Orders');
687-
await expect(page.getByRole('link', { name: 'c43a_special_guardianship_order.pdf', exact: true })).toBeVisible();
687+
await expect(page.getByRole('button', { name: 'c43a_special_guardianship_order.pdf', exact: true })).toBeVisible();
688688
});
689689
})

‎playwright-e2e/tests/upload-draft-orders.spec.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ test.describe('Upload draft orders', () => {
2424

2525
await uploadDraftOrders.tabNavigation('Draft orders');
2626
await expect(page.locator('#case-viewer-field-read--hearingOrdersBundlesDrafts')).toContainText('Case management hearing, 3 November 2012');
27-
await expect(page.getByLabel('Draft orders').getByRole('link')).toContainText('draftOrder.docx');
27+
await expect(page.getByLabel('Draft orders').getByRole('button')).toContainText('draftOrder.docx');
2828
});
2929

3030
test('LA upload Additional Draft Order @xbrowser',
@@ -40,7 +40,7 @@ test.describe('Upload draft orders', () => {
4040

4141
await uploadDraftOrders.tabNavigation('Draft orders');
4242
//await expect(page.locator('#case-viewer-field-read--hearingOrdersBundlesDrafts')).toContainText('Case management hearing, 3 November 2012');
43-
await expect(page.getByRole('link', { name: 'draftOrder2.docx' })).toBeVisible();
44-
await expect(page.getByRole('link', { name: 'draftOrder.docx' })).toBeVisible();
43+
await expect(page.getByRole('button', { name: 'draftOrder2.docx' })).toBeVisible();
44+
await expect(page.getByRole('button', { name: 'draftOrder.docx' })).toBeVisible();
4545
});
4646
});

0 commit comments

Comments
 (0)