Skip to content

Commit df32b96

Browse files
scottstewart-slsrinijgPadmaDeenadayalanpadmakumarihmcts-jenkins-j-to-z[bot]
authored
HDPI-6029: Gen App Other Parties Agree screens (#1836)
Signed-off-by: sstewart <202802468+scottstewart-sl@users.noreply.github.com> Co-authored-by: srinijg <srinivasan.joghee@hmcts.net> Co-authored-by: PadmaDeenadayalan <Padma.Deenadayalan@hmcts.net> Co-authored-by: padmakumari <padma.kumari@hmcts.net> Co-authored-by: hmcts-jenkins-j-to-z <61242337+hmcts-jenkins-j-to-z[bot]@users.noreply.github.com> Co-authored-by: marianadpereira <71711509+marianadpereira@users.noreply.github.com>
1 parent 33b0c5a commit df32b96

18 files changed

Lines changed: 267 additions & 118 deletions

‎charts/pcs-api/Chart.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ appVersion: "1.0"
33
description: A Helm chart for pcs-api App
44
name: pcs-api
55
home: https://github.com/hmcts/pcs-api
6-
version: 0.0.57
6+
version: 0.0.58
77
maintainers:
88
- name: HMCTS pcs team
99
dependencies:

‎src/e2eTest/config/global-setup.config.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ function applyPlaywrightServiceUrls(): void {
2020
process.env.IDAM_WEB_URL ||= `https://idam-api.${e}.platform.hmcts.net`;
2121
process.env.IDAM_TESTING_SUPPORT_URL ||= `https://idam-testing-support-api.${e}.platform.hmcts.net`;
2222
process.env.S2S_URL ||= `http://rpe-service-auth-provider-${e}.service.core-compute-${e}.internal/testing-support/lease`;
23+
process.env.CASE_API_URL ||= `http://pcs-api-${e}.service.core-compute-${e}.internal`;
2324
} else {
2425
// preview, empty ENVIRONMENT, etc.: AAT IdAM/S2S (same as Jenkinsfile_CNP defaults). MANAGE_CASE / data-store from Jenkins or exports.
2526
process.env.IDAM_WEB_URL ||= 'https://idam-api.aat.platform.hmcts.net';

‎src/e2eTest/data/page-data-figma/page-data-genApps-figma/areThereAnyReasonsThatThisApplicationShouldNotBeShared.page.data.ts‎

Lines changed: 9 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,18 @@
11
export const areThereAnyReasonsThatThisApplicationShouldNotBeShared = {
2-
mainHeader: `Are there any reasons that this application should not be shared with the other parties?`,
3-
weUsuallySendParagraph: `We usually send a copy of your application to the other parties (your landlord, housing association or mortgage lender). This gives them the opportunity to respond to it.`,
4-
inSomeExceptionalParagraph: `In some exceptional circumstances, the judge will consider your application without telling the other party first.`,
2+
mainHeader: `Are there any reasons that this application should not be shared with other parties?`,
3+
weUsuallySendParagraph: `We usually send a copy of the application to the other parties (the defendant’s landlord, housing association or mortgage lender). This gives the other party the opportunity to respond to it.`,
4+
inSomeExceptionalParagraph: `In some exceptional circumstances, the judge will consider the application without telling the other party first.`,
55
forExampleParagraph: `For example, if:`,
6-
itIsSoUrgentList: `it is so urgent that there is not enough time to give notice`,
7-
givingSomeoneList: `giving someone notice could undermine the order you want the court to grant.`,
8-
youBelieveList: `you believe you are at risk from the other party`,
9-
warningText: `We will ask you to provide the reason. The court will consider your reason, and you may not be successful.`,
6+
itIsSoUrgentList: `it is so urgent that there is not enough time for the defendant to give notice`,
7+
givingSomeoneList: `giving someone notice could undermine the order that the defendant wants the court to grant`,
8+
defendantBelieveList: `the defendant believes that they are at risk from the other party`,
9+
warningText: `We will ask you to provide the reason. The court will consider the reason, and the defendant may not be successful.`,
1010
areThereAnyReasonQuestion: `Are there any reasons that this application should not be shared with the other parties?`,
11-
cymraegLink: `Cymraeg`,
12-
backLink: `Back`,
13-
feedbackLink: `feedback (opens in new tab)`,
1411
continueButton: `Continue`,
12+
previousButton: `Previous`,
1513
cancelLink: `Cancel`,
1614
yesRadioOption: `Yes`,
1715
noRadioOption: `No`,
18-
provideReasonHiddenTextLabel: `Provide a reason this application should not be shared with the other party`,
16+
provideReasonHiddenTextLabel: `Provide the reason this application should not be shared with the other party`,
1917
provideReasonTextInput: 6000,
20-
thereIsAProblemErrorMessageHeader: `There is a problem`,
21-
errorValidationType: { one: `radioOptions`, two: `textField`, three: `checkBox` },
22-
errorValidationField: {
23-
errorRadioOption: {
24-
type: `none`,
25-
input: ``,
26-
errMessage: `Confirm whether there is a reason why this application should not be shared with the other parties`,
27-
},
28-
29-
errorTextField: [
30-
{ type: 'empty', input: 'EMPTY', errMessage: 'Confirm why the other parties should not be informed' },
31-
{ type: 'moreThanMax', input: 6900, errMessage: 'Must be 6800 characters or fewer' },
32-
],
33-
},
3418
};

src/e2eTest/data/page-data-figma/page-data-genApps-figma/doYouWantToUploadDocumentToSupportYourApplication.page.data.ts renamed to src/e2eTest/data/page-data-figma/page-data-genApps-figma/doYouWantToUploadDocumentsToSupportDefendantsApplication.page.data.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
export const doYouWantToUploadDocumentToSupportYourApplication = {
2-
mainHeader: `Do you want to upload documents to support your application?`,
1+
export const doYouWantToUploadDocumentsToSupportDefendantsApplication = {
2+
mainHeader: `Do you want to upload documents to support the defendant’s application? (Optional)`,
33
doYouWantToUploadDocumentQuestion: `Do you want to upload documents to support your application?`,
44
yesRadioOption: `Yes`,
55
noRadioOption: `No`,

‎src/e2eTest/data/page-data-figma/page-data-genApps-figma/hasTheDefendantAskedTheOtherPartiesAgreedToThisApplication.page.data.ts‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
export const hasTheDefendantAskedTheOtherPartiesAgreedToThisApplication = {
2+
mainHeader: `Has the defendant asked the other parties if they agree to this application?`,
3+
theOtherPartyParagraph: `The ‘other party’ is the other side involved in the defendant’s case. For example their landlord, housing association, or mortgage lender.`,
4+
everyOtherPartyParagraph: `Every other party will need to agree to let them make this application, if they don’t agree, the defendant may need to pay a higher fee.`,
5+
ifTheOtherPartiesHeader: `If the other parties do not agree`,
6+
yourAppFeeParagraph: `The application fee will increase to £313 if:`,
7+
theDefendantHasAlreadyToldList: `the defendant has already told the other party that they are making this application, and`,
8+
OtherPartyDidNotAgreeList: `the other party did not agree to it (this means that they objected to it)`,
9+
youWillSeeParagraph: `You’ll see the final application fee before you pay.`,
10+
whatDoYouNeedHeader: `What you need to do`,
11+
youWillNeedParagraph: `You will need to upload evidence for the court, to show that:`,
12+
theDefendantHasToldList: `the defendant has told the other parties, and`,
13+
theyAgreedList: `they agreed to it`,
14+
forExampleParagraph: `For example a copy of a letter, email or a signed consent order. We will ask you to upload this evidence later in this application.`,
15+
ifYourAreNotAbleParagraph: `If the defendant was not able to contact the other parties, or they attempted to contact them but the other party did not respond, select ‘No’.`,
16+
haveTheOtherPartiesAgreedQuestion: `Have the other parties agreed to this application?`,
17+
yesRadioOption: `Yes`,
18+
noRadioOption: `No`,
19+
continueButton: `Continue`,
20+
cancelLink: `Cancel`,
21+
previousButton: `Previous`,
22+
};

‎src/e2eTest/data/page-data-figma/page-data-genApps-figma/haveTheOtherPartiesAgreedToThisApplication.page.data.ts‎

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +0,0 @@
1-
export const haveTheOtherPartiesAgreedToThisApplication = {
2-
mainHeader: `Has the defendant asked the other parties if they agree to this application?`,
3-
theOtherPartyParagraph: `The ‘other party’ is the other side involved in your case. For example your landlord, housing association, or mortgage lender.`,
4-
everyOtherPartyParagraph: `Every other party will need to agree to let you make this application, if they don’t agree you may need to pay a higher fee.`,
5-
ifTheOtherPartiesHeader: `If the other parties do not agree`,
6-
yourAppFeeParagraph: `Your application fee will increase to £313, if:`,
7-
youHaveAlreadyToldList: `you have already told the other party that you are making this application, and`,
8-
theyDidNotAgreeList: `they did not agree to it (this means that they have objected to it)`,
9-
youWillSeeParagraph: `You’ll see the final application fee before you pay.`,
10-
whatDoYouNeedHeader: `What you need to do`,
11-
youWillNeedParagraph: `You will need to upload evidence for the court, to show that:`,
12-
youHaveToldList: `you have told the other parties, and`,
13-
theyAgreedList: `they agreed to it`,
14-
forExampleParagraph: `For example a copy of a letter, email, or a signed consent order. We will ask you to upload this evidence later in this application.`,
15-
ifYourAreNotAbleParagraph: `If you’re not able to contact the other parties, or you’ve attempted to contact them but have not responded, select ‘No’.`,
16-
haveTheOtherPartiesAgreedQuestion: `Have the other parties agreed to this application?`,
17-
yesRadioOption: `Yes`,
18-
noRadioOption: `No`,
19-
continueButton: `Continue`,
20-
cancelLink: `Cancel`,
21-
thereIsAProblemErrorMessageHeader: `There is a problem`,
22-
// if the below format is deemed complicated it will replaced as part of https://tools.hmcts.net/jira/browse/HDPI-5815
23-
errorValidationType: { one: `radioOptions`, two: `textField`, three: `checkBox` },
24-
errorValidationField: {
25-
errorRadioOption: {
26-
type: `none`,
27-
input: ``,
28-
errMessage: `Confirm whether the other parties have agreed to this application`,
29-
},
30-
},
31-
};

‎src/e2eTest/data/page-data-figma/page-data-genApps-figma/index.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ export * from './checkYourAnswersGenApps.page.data';
33
export * from './applicationSubmitted.page.data';
44
export * from './askToAdjournTheCourtHearing.page.data';
55
export * from './helpWithFeesNeeded.page.data';
6-
export * from './doYouWantToUploadDocumentToSupportYourApplication.page.data';
7-
export * from './haveTheOtherPartiesAgreedToThisApplication.page.data';
6+
export * from './doYouWantToUploadDocumentsToSupportDefendantsApplication.page.data';
7+
export * from './hasTheDefendantAskedTheOtherPartiesAgreedToThisApplication.page.data';
88
export * from './haveTheyAlreadyAppliedForHelpWithFees.page.data';
99
export * from './isTheCourtHearingInTheNext14Days.page.data';
1010
export * from './uploadDocumentsToSupportYourApplication.page.data';

‎src/e2eTest/data/page-data-figma/page-data-genApps-figma/urlToFileMappingGenApps.ts‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,8 @@ export default {
66
'makeAnApplicationselectParty': 'selectParty',
77
'makeAnApplicationhearingInNext14Days': 'isTheCourtHearingInTheNext14Days',
88
'makeAnApplicationhelpWithFeesNeeded' : 'helpWithFeesNeeded',
9-
'makeAnApplicationappliedForHelpWithFees': 'haveTheyAlreadyAppliedForHelpWithFees'
9+
'makeAnApplicationappliedForHelpWithFees': 'haveTheyAlreadyAppliedForHelpWithFees',
10+
'makeAnApplicationotherPartiesAgreed': 'hasTheDefendantAskedTheOtherPartiesAgreedToThisApplication',
11+
'makeAnApplicationreasonsNotToShare': 'areThereAnyReasonsThatThisApplicationShouldNotBeShared',
12+
'makeAnApplicationwhatOrderWanted': 'whatOrderDoYouWantTheCourtToMakeAndWhy'
1013
};

‎src/e2eTest/data/page-data-figma/page-data-genApps-figma/whatOrderDoYouWantTheCourtToMakeAndWhy.page.data.ts‎

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,9 @@
11
export const whatOrderDoYouWantTheCourtToMakeAndWhy = {
2-
mainHeader: `What order do you want the court to make, and why?`,
3-
makeAnApplicationParagraph: `Make an application`,
4-
includeDetailsOfAnyFactsParagraph: `Include details of any facts or evidence that you think the court should consider when it makes a decision. You can upload your evidence on the next page.`,
5-
explainWhatYouWantTextLabel: `Explain what you want the court to do, and why`,
6-
youHave600CharactersHiddenHintText: `You have 6,800 characters remaining`,
2+
mainHeader: `What order does the defendant want the court to make, and why?`,
3+
includeDetailsOfAnyFactsParagraph: `Include details of any facts or evidence that you think the court should consider when it makes a decision. You can upload the evidence on the next page.`,
4+
explainWhatYouWantTextLabel: `Explain what the defendant wants the court to do, and why`,
75
whatYouWantTheCourtToDoTextInput: 120,
86
continueButton: `Continue`,
7+
previousButton: `Previous`,
98
cancelLink: `Cancel`,
10-
backLink: `Back`,
11-
feedbackLink: `feedback (opens in new tab)`,
12-
pageSlug: `what-order-do-you-want-the-court-to-make-and-why`,
13-
thereIsAProblemErrorMessageHeader: `There is a problem`,
14-
errorValidationType: { one: `radioOptions`, two: `textField`, three: `checkBox` },
15-
errorValidationField: {
16-
errorTextField: [
17-
{ type: 'empty', input: 'EMPTY', errMessage: 'Confirm the order you want the court to make, and why' },
18-
{ type: 'moreThanMax', input: 6900, errMessage: 'Must be 6800 characters or fewer' },
19-
],
20-
},
219
};

‎src/e2eTest/tests/test-genApps/makeAnApplication.askToAdjourn.spec.ts‎

Lines changed: 34 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,12 @@ import { dismissCookieBanner } from '@config/cookie-banner';
1313
import { caseInfo } from '@utils/actions/custom-actions';
1414
import { PageContentValidation } from '@utils/validations/element-validations/pageContent.validation';
1515
import {
16-
askToAdjournTheCourtHearing,
17-
haveTheOtherPartiesAgreedToThisApplication, haveTheyAlreadyAppliedForHelpWithFees, helpPayingTheFee,
16+
askToAdjournTheCourtHearing, haveTheyAlreadyAppliedForHelpWithFees, helpPayingTheFee,
1817
chooseAnApplication,
1918
isTheCourtHearingInTheNext14Days,
20-
selectParty
19+
selectParty, whatOrderDoYouWantTheCourtToMakeAndWhy, hasTheDefendantAskedTheOtherPartiesAgreedToThisApplication,
20+
areThereAnyReasonsThatThisApplicationShouldNotBeShared,
21+
doYouWantToUploadDocumentsToSupportDefendantsApplication
2122
} from '@data/page-data-figma/page-data-genApps-figma';
2223
import { defendantDetails } from '@utils/actions/custom-actions/custom-actions-genApps/genApps.action';
2324

@@ -96,10 +97,20 @@ test.describe('Make an Application - e2e Journey @nightly', async () => {
9697
label: haveTheyAlreadyAppliedForHelpWithFees.hwfReferenceHiddenTextLabel,
9798
input: haveTheyAlreadyAppliedForHelpWithFees.hwfReferenceTextInput,
9899
});
99-
await performValidation('mainHeader',haveTheOtherPartiesAgreedToThisApplication.mainHeader);
100+
await performValidation('mainHeader',hasTheDefendantAskedTheOtherPartiesAgreedToThisApplication.mainHeader);
101+
await performAction('confirmOtherPartiesAgreed', {
102+
question: hasTheDefendantAskedTheOtherPartiesAgreedToThisApplication.haveTheOtherPartiesAgreedQuestion,
103+
option: hasTheDefendantAskedTheOtherPartiesAgreedToThisApplication.yesRadioOption,
104+
});
105+
await performValidation('mainHeader', whatOrderDoYouWantTheCourtToMakeAndWhy.mainHeader);
106+
await performAction('confirmOrderDoYouWant', {
107+
label: whatOrderDoYouWantTheCourtToMakeAndWhy.explainWhatYouWantTextLabel,
108+
input: whatOrderDoYouWantTheCourtToMakeAndWhy.whatYouWantTheCourtToDoTextInput,
109+
});
110+
await performValidation('mainHeader', doYouWantToUploadDocumentsToSupportDefendantsApplication.mainHeader);
100111
});
101112

102-
test('Select an Application - Ask to Adjourn journey - Court hearing 14 days[No]', async () => {
113+
test('Select an Application - Ask to Adjourn journey - Court hearing 14 days[No] @PR', async () => {
103114
await performAction('select', caseSummary.nextStepEventList, caseSummary.makeAnApplication);
104115
await performAction('clickButton', caseSummary.go);
105116
await performAction('chooseAnApplication', {
@@ -117,6 +128,23 @@ test('Select an Application - Ask to Adjourn journey - Court hearing 14 days[No]
117128
question: isTheCourtHearingInTheNext14Days.isTheCourtHearingInTheNext14DaysQuestion,
118129
option: isTheCourtHearingInTheNext14Days.noRadioOption,
119130
});
120-
await performValidation('mainHeader',haveTheOtherPartiesAgreedToThisApplication.mainHeader);
131+
await performValidation('mainHeader',hasTheDefendantAskedTheOtherPartiesAgreedToThisApplication.mainHeader);
132+
await performAction('confirmOtherPartiesAgreed', {
133+
question: hasTheDefendantAskedTheOtherPartiesAgreedToThisApplication.haveTheOtherPartiesAgreedQuestion,
134+
option: hasTheDefendantAskedTheOtherPartiesAgreedToThisApplication.noRadioOption,
135+
});
136+
await performValidation('mainHeader', areThereAnyReasonsThatThisApplicationShouldNotBeShared.mainHeader);
137+
await performAction('reasonsApplicationShouldNotBeShared', {
138+
question: areThereAnyReasonsThatThisApplicationShouldNotBeShared.areThereAnyReasonQuestion,
139+
option: areThereAnyReasonsThatThisApplicationShouldNotBeShared.yesRadioOption,
140+
label: areThereAnyReasonsThatThisApplicationShouldNotBeShared.provideReasonHiddenTextLabel,
141+
input: areThereAnyReasonsThatThisApplicationShouldNotBeShared.provideReasonTextInput,
142+
});
143+
await performValidation('mainHeader', whatOrderDoYouWantTheCourtToMakeAndWhy.mainHeader);
144+
await performAction('confirmOrderDoYouWant', {
145+
label: whatOrderDoYouWantTheCourtToMakeAndWhy.explainWhatYouWantTextLabel,
146+
input: whatOrderDoYouWantTheCourtToMakeAndWhy.whatYouWantTheCourtToDoTextInput,
147+
});
148+
await performValidation('mainHeader', doYouWantToUploadDocumentsToSupportDefendantsApplication.mainHeader);
121149
});
122150
});

0 commit comments

Comments
 (0)