diff --git a/ccd-definition/AuthorisationCaseEvent/AuthorisationCaseEventDJspec-DTSCCI-927-nonprod.json b/ccd-definition/AuthorisationCaseEvent/AuthorisationCaseEventDJspec-DTSCCI-927-nonprod.json deleted file mode 100644 index cbcfe856b9..0000000000 --- a/ccd-definition/AuthorisationCaseEvent/AuthorisationCaseEventDJspec-DTSCCI-927-nonprod.json +++ /dev/null @@ -1,15 +0,0 @@ -[ - { - "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", - "CaseEventID": "DEFAULT_JUDGEMENT_SPEC", - "AccessControl": [ - { - "UserRoles": [ - "APP-SOL-SPEC-PROFILE", - "[CREATOR]" - ], - "CRUD": "CRU" - } - ] - } -] diff --git a/ccd-definition/AuthorisationCaseEvent/AuthorisationCaseEventDJspec.json b/ccd-definition/AuthorisationCaseEvent/AuthorisationCaseEventDJspec.json index 89abc573e3..87aee7e1eb 100644 --- a/ccd-definition/AuthorisationCaseEvent/AuthorisationCaseEventDJspec.json +++ b/ccd-definition/AuthorisationCaseEvent/AuthorisationCaseEventDJspec.json @@ -9,6 +9,13 @@ "judge-profile" ], "CRUD": "R" + }, + { + "UserRoles": [ + "APP-SOL-SPEC-PROFILE", + "[CREATOR]" + ], + "CRUD": "CRU" } ] } diff --git a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-FixedCosts-nonprod.json b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-FixedCosts-nonprod.json index b18b030d67..d18b136f30 100644 --- a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-FixedCosts-nonprod.json +++ b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-FixedCosts-nonprod.json @@ -68,29 +68,6 @@ } ] }, - { - "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", - "CaseFieldID": "showOldDJFixedCostsScreen", - "AccessControl": [ - { - "UserRoles": [ - "APP-SOL-SPEC-PROFILE", - "caseworker-civil-solicitor" - ], - "CRUD": "CRU" - }, - { - "UserRoles": [ - "caseworker-civil", - "caseworker-civil-admin", - "RES-SOL-ONE-SPEC-PROFILE", - "RES-SOL-TWO-SPEC-PROFILE", - "caseworker-civil-systemupdate" - ], - "CRUD": "R" - } - ] - }, { "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", "CaseFieldID": "claimFixedCostsOnEntryDJ", diff --git a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-FixedCosts.json b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-FixedCosts.json new file mode 100644 index 0000000000..7f9b2777c2 --- /dev/null +++ b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-FixedCosts.json @@ -0,0 +1,25 @@ +[ + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseFieldID": "showOldDJFixedCostsScreen", + "AccessControl": [ + { + "UserRoles": [ + "APP-SOL-SPEC-PROFILE", + "caseworker-civil-solicitor" + ], + "CRUD": "CRU" + }, + { + "UserRoles": [ + "caseworker-civil", + "caseworker-civil-admin", + "RES-SOL-ONE-SPEC-PROFILE", + "RES-SOL-TWO-SPEC-PROFILE", + "caseworker-civil-systemupdate" + ], + "CRUD": "R" + } + ] + } +] diff --git a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-JO-nonprod.json b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-JO-nonprod.json index 18f0bf473f..66de5bd1af 100644 --- a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-JO-nonprod.json +++ b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-JO-nonprod.json @@ -428,5 +428,19 @@ "caseworker-civil-systemupdate" ], "CRUD": "CRU" + }, + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseFieldID": "respondForImmediateOption", + "AccessControl": [ + { + "UserRoles": [ + "caseworker-civil-admin", + "caseworker-civil-staff", + "caseworker-civil-solicitor" + ], + "CRUD": "CRU" + } + ] } ] diff --git a/ccd-definition/AuthorisationCaseField/AuthorisationCaseFieldDJspec.json b/ccd-definition/AuthorisationCaseField/AuthorisationCaseFieldDJspec.json index d8a40679b4..4d1c8238ce 100644 --- a/ccd-definition/AuthorisationCaseField/AuthorisationCaseFieldDJspec.json +++ b/ccd-definition/AuthorisationCaseField/AuthorisationCaseFieldDJspec.json @@ -125,6 +125,24 @@ } ] }, + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseFieldID": "partialPaymentInsetHelpText", + "AccessControl": [ + { + "UserRoles": [ + "caseworker-civil-solicitor" + ], + "CRUD": "CRU" + }, + { + "UserRoles": [ + "caseworker-civil-admin" + ], + "CRUD": "R" + } + ] + }, { "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", "CaseFieldID": "partialPaymentAmount", diff --git a/ccd-definition/AuthorisationCaseField/AuthorisationCaseFieldLRspec-CUI.json b/ccd-definition/AuthorisationCaseField/AuthorisationCaseFieldLRspec-CUI.json index 0f95334102..3291ba5b67 100644 --- a/ccd-definition/AuthorisationCaseField/AuthorisationCaseFieldLRspec-CUI.json +++ b/ccd-definition/AuthorisationCaseField/AuthorisationCaseFieldLRspec-CUI.json @@ -478,6 +478,28 @@ } ] }, + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseFieldID": "ccjPaymentPaidSomeLabelInsetHelpText", + "AccessControl": [ + { + "UserRoles": [ + "APP-SOL-UNSPEC-PROFILE", + "APP-SOL-SPEC-PROFILE" + ], + "CRUD": "CRU" + }, + { + "UserRoles": [ + "caseworker-civil-admin", + "RES-SOL-ONE-UNSPEC-PROFILE", + "RES-SOL-ONE-SPEC-PROFILE", + "RES-SOL-TWO-SPEC-PROFILE" + ], + "CRUD": "R" + } + ] + }, { "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", "CaseFieldID": "ccjPaymentPaidSomeAmount", diff --git a/ccd-definition/AuthorisationCaseField/systemUpdateLRspec-CUI.json b/ccd-definition/AuthorisationCaseField/systemUpdateLRspec-CUI.json index 4e0588fef3..777faf6ac7 100644 --- a/ccd-definition/AuthorisationCaseField/systemUpdateLRspec-CUI.json +++ b/ccd-definition/AuthorisationCaseField/systemUpdateLRspec-CUI.json @@ -95,6 +95,12 @@ "UserRole": "caseworker-civil-systemupdate", "CRUD": "CRU" }, + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseFieldID": "ccjPaymentPaidSomeLabelInsetHelpText", + "UserRole": "caseworker-civil-systemupdate", + "CRUD": "R" + }, { "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", "CaseFieldID": "ccjPaymentPaidSomeAmount", diff --git a/ccd-definition/CaseEvent/User/UserEvents-JO-nonprod.json b/ccd-definition/CaseEvent/User/UserEvents-JO-nonprod.json index 39014a5d8a..5c8bcd0479 100644 --- a/ccd-definition/CaseEvent/User/UserEvents-JO-nonprod.json +++ b/ccd-definition/CaseEvent/User/UserEvents-JO-nonprod.json @@ -113,5 +113,26 @@ "RetriesTimeoutAboutToStartEvent": 0, "RetriesTimeoutURLAboutToSubmitEvent": 0, "RetriesTimeoutURLSubmittedEvent": 0 + }, + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "ID": "REQUEST_JUDGEMENT_ADMISSION_SPEC", + "Name": "Request Judgement by Admission", + "Description": "Request Judgement by Admission (Specified)", + "DisplayOrder": 10, + "PreConditionState(s)": "AWAITING_APPLICANT_INTENTION;All_FINAL_ORDERS_ISSUED", + "PostConditionState": "*", + "EventEnablingCondition": "defenceAdmitPartPaymentTimeRouteRequired=\"IMMEDIATELY\" AND respondForImmediateOption = \"Yes\"", + "SecurityClassification": "Public", + "CallBackURLAboutToStartEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/cases/callbacks/about-to-start", + "CallBackURLAboutToSubmitEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/cases/callbacks/about-to-submit", + "CallBackURLSubmittedEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/cases/callbacks/submitted", + "ShowSummary": "Y", + "ShowEventNotes": "N", + "EndButtonLabel": "Submit your response", + "RetriesTimeoutAboutToStartEvent": 0, + "RetriesTimeoutURLAboutToSubmitEvent": 0, + "RetriesTimeoutURLSubmittedEvent": 0, + "Publish": "Y" } ] diff --git a/ccd-definition/CaseEvent/User/UserEventsLRspec-CUI-prod.json b/ccd-definition/CaseEvent/User/UserEventsLRspec-CUI-prod.json new file mode 100644 index 0000000000..e4d330e283 --- /dev/null +++ b/ccd-definition/CaseEvent/User/UserEventsLRspec-CUI-prod.json @@ -0,0 +1,23 @@ +[ + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "ID": "REQUEST_JUDGEMENT_ADMISSION_SPEC", + "Name": "Request Judgement by Admission", + "Description": "Request Judgement by Admission (Specified)", + "DisplayOrder": 10, + "PreConditionState(s)": "AWAITING_APPLICANT_INTENTION;All_FINAL_ORDERS_ISSUED", + "PostConditionState": "*", + "EventEnablingCondition": "defenceAdmitPartPaymentTimeRouteRequired=\"IMMEDIATELY\"", + "SecurityClassification": "Public", + "CallBackURLAboutToStartEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/cases/callbacks/about-to-start", + "CallBackURLAboutToSubmitEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/cases/callbacks/about-to-submit", + "CallBackURLSubmittedEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/cases/callbacks/submitted", + "ShowSummary": "Y", + "ShowEventNotes": "N", + "EndButtonLabel": "Submit your response", + "RetriesTimeoutAboutToStartEvent": 0, + "RetriesTimeoutURLAboutToSubmitEvent": 0, + "RetriesTimeoutURLSubmittedEvent": 0, + "Publish": "Y" + } +] diff --git a/ccd-definition/CaseEvent/User/UserEventsLRspec-CUI.json b/ccd-definition/CaseEvent/User/UserEventsLRspec-CUI.json index 8fecb5f545..51072d26c6 100644 --- a/ccd-definition/CaseEvent/User/UserEventsLRspec-CUI.json +++ b/ccd-definition/CaseEvent/User/UserEventsLRspec-CUI.json @@ -39,27 +39,6 @@ "Publish": "Y", "EventEnablingCondition": "CaseAccessCategory=\"SPEC_CLAIM\"" }, - { - "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", - "ID": "REQUEST_JUDGEMENT_ADMISSION_SPEC", - "Name": "Request Judgement by Admission", - "Description": "Request Judgement by Admission (Specified)", - "DisplayOrder": 10, - "PreConditionState(s)": "AWAITING_APPLICANT_INTENTION;All_FINAL_ORDERS_ISSUED", - "PostConditionState": "*", - "EventEnablingCondition": "defenceAdmitPartPaymentTimeRouteRequired=\"IMMEDIATELY\"", - "SecurityClassification": "Public", - "CallBackURLAboutToStartEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/cases/callbacks/about-to-start", - "CallBackURLAboutToSubmitEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/cases/callbacks/about-to-submit", - "CallBackURLSubmittedEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/cases/callbacks/submitted", - "ShowSummary": "Y", - "ShowEventNotes": "N", - "EndButtonLabel": "Submit your response", - "RetriesTimeoutAboutToStartEvent": 0, - "RetriesTimeoutURLAboutToSubmitEvent": 0, - "RetriesTimeoutURLSubmittedEvent": 0, - "Publish": "Y" - }, { "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", "ID": "ENTER_BREATHING_SPACE_SPEC", diff --git a/ccd-definition/CaseEventToFields/ClaimantResponseLRspec-CUI.json b/ccd-definition/CaseEventToFields/ClaimantResponseLRspec-CUI.json index a7b078df6a..6d45c00862 100644 --- a/ccd-definition/CaseEventToFields/ClaimantResponseLRspec-CUI.json +++ b/ccd-definition/CaseEventToFields/ClaimantResponseLRspec-CUI.json @@ -457,9 +457,19 @@ { "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", "CaseEventID": "CLAIMANT_RESPONSE_SPEC", - "CaseFieldID": "ccjPaymentPaidSomeAmount", + "CaseFieldID": "ccjPaymentPaidSomeLabelInsetHelpText", "PageDisplayOrder": 2, "PageFieldDisplayOrder": 3, + "DisplayContext": "READONLY", + "PageID": "CcjPaymentPaidSome", + "ShowSummaryChangeOption": "Y" + }, + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseEventID": "CLAIMANT_RESPONSE_SPEC", + "CaseFieldID": "ccjPaymentPaidSomeAmount", + "PageDisplayOrder": 2, + "PageFieldDisplayOrder": 4, "DisplayContext": "MANDATORY", "PageID": "CcjPaymentPaidSome", "ShowSummaryChangeOption": "Y", diff --git a/ccd-definition/CaseEventToFields/CreateClaimLRspec.json b/ccd-definition/CaseEventToFields/CreateClaimLRspec.json index 455b6361ba..1faadc1126 100644 --- a/ccd-definition/CaseEventToFields/CreateClaimLRspec.json +++ b/ccd-definition/CaseEventToFields/CreateClaimLRspec.json @@ -817,7 +817,8 @@ "PageDisplayOrder": 36, "PageColumnNumber": 1, "ShowSummaryChangeOption": "Y", - "PageShowCondition": "claimInterest = \"Yes\"" + "PageShowCondition": "claimInterest = \"Yes\"", + "CallBackURLMidEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/cases/callbacks/mid/interest-from" }, { "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", @@ -828,7 +829,8 @@ "PageID": "InterestClaimFrom", "PageDisplayOrder": 36, "PageColumnNumber": 1, - "ShowSummaryChangeOption": "Y" + "ShowSummaryChangeOption": "Y", + "CallBackURLMidEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/cases/callbacks/mid/interest-from" }, { "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", @@ -890,7 +892,7 @@ "PageColumnNumber": 1, "ShowSummaryChangeOption": "Y", "CallBackURLMidEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/cases/callbacks/mid/interest-calc", - "PageShowCondition": "claimInterest = \"Yes\"" + "PageShowCondition": "interestClaimFrom = \"FROM_A_SPECIFIC_DATE\" AND claimInterest = \"Yes\"" }, { "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", diff --git a/ccd-definition/CaseEventToFields/DefaultJudgmentDJspec-FixedCosts-nonprod.json b/ccd-definition/CaseEventToFields/DefaultJudgmentDJspec-FixedCosts-nonprod.json index 1967d8260e..4cc8f7c240 100644 --- a/ccd-definition/CaseEventToFields/DefaultJudgmentDJspec-FixedCosts-nonprod.json +++ b/ccd-definition/CaseEventToFields/DefaultJudgmentDJspec-FixedCosts-nonprod.json @@ -183,8 +183,19 @@ { "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", "CaseEventID": "DEFAULT_JUDGEMENT_SPEC", - "CaseFieldID": "partialPaymentAmount", + "CaseFieldID": "partialPaymentInsetHelpText", "PageFieldDisplayOrder": 4, + "DisplayContext": "READONLY", + "PageID": "claimPartialPayment", + "PageDisplayOrder": 3, + "PageColumnNumber": 1, + "ShowSummaryChangeOption": "Y" + }, + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseEventID": "DEFAULT_JUDGEMENT_SPEC", + "CaseFieldID": "partialPaymentAmount", + "PageFieldDisplayOrder": 5, "DisplayContext": "MANDATORY", "PageID": "claimPartialPayment", "PageDisplayOrder": 3, diff --git a/ccd-definition/CaseEventToFields/DefaultJudgmentDJspec-FixedCosts-prod.json b/ccd-definition/CaseEventToFields/DefaultJudgmentDJspec-FixedCosts-prod.json index d07394dabf..06f650c56f 100644 --- a/ccd-definition/CaseEventToFields/DefaultJudgmentDJspec-FixedCosts-prod.json +++ b/ccd-definition/CaseEventToFields/DefaultJudgmentDJspec-FixedCosts-prod.json @@ -147,8 +147,19 @@ { "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", "CaseEventID": "DEFAULT_JUDGEMENT_SPEC", - "CaseFieldID": "partialPaymentAmount", + "CaseFieldID": "partialPaymentInsetHelpText", "PageFieldDisplayOrder": 4, + "DisplayContext": "READONLY", + "PageID": "claimPartialPayment", + "PageDisplayOrder": 3, + "PageColumnNumber": 1, + "ShowSummaryChangeOption": "Y" + }, + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseEventID": "DEFAULT_JUDGEMENT_SPEC", + "CaseFieldID": "partialPaymentAmount", + "PageFieldDisplayOrder": 5, "DisplayContext": "MANDATORY", "PageID": "claimPartialPayment", "PageDisplayOrder": 3, diff --git a/ccd-definition/CaseEventToFields/RequestJudgementByAdmissionLRspec-CUI.json b/ccd-definition/CaseEventToFields/RequestJudgementByAdmissionLRspec-CUI.json index 551a6a4dec..cbac0f4288 100644 --- a/ccd-definition/CaseEventToFields/RequestJudgementByAdmissionLRspec-CUI.json +++ b/ccd-definition/CaseEventToFields/RequestJudgementByAdmissionLRspec-CUI.json @@ -22,9 +22,19 @@ { "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", "CaseEventID": "REQUEST_JUDGEMENT_ADMISSION_SPEC", - "CaseFieldID": "ccjPaymentPaidSomeAmount", + "CaseFieldID": "ccjPaymentPaidSomeLabelInsetHelpText", "PageDisplayOrder": 1, "PageFieldDisplayOrder": 3, + "DisplayContext": "READONLY", + "PageID": "CcjPaymentPaidSome", + "ShowSummaryChangeOption": "Y" + }, + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseEventID": "REQUEST_JUDGEMENT_ADMISSION_SPEC", + "CaseFieldID": "ccjPaymentPaidSomeAmount", + "PageDisplayOrder": 1, + "PageFieldDisplayOrder": 4, "DisplayContext": "MANDATORY", "PageID": "CcjPaymentPaidSome", "ShowSummaryChangeOption": "Y", @@ -71,7 +81,7 @@ "DisplayContext": "READONLY", "PageID": "CcjJudgmentSummary", "ShowSummaryChangeOption": "N", - "FieldShowCondition": "ccjPaymentPaidSomeLabel=\"DO NOT SHOW IN UI\"" + "FieldShowCondition": "ccjPaymentPaidSomeLabel=\"DO NOT SHOW IN UI\" OR ccjPaymentPaidSomeLabelInsetHelpText=\"DO NOT SHOW IN UI\"" }, { "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", @@ -82,7 +92,7 @@ "DisplayContext": "READONLY", "PageID": "CcjJudgmentSummary", "ShowSummaryChangeOption": "N", - "FieldShowCondition": "ccjPaymentPaidSomeLabel=\"DO NOT SHOW IN UI\"" + "FieldShowCondition": "ccjPaymentPaidSomeLabel=\"DO NOT SHOW IN UI\" OR ccjPaymentPaidSomeLabelInsetHelpText=\"DO NOT SHOW IN UI\"" }, { "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", @@ -102,7 +112,7 @@ "PageFieldDisplayOrder": 5, "DisplayContext": "READONLY", "PageID": "CcjJudgmentSummary", - "FieldShowCondition": "ccjPaymentPaidSomeLabel=\"DO NOT SHOW IN UI\"", + "FieldShowCondition": "ccjPaymentPaidSomeLabel=\"DO NOT SHOW IN UI\" OR ccjPaymentPaidSomeLabelInsetHelpText=\"DO NOT SHOW IN UI\"", "ShowSummaryChangeOption": "Y" }, { @@ -124,7 +134,7 @@ "DisplayContext": "READONLY", "PageID": "CcjJudgmentSummary", "ShowSummaryChangeOption": "N", - "FieldShowCondition": "ccjPaymentPaidSomeLabel=\"DO NOT SHOW IN UI\"" + "FieldShowCondition": "ccjPaymentPaidSomeLabel=\"DO NOT SHOW IN UI\" OR ccjPaymentPaidSomeLabelInsetHelpText=\"DO NOT SHOW IN UI\"" }, { "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", @@ -135,7 +145,7 @@ "DisplayContext": "READONLY", "PageID": "CcjJudgmentSummary", "ShowSummaryChangeOption": "Y", - "FieldShowCondition": "ccjPaymentPaidSomeLabel=\"DO NOT SHOW IN UI\" " + "FieldShowCondition": "ccjPaymentPaidSomeLabel=\"DO NOT SHOW IN UI\" OR ccjPaymentPaidSomeLabelInsetHelpText=\"DO NOT SHOW IN UI\"" }, { "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", @@ -157,7 +167,7 @@ "DisplayContext": "READONLY", "PageID": "CcjJudgmentSummary", "ShowSummaryChangeOption": "Y", - "FieldShowCondition": "ccjPaymentPaidSomeLabel=\"DO NOT SHOW IN UI\"" + "FieldShowCondition": "ccjPaymentPaidSomeLabel=\"DO NOT SHOW IN UI\" OR ccjPaymentPaidSomeLabelInsetHelpText=\"DO NOT SHOW IN UI\"" }, { "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", @@ -179,7 +189,7 @@ "DisplayContext": "READONLY", "PageID": "CcjJudgmentSummary", "ShowSummaryChangeOption": "Y", - "FieldShowCondition": "ccjPaymentPaidSomeLabel=\"DO NOT SHOW IN UI\"" + "FieldShowCondition": "ccjPaymentPaidSomeLabel=\"DO NOT SHOW IN UI\" OR ccjPaymentPaidSomeLabelInsetHelpText=\"DO NOT SHOW IN UI\"" }, { "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", @@ -200,7 +210,7 @@ "DisplayContext": "READONLY", "PageID": "CcjJudgmentSummary", "ShowSummaryChangeOption": "Y", - "FieldShowCondition": "ccjPaymentPaidSomeLabel=\"DO NOT SHOW IN UI\"" + "FieldShowCondition": "ccjPaymentPaidSomeLabel=\"DO NOT SHOW IN UI\" OR ccjPaymentPaidSomeLabelInsetHelpText=\"DO NOT SHOW IN UI\"" }, { "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", @@ -221,7 +231,7 @@ "DisplayContext": "READONLY", "PageID": "CcjJudgmentSummary", "ShowSummaryChangeOption": "N", - "FieldShowCondition": "ccjPaymentPaidSomeLabel=\"DO NOT SHOW IN UI\"" + "FieldShowCondition": "ccjPaymentPaidSomeLabel=\"DO NOT SHOW IN UI\" OR ccjPaymentPaidSomeLabelInsetHelpText=\"DO NOT SHOW IN UI\"" }, { "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", @@ -243,7 +253,7 @@ "DisplayContext": "READONLY", "PageID": "CcjJudgmentSummary", "ShowSummaryChangeOption": "Y", - "FieldShowCondition": "ccjPaymentPaidSomeLabel=\"DO NOT SHOW IN UI\"" + "FieldShowCondition": "ccjPaymentPaidSomeLabel=\"DO NOT SHOW IN UI\" OR ccjPaymentPaidSomeLabelInsetHelpText=\"DO NOT SHOW IN UI\"" }, { "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", diff --git a/ccd-definition/CaseField/CaseField-JO-nonprod.json b/ccd-definition/CaseField/CaseField-JO-nonprod.json index ed2c2b79ec..66fd73df1e 100644 --- a/ccd-definition/CaseField/CaseField-JO-nonprod.json +++ b/ccd-definition/CaseField/CaseField-JO-nonprod.json @@ -360,5 +360,13 @@ "FieldType": "DateTime", "SecurityClassification": "Public", "Searchable": "N" + }, + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "ID": "respondForImmediateOption", + "Label": " ", + "FieldType": "YesOrNo", + "SecurityClassification": "Public", + "Searchable": "N" } ] diff --git a/ccd-definition/CaseField/CaseFieldDJspec.json b/ccd-definition/CaseField/CaseFieldDJspec.json index 0a6e43744d..fbfecfd615 100644 --- a/ccd-definition/CaseField/CaseFieldDJspec.json +++ b/ccd-definition/CaseField/CaseFieldDJspec.json @@ -56,6 +56,14 @@ "SecurityClassification": "Public", "Searchable": "N" }, + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "ID": "partialPaymentInsetHelpText", + "Label": "
The system only allows interest to be calculated on the full claim amount. If you have received any part payment and you are requesting a CCJ, please use form N225. If you have received any part payment and you are requesting a Judgment on a Part Admission response, please use form N225a. You can calculate the correct interest, and send to contactocmc@justice.gov.uk
", + "FieldType": "Label", + "SecurityClassification": "Public", + "Searchable": "N" + }, { "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", "ID": "partialPaymentAmount", diff --git a/ccd-definition/CaseField/CaseFieldLRSpec-MINTI-nonprod.json b/ccd-definition/CaseField/CaseFieldLRSpec-MINTI-nonprod.json index e3b3c32cfa..4264fc4caf 100644 --- a/ccd-definition/CaseField/CaseFieldLRSpec-MINTI-nonprod.json +++ b/ccd-definition/CaseField/CaseFieldLRSpec-MINTI-nonprod.json @@ -2,7 +2,7 @@ { "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", "ID": "specEligibilityQuestions", - "Label": "## Issue civil court proceedings\nTo use this service you must be:\n* issuing a claim for a specified (fixed) amount of money\n* issuing a claim to the county court. Claims cannot be issued to the High Court using this service\n* have an address in England or Wales and an email address\n* able to pay the full issue fee using Payment by Account (PBA) or card payment\n* serving a claim form in English\n\nThe claimant must:\n\n* have an address in England or Wales\n* not have a civil proceedings order, civil restraint order, or all proceedings order against them\n\nThe claim you’re issuing must not:\n* ordinarily follow the Part 8 procedure\n* be brought under the Consumer Credit Act 1974\n* be against the Crown", + "Label": "## Issue civil court proceedings\nTo use this service you must be:\n* issuing a claim for a specified (fixed) amount of money\n* issuing a claim to the county court. Claims cannot be issued to the High Court using this service\n* have an address in England or Wales and an email address\n* able to pay the full issue fee using Payment by Account (PBA) or card payment\n* serving a claim form in English\n\nThe claimant must:\n\n* have an address in England or Wales\n* not have a civil proceedings order, civil restraint order, or all proceedings order against them\n\nThe claim you’re issuing must not:\n* Contain interest with a breakdown for different periods of time or items\n* ordinarily follow the Part 8 procedure\n* be brought under the Consumer Credit Act 1974\n* be against the Crown", "FieldType": "Label", "SecurityClassification": "Public", "Searchable": "N" diff --git a/ccd-definition/CaseField/CaseFieldLRspec-CUI.json b/ccd-definition/CaseField/CaseFieldLRspec-CUI.json index 37e47d2973..d2e18a354a 100644 --- a/ccd-definition/CaseField/CaseFieldLRspec-CUI.json +++ b/ccd-definition/CaseField/CaseFieldLRspec-CUI.json @@ -196,6 +196,14 @@ "SecurityClassification": "Public", "Searchable": "N" }, + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "ID": "ccjPaymentPaidSomeLabelInsetHelpText", + "Label": "
The system only allows interest to be calculated on the full claim amount. If you have received any part payment and you are requesting a CCJ, please use form N225. If you have received any part payment and you are requesting a Judgment on a Part Admission response, please use form N225a. You can calculate the correct interest, and send to contactocmc@justice.gov.uk
", + "FieldType": "Label", + "SecurityClassification": "Public", + "Searchable": "N" + }, { "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", "ID": "ccjPaymentPaidSomeAmount", @@ -204,6 +212,7 @@ "SecurityClassification": "Public", "Searchable": "N" }, + { "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", "ID": "partAdmitPaidValuePounds", diff --git a/ccd-definition/CaseField/CaseFieldLRspec-FixedCosts-nonprod.json b/ccd-definition/CaseField/CaseFieldLRspec-FixedCosts-nonprod.json index 40efea0a70..496efa97b0 100644 --- a/ccd-definition/CaseField/CaseFieldLRspec-FixedCosts-nonprod.json +++ b/ccd-definition/CaseField/CaseFieldLRspec-FixedCosts-nonprod.json @@ -23,14 +23,6 @@ "SecurityClassification": "Public", "Searchable": "N" }, - { - "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", - "ID": "showOldDJFixedCostsScreen", - "Label": " ", - "FieldType": "YesOrNo", - "SecurityClassification": "Public", - "Searchable": "N" - }, { "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", "ID": "claimFixedCostsOnEntryDJ", diff --git a/ccd-definition/CaseField/CaseFieldLRspec-FixedCosts.json b/ccd-definition/CaseField/CaseFieldLRspec-FixedCosts.json new file mode 100644 index 0000000000..a3d5c90d0f --- /dev/null +++ b/ccd-definition/CaseField/CaseFieldLRspec-FixedCosts.json @@ -0,0 +1,10 @@ +[ + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "ID": "showOldDJFixedCostsScreen", + "Label": " ", + "FieldType": "YesOrNo", + "SecurityClassification": "Public", + "Searchable": "N" + } +] diff --git a/ccd-definition/CaseField/CaseFieldLRspec-prod.json b/ccd-definition/CaseField/CaseFieldLRspec-prod.json index a6c9878feb..e5a3caac43 100644 --- a/ccd-definition/CaseField/CaseFieldLRspec-prod.json +++ b/ccd-definition/CaseField/CaseFieldLRspec-prod.json @@ -2,7 +2,7 @@ { "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", "ID": "specEligibilityQuestions", - "Label": "## Issue civil court proceedings\nTo use this service you must be:\n* issuing a claim for a specified (fixed) amount of money\n* have an address in England or Wales and an email address\n* able to pay the full issue fee using Payment by Account (PBA) or card payment\n* serving a claim form in English\n\nThe claimant must:\n\n* have an address in England or Wales\n* not have a civil proceedings order, civil restraint order, or all proceedings order against them\n\nThe claim you’re issuing must not:\n* ordinarily follow the Part 8 procedure\n* be brought under the Consumer Credit Act 1974\n* be against the Crown", + "Label": "## Issue civil court proceedings\nTo use this service you must be:\n* issuing a claim for a specified (fixed) amount of money\n* have an address in England or Wales and an email address\n* able to pay the full issue fee using Payment by Account (PBA) or card payment\n* serving a claim form in English\n\nThe claimant must:\n\n* have an address in England or Wales\n* not have a civil proceedings order, civil restraint order, or all proceedings order against them\n\nThe claim you’re issuing must not:\n* Contain interest with a breakdown for different periods of time or items\n* ordinarily follow the Part 8 procedure\n* be brought under the Consumer Credit Act 1974\n* be against the Crown", "FieldType": "Label", "SecurityClassification": "Public", "Searchable": "N" diff --git a/ccd-definition/FixedLists/InterestClaimFromLRspec.json b/ccd-definition/FixedLists/InterestClaimFromLRspec.json index ed9d102432..af92fa999d 100644 --- a/ccd-definition/FixedLists/InterestClaimFromLRspec.json +++ b/ccd-definition/FixedLists/InterestClaimFromLRspec.json @@ -2,8 +2,8 @@ { "ID": "InterestClaimFrom", "ListElementCode": "FROM_CLAIM_SUBMIT_DATE", - "ListElement": "The date you submit the claim", - "HintText": "The date you submit the claim", + "ListElement": "The date you submit the claim. \n\n\n The interest will then be calculated up until the claim is settled or a judgment has been made.", + "HintText": "The interest will then be calculated up until the claim is settled or a judgment has been made.", "DisplayOrder": 1 }, { diff --git a/ccd-definition/FixedLists/InterestClaimUntilLRspec.json b/ccd-definition/FixedLists/InterestClaimUntilLRspec.json index 6b11405453..06942ae8c5 100644 --- a/ccd-definition/FixedLists/InterestClaimUntilLRspec.json +++ b/ccd-definition/FixedLists/InterestClaimUntilLRspec.json @@ -2,8 +2,8 @@ { "ID": "InterestClaimUntil", "ListElementCode": "UNTIL_CLAIM_SUBMIT_DATE", - "ListElement": "When you submit the claim. \nIf you submit after 4pm it will be next working day.", - "HintText": "If you submit after 4pm it will be next working day.", + "ListElement": "When you submit the claim.", + "HintText": "When you submit the claim.", "DisplayOrder": 1 }, { diff --git a/ccd-definition/FixedLists/InterestOptionsLRspec.json b/ccd-definition/FixedLists/InterestOptionsLRspec.json index 12eff87308..0760321e32 100644 --- a/ccd-definition/FixedLists/InterestOptionsLRspec.json +++ b/ccd-definition/FixedLists/InterestOptionsLRspec.json @@ -8,7 +8,8 @@ { "ID": "InterestOptions", "ListElementCode": "BREAK_DOWN_INTEREST", - "ListElement": "Break down interest for different periods of time, or items", + "ListElement": "Break down interest for different periods of time, or items. \n\n\n You can only use this service if any claim for interest is made at the same rate and from the same date. To claim interest at different rates or for different periods of time, you should issue your claim on paper", + "HintText": "You can only use this service if any claim for interest is made at the same rate and from the same date. To claim interest at different rates or for different periods of time, you should issue your claim on paper", "DisplayOrder": 2 } ] diff --git a/e2e/fixtures/exampleDOC.docx b/e2e/fixtures/exampleDOC.docx new file mode 100644 index 0000000000..7fb537dd23 Binary files /dev/null and b/e2e/fixtures/exampleDOC.docx differ diff --git a/e2e/fragments/dq/fixedRecoverableCosts.page.js b/e2e/fragments/dq/fixedRecoverableCosts.page.js index 7187164d46..655b242bdf 100644 --- a/e2e/fragments/dq/fixedRecoverableCosts.page.js +++ b/e2e/fragments/dq/fixedRecoverableCosts.page.js @@ -12,6 +12,20 @@ module.exports = { no: `#${party}DQFixedRecoverableCosts_isSubjectToFixedRecoverableCostRegime_No` } }, + intFixedRecoverableCostRegime: { + id: `#${party}DQFixedRecoverableCostsIntermediate_isSubjectToFixedRecoverableCostRegime`, + options: { + yes: `#${party}DQFixedRecoverableCostsIntermediate_isSubjectToFixedRecoverableCostRegime_Yes`, + no: `#${party}DQFixedRecoverableCostsIntermediate_isSubjectToFixedRecoverableCostRegime_No` + } + }, + isComplexityBandingAgreed: { + id: `#${party}DQFixedRecoverableCostsIntermediate_complexityBandingAgreed`, + options: { + yes: `#${party}DQFixedRecoverableCostsIntermediate_complexityBandingAgreed_Yes`, + no: `#${party}DQFixedRecoverableCostsIntermediate_complexityBandingAgreed_No` + } + }, band: { id: `#${party}DQFixedRecoverableCosts_band`, options: { @@ -21,6 +35,15 @@ module.exports = { band4: 'BAND_4' } }, + intBand: { + id: `#${party}DQFixedRecoverableCostsIntermediate_band`, + options: { + band1: 'BAND_1', + band2: 'BAND_2', + band3: 'BAND_3', + band4: 'BAND_4' + } + }, complexityBandingAgreed: { id: `#${party}DQFixedRecoverableCosts_complexityBandingAgreed`, options: { @@ -29,6 +52,7 @@ module.exports = { } }, reasons: `#${party}DQFixedRecoverableCosts_reasons`, + intFRCReasons: `#${party}DQFixedRecoverableCostsIntermediate_reasons`, }; }, @@ -52,5 +76,22 @@ module.exports = { await I.clickContinue(); } + }, + + async fixedRecoverableCostsInt(party) { + await within(this.fields(party).intFixedRecoverableCostRegime.id, () => { + I.runAccessibilityTest(); + I.click(`${this.fields(party).intFixedRecoverableCostRegime.options.yes}`); + }); + + await within(this.fields(party).isComplexityBandingAgreed.id, () => { + I.click(`${this.fields(party).isComplexityBandingAgreed.options.yes}`); + }); + + await within(this.fields(party).intBand.id, () => { + I.click(`${this.fields(party).intBand.id}-${this.fields(party).band.options.band2}`); + }); + I.fillField(this.fields(party).intFRCReasons, 'Some good reasons'); + await I.clickContinue(); } }; diff --git a/e2e/fragments/dq/hearing.page.js b/e2e/fragments/dq/hearing.page.js index 596770f849..a1da58c887 100644 --- a/e2e/fragments/dq/hearing.page.js +++ b/e2e/fragments/dq/hearing.page.js @@ -12,7 +12,13 @@ module.exports = { no: `#${party}DQHearing_unavailableDatesRequired_No` } }, - //respondent1DQHearing_unavailableDates_0_unavailableDateType + specHearingAvailableDatesRequired: { + id: `#${party}DQHearingLRspec_unavailableDatesRequired`, + options: { + yes: `#${party}DQHearingLRspec_unavailableDatesRequired_Yes`, + no: `#${party}DQHearingLRspec_unavailableDatesRequired_No` + } + }, unavailableDates: { id: `#${party}DQHearing_unavailableDates`, element: { @@ -41,6 +47,16 @@ module.exports = { await I.clickContinue(); }, + async enterHearingAvailability(party) { + I.waitForElement(this.fields(party).specHearingAvailableDatesRequired.id); + await I.runAccessibilityTest(); + + await within(this.fields(party).specHearingAvailableDatesRequired.id, () => { + I.click(this.fields(party).specHearingAvailableDatesRequired.options.no); + }); + await I.clickContinue(); + }, + async addUnavailableDates(party) { await I.addAnotherElementToCollection(); I.waitForElement(this.fields(party).unavailableDates.element.unavailableDateType.id); diff --git a/e2e/fragments/dq/requestedCourt.page.js b/e2e/fragments/dq/requestedCourt.page.js index b3bfcb4e67..1a1d3a6bef 100644 --- a/e2e/fragments/dq/requestedCourt.page.js +++ b/e2e/fragments/dq/requestedCourt.page.js @@ -23,6 +23,13 @@ module.exports = { no: `#${party}DQRemoteHearing_remoteHearingRequested_No` } }, + remoteHearingSpecRequested: { + id: `#${party}DQRemoteHearingLRspec_remoteHearingRequested`, + options: { + yes: `#${party}DQRemoteHearingLRspec_remoteHearingRequested_Yes`, + no: `#${party}DQRemoteHearingLRspec_remoteHearingRequested_No` + } + }, reasonForRemoteHearing: `#${party}DQRemoteHearing_reasonForRemoteHearing`, reasonForHearingAtSpecificCourt: `#${party}DQRequestedCourt_reasonForHearingAtSpecificCourt`, courtLocation: { @@ -48,4 +55,15 @@ module.exports = { I.fillField(this.fields(party).reasonForRemoteHearing, 'Reason for remote hearing'); await I.clickContinue(); }, + + async selectSpecCourtLocation(party) { + I.waitForElement(this.fields(party).courtLocation.id); + await I.runAccessibilityTest(); + I.selectOption(this.fields(party).courtLocation.id, this.fields(party).courtLocation.options.defendantPreferredCourt); + await within(this.fields(party).remoteHearingSpecRequested.id, () => { + I.click(this.fields(party).remoteHearingSpecRequested.options.no); + }); + await I.clickContinue(); + }, + }; diff --git a/e2e/helpers/party.js b/e2e/helpers/party.js index 89587c0d1d..637cd42814 100644 --- a/e2e/helpers/party.js +++ b/e2e/helpers/party.js @@ -3,4 +3,6 @@ module.exports = { APPLICANT_SOLICITOR_2: 'applicant2', RESPONDENT_SOLICITOR_1: 'respondent1', RESPONDENT_SOLICITOR_2: 'respondent2', + SPEC_APPLICANT_SOLICITOR_1: 'specApplicant1', + }; diff --git a/e2e/pages/createClaim/interestDateStartLRspec.page.js b/e2e/pages/createClaim/interestDateStartLRspec.page.js index f5359a2163..3eb0294a92 100644 --- a/e2e/pages/createClaim/interestDateStartLRspec.page.js +++ b/e2e/pages/createClaim/interestDateStartLRspec.page.js @@ -10,7 +10,7 @@ module.exports = { async selectInterestDateStart() { I.waitForElement(this.fields.interest.id); await I.runAccessibilityTest(); - await I.click('The date you submit the claim. If you submit after 4pm it will be the next working day.'); + await I.click('The date you submit the claim.'); await I.clickContinue(); }, }; diff --git a/e2e/pages/directionsOrder/uploadOrder.page.js b/e2e/pages/directionsOrder/uploadOrder.page.js index dba578abf6..37c1446d05 100644 --- a/e2e/pages/directionsOrder/uploadOrder.page.js +++ b/e2e/pages/directionsOrder/uploadOrder.page.js @@ -24,7 +24,7 @@ module.exports = { }); // Assert that the file was uploaded and its name matches - if (!uploadedFile || !uploadedFile.includes('examplePDF.pdf')) { + if (!uploadedFile || !uploadedFile.includes('exampleDOC.docx')) { throw new Error('File was not uploaded or the file name does not match.'); } diff --git a/e2e/pages/respondToDefence/uploadResponseDocument.page.js b/e2e/pages/respondToDefence/uploadResponseDocument.page.js index b515300d36..f6c8f9ade4 100644 --- a/e2e/pages/respondToDefence/uploadResponseDocument.page.js +++ b/e2e/pages/respondToDefence/uploadResponseDocument.page.js @@ -7,6 +7,9 @@ module.exports = { applicantResponseDocument: { id: '#applicant1DefenceResponseDocument_file' }, + applicantResponseDocumentSpec: { + id: '#applicant1DefenceResponseDocumentSpec_file' + }, ...(mpScenario === 'ONE_V_TWO_TWO_LEGAL_REP') ? { applicantResponseDocumentAgainstDefendant2:{ @@ -28,5 +31,13 @@ module.exports = { } await I.clickContinue(); }, + + async uploadResponseDocumentsSpec (file, mpScenario) { + I.waitForElement(this.fields(mpScenario).applicantResponseDocumentSpec.id); + await I.runAccessibilityTest(); + await I.attachFile(this.fields(mpScenario).applicantResponseDocumentSpec.id, file); + await I.waitForInvisible(locate('.error-message').withText('Uploading...')); + await I.clickContinue(); + }, }; diff --git a/e2e/steps_file.js b/e2e/steps_file.js index 6e1dd2dcad..38e1f1a05c 100644 --- a/e2e/steps_file.js +++ b/e2e/steps_file.js @@ -162,6 +162,7 @@ const SIGNED_OUT_SELECTOR = '#global-header'; const CASE_HEADER = 'ccd-markdown >> h1'; const TEST_FILE_PATH = './e2e/fixtures/examplePDF.pdf'; +const TEST_FILE_PATH_DOC = './e2e/fixtures/exampleDOC.docx'; const CLAIMANT_NAME = 'Test Inc'; const DEFENDANT1_NAME = 'Sir John Doe'; const DEFENDANT2_NAME = 'Dr Foo Bar'; @@ -619,6 +620,41 @@ module.exports = function () { await this.takeScreenshot(); }, + async respondToDefenceMinti(caseId, mpScenario = 'ONE_V_ONE', claimValue = 30000) { + eventName = 'View and respond to defence'; + await this.triggerStepsWithScreenshot([ + () => caseViewPage.startEvent(eventName, caseId), + () => proceedPage.proceedWithClaim(mpScenario), + () => uploadResponseDocumentPage.uploadResponseDocumentsSpec(TEST_FILE_PATH, mpScenario), + ...conditionalSteps(claimValue > 100000, [ + // Multi: Greater than 100k + () => fileDirectionsQuestionnairePage.fileDirectionsQuestionnaire(parties.APPLICANT_SOLICITOR_1), + ]), + ...conditionalSteps(claimValue > 25000 && claimValue <= 100000, [ + // Intermediate: Greater than 25k and less than or equal to 100k + () => fileDirectionsQuestionnairePage.fileDirectionsQuestionnaire(parties.APPLICANT_SOLICITOR_1), + () => fixedRecoverableCostsPage.fixedRecoverableCostsInt(parties.APPLICANT_SOLICITOR_1), + ]), + () => disclosureOfElectronicDocumentsPage. + enterDisclosureOfElectronicDocuments(parties.SPEC_APPLICANT_SOLICITOR_1), + // Disclosure of non-electronic documents (Optional) + () => this.clickContinue(), + () => disclosureReportPage.enterDisclosureReport(parties.APPLICANT_SOLICITOR_1), + () => expertsPage.enterExpertInformation(parties.APPLICANT_SOLICITOR_1), + () => witnessPage.enterWitnessInformation(parties.APPLICANT_SOLICITOR_1), + () => welshLanguageRequirementsPage.enterWelshLanguageRequirements(parties.APPLICANT_SOLICITOR_1), + () => hearingPage.enterHearingAvailability(parties.APPLICANT_SOLICITOR_1), + () => draftDirectionsPage.upload(parties.APPLICANT_SOLICITOR_1, TEST_FILE_PATH), + () => requestedCourtPage.selectSpecCourtLocation(parties.APPLICANT_SOLICITOR_1), + () => hearingSupportRequirementsPage.selectRequirements(parties.APPLICANT_SOLICITOR_1), + () => vulnerabilityQuestionsPage.vulnerabilityQuestions(parties.APPLICANT_SOLICITOR_1), + () => statementOfTruth.enterNameAndRole(parties.APPLICANT_SOLICITOR_1 + 'DQ'), + () => event.submit('Submit your response', 'You have decided to proceed with the claim\nClaim number: '), + () => event.returnToCaseDetails() + ]); + await this.takeScreenshot(); + }, + async transferOnlineCase() { eventName = 'Transfer online case'; await this.triggerStepsWithScreenshot([ @@ -792,7 +828,7 @@ module.exports = function () { ]), () => selectOrderTemplatePage.selectTemplateByText(trackType, optionText), () => downloadOrderTemplatePage.verifyLabelsAndDownload(), - () => uploadOrderPage.verifyLabelsAndUploadDocument(TEST_FILE_PATH), + () => uploadOrderPage.verifyLabelsAndUploadDocument(TEST_FILE_PATH_DOC), () => event.submit('Submit', 'Your order has been issued') ]); }, diff --git a/e2e/tests/ui_tests/minti/spec_minti_LRResponse_test.js b/e2e/tests/ui_tests/minti/spec_minti_LRResponse_test.js new file mode 100644 index 0000000000..c23fa38e66 --- /dev/null +++ b/e2e/tests/ui_tests/minti/spec_minti_LRResponse_test.js @@ -0,0 +1,29 @@ +const config = require('../../../config.js'); +const { createAccount, deleteAccount } = require('../../../api/idamHelper'); +const intermediateTrackClaimAmount = '99000'; +const claimAmountMulti = '200001'; + +Feature('Minti tracks - LR responses @non-prod-e2e-ft'); + +Scenario('LR vs LIP Multi track - LR response', async ({api_spec_cui, I}) => { + const mpScenario = 'ONE_V_ONE'; + await createAccount(config.defendantCitizenUser2.email, config.defendantCitizenUser2.password); + let caseId = await api_spec_cui.createSpecifiedClaimWithUnrepresentedRespondent(config.applicantSolicitorUser, mpScenario, 'MULTI'); + await api_spec_cui.performCitizenDefendantResponse(config.defendantCitizenUser2, caseId, 'MULTI'); + await I.login(config.applicantSolicitorUser); + await I.respondToDefenceMinti(caseId, mpScenario, claimAmountMulti); +}); + +Scenario('LR vs LIP Int track - LR response', async ({api_spec_cui, I}) => { + const mpScenario = 'ONE_V_ONE'; + await createAccount(config.defendantCitizenUser2.email, config.defendantCitizenUser2.password); + let caseId = await api_spec_cui.createSpecifiedClaimWithUnrepresentedRespondent(config.applicantSolicitorUser, 'ONE_V_ONE', 'INTERMEDIATE'); + await api_spec_cui.performCitizenDefendantResponse(config.defendantCitizenUser2, caseId, 'INTERMEDIATE'); + await I.login(config.applicantSolicitorUser); + await I.respondToDefenceMinti(caseId, mpScenario, intermediateTrackClaimAmount); +}); + +AfterSuite(async ({api_spec_cui}) => { + await api_spec_cui.cleanUp(); + await deleteAccount(config.defendantCitizenUser2.email); +});