Skip to content

Commit 79064cd

Browse files
ruban72ruban72
committed
Merge remote-tracking branch 'origin/master'
2 parents 3e3d1f4 + 8916499 commit 79064cd

38 files changed

+1147
-46
lines changed

‎.env.ccd.local‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ JAVA_URL=https://civil-ccd-pr-${PR_NUMBER}.preview.platform.hmcts.net
1717
GA_URL=https://ga-civil-ccd-pr-${PR_NUMBER}.preview.platform.hmcts.net
1818
CCD_DEF_CASE_SERVICE_BASE_URL=https://civil-ccd-pr-${PR_NUMBER}.preview.platform.hmcts.net
1919
CCD_DEF_GEN_APP_SERVICE_BASE_URL=https://ga-civil-ccd-pr-${PR_NUMBER}.preview.platform.hmcts.net
20-
CCD_DEF_AAC_URL=https://manage-case-assignment-civil-ccd-pr-${PR_NUMBER}.preview.platform.hmcts.net
20+
CCD_DEF_AAC_URL=https://manage-case-assignment-civil-ccd-pr-${PR_NUMBER}.preview.platform.hmcts.net

‎.env.cui.local‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ JAVA_URL=https://civil-citizen-ui-pr-${PR_NUMBER}-civil-service.preview.platform
1717
GA_URL=https://civil-citizen-ui-pr-${PR_NUMBER}-general-applications.preview.platform.hmcts.net
1818
CCD_DEF_CASE_SERVICE_BASE_URL=https://civil-citizen-ui-pr-${PR_NUMBER}-civil-service.preview.platform.hmcts.net
1919
CCD_DEF_GEN_APP_SERVICE_BASE_URL=https://civil-citizen-ui-pr-${PR_NUMBER}-general-applications.preview.platform.hmcts.net
20-
CCD_DEF_AAC_URL=https://manage-case-assignment-civil-citizen-ui-pr-${PR_NUMBER}.preview.platform.hmcts.net
20+
CCD_DEF_AAC_URL=https://manage-case-assignment-civil-citizen-ui-pr-${PR_NUMBER}.preview.platform.hmcts.net

‎.gitignore‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ bin/main/application.yaml
2727

2828
# dotenv environment variables file
2929
.env
30-
.env.test
30+
.env.tests.local
3131

3232
# node_modules
3333
package-lock.json
@@ -67,3 +67,6 @@ playwright-report/
6767
/playwright-e2e/fixtures/.user-cookies/
6868
/playwright-e2e/fixtures/.user-assigned-cases/
6969
/playwright-e2e/fixtures/data/bankHolidays.json
70+
71+
#AI
72+
AGENTS.md

‎codecept.conf.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
require('dotenv').config();
2-
1+
require('dotenv').config({path: '.env.tests.local'});
32
const { testFilesHelper } = require('./e2e/plugins/failedAndNotExecutedTestFilesPlugin');
43

54
const functional = process.env.FUNCTIONAL;

‎e2e/config.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
require('dotenv').config();
1+
require('dotenv').config({path: '.env.tests.local'});
22

33
const defaultPassword = process.env.DEFAULT_PASSWORD;
44
const judgeDefaultPassword = process.env.JUDGE_DEFAULT_PASSWORD;

‎playwright-e2e/actions/ui/exui/judge-la/judge-la-actions-factory.ts‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,21 @@
11
import BasePageActionsFactory from '../../../../base/base-page-actions-factory';
22
import StandardDirectionOrderPageFactory from '../../../../pages/exui/judge-la/standard-directions-order/standard-directions-order-factory';
3+
import StandardDirectionOrderDJPageFactory from '../../../../pages/exui/judge-la/standard-directions-order-dj/standard-directions-order-dj-factory';
34
import StandardDirectionsOrderActions from './standard-directions-order-actions';
5+
import StandardDirectionsOrderDJActions from './standard-directions-order-dj-actions';
46

57
export default class JudgeActionsFactory extends BasePageActionsFactory {
6-
78
get standardDirectionsOrderActions() {
89
return new StandardDirectionsOrderActions(
910
new StandardDirectionOrderPageFactory(this.page),
1011
this.testData,
1112
);
1213
}
14+
15+
get standardDirectionsOrderDJActions() {
16+
return new StandardDirectionsOrderDJActions(
17+
new StandardDirectionOrderDJPageFactory(this.page),
18+
this.testData,
19+
);
20+
}
1321
}

‎playwright-e2e/actions/ui/exui/judge-la/standard-directions-order-actions.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,9 +105,9 @@ export default class StandardDirectionsOrderActions extends BaseTestData {
105105
}
106106

107107
async orderPreview() {
108-
const { orderPreviewPage } = this.standardDirectionsOrder;
109-
await orderPreviewPage.verifyContent(this.ccdCaseData);
110-
await orderPreviewPage.submit();
108+
const { orderPreviewSdoPage } = this.standardDirectionsOrder;
109+
await orderPreviewSdoPage.verifyContent(this.ccdCaseData);
110+
await orderPreviewSdoPage.submit();
111111
}
112112

113113
async submitStandardDirectionsOrder() {

‎playwright-e2e/actions/ui/exui/judge-la/standard-directions-order-dj-actions.ts‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
import BaseTestData from '../../../../base/base-test-data';
2+
import { AllMethodsStep } from '../../../../decorators/test-steps';
3+
import TestData from '../../../../models/test-data';
4+
import StandardDirectionOrderDJPageFactory from '../../../../pages/exui/judge-la/standard-directions-order-dj/standard-directions-order-dj-factory';
5+
6+
@AllMethodsStep()
7+
export default class StandardDirectionsOrderDJActions extends BaseTestData {
8+
private standardDirectionsOrderDJ: StandardDirectionOrderDJPageFactory;
9+
10+
constructor(standardDirectionsOrderDJ: StandardDirectionOrderDJPageFactory, testData: TestData) {
11+
super(testData);
12+
this.standardDirectionsOrderDJ = standardDirectionsOrderDJ;
13+
}
14+
15+
async sdoDJSelectDisposalHearing() {
16+
const { caseManagementOrderPage } = this.standardDirectionsOrderDJ;
17+
await caseManagementOrderPage.verifyContent(this.ccdCaseData);
18+
await caseManagementOrderPage.selectDisposalHearing();
19+
await caseManagementOrderPage.submit();
20+
}
21+
22+
async sdoDJSelectTrialHearing() {
23+
const { caseManagementOrderPage } = this.standardDirectionsOrderDJ;
24+
await caseManagementOrderPage.verifyContent(this.ccdCaseData);
25+
await caseManagementOrderPage.selectTrialHearing();
26+
await caseManagementOrderPage.submit();
27+
}
28+
29+
async sdoDJDisposalHearingDetails() {
30+
const { disposalHearingSdoDJPage } = this.standardDirectionsOrderDJ;
31+
await disposalHearingSdoDJPage.verifyContent(this.ccdCaseData);
32+
await disposalHearingSdoDJPage.addHearingTimeEstimate();
33+
await disposalHearingSdoDJPage.addDisposalHearingBundle();
34+
await disposalHearingSdoDJPage.submit();
35+
}
36+
37+
async sdoDJTrialHearingDetails() {
38+
const { trialHearingSdoDJPage } = this.standardDirectionsOrderDJ;
39+
await trialHearingSdoDJPage.verifyContent(this.ccdCaseData);
40+
await trialHearingSdoDJPage.addHearingTimeEstimate();
41+
await trialHearingSdoDJPage.submit();
42+
}
43+
44+
async sdoDJOrderPreview() {
45+
const { orderPreviewSdoDJPage } = this.standardDirectionsOrderDJ;
46+
await orderPreviewSdoDJPage.verifyContent(this.ccdCaseData);
47+
await orderPreviewSdoDJPage.submit();
48+
}
49+
50+
async sdoDJSubmit() {
51+
const { submitSdoDJPage } = this.standardDirectionsOrderDJ;
52+
await submitSdoDJPage.verifyContent(this.ccdCaseData);
53+
await submitSdoDJPage.submit();
54+
}
55+
56+
async sdoDJConfirm() {
57+
const { confirmSdoDJPage } = this.standardDirectionsOrderDJ;
58+
await confirmSdoDJPage.verifyContent(this.ccdCaseData);
59+
await confirmSdoDJPage.submit();
60+
}
61+
}

‎playwright-e2e/config/config.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1-
import 'dotenv/config';
1+
import * as dotenv from 'dotenv'
22
import Environment from '../enums/environment';
33
import testSpeeds from '../constants/test-speeds';
44
import { TestSpeed } from '../models/test-speeds';
55

6+
dotenv.config({path: '.env.tests.local'})
7+
68
const config = {
79
environment: process.env.ENVIRONMENT as Environment,
810
idamStudEnabled: process.env.IDAM_STUB_ENABLED === 'true',

‎playwright-e2e/constants/ccd-events.ts‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,12 @@ const ccdEvents: CCDEvents = {
162162
description: 'Standard Direction Order',
163163
order: 17,
164164
},
165+
STANDARD_DIRECTION_ORDER_DJ: {
166+
id: 'STANDARD_DIRECTION_ORDER_DJ',
167+
name: 'Directions Order (Judgment)',
168+
description: 'Standard Directions Order (Judgment)',
169+
order: 18,
170+
},
165171
CLAIMANT_RESPONSE_SPEC: {
166172
description: 'View and respond to defendant (Specified)',
167173
id: 'CLAIMANT_RESPONSE_SPEC',

0 commit comments

Comments
 (0)