Skip to content

Commit

Permalink
CIV-14709 Add (opens in a new tab) to notifications links (#5134)
Browse files Browse the repository at this point in the history
* CIV-14709 Add (opens in a new tab) to hearing reqs link

* CIV-14709 Add (opens in a new tab) to view settlement agreement link

* CIV-14709 Add (opens in a new tab) to agreement download link

* CIV-14709 Add (opens in a new tab) to defendant settlement agreement link

---------

Co-authored-by: Raja Mani <[email protected]>
  • Loading branch information
paul-pearson and rajakm authored Jul 26, 2024
1 parent aaa1690 commit 9673b30
Show file tree
Hide file tree
Showing 20 changed files with 40 additions and 40 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -92,13 +92,13 @@ void should_create_mediation_scenario() throws Exception {
jsonPath("$[0].titleEn").value("You settled the claim through mediation"),
jsonPath("$[0].descriptionEn")
.value(
"<p class=\"govuk-body\">You made an agreement which means the claim is now ended and sets out the terms of how Mr. Sole Trader must repay you.</p><p class=\"govuk-body\"><a href=\"{MEDIATION_SUCCESSFUL_URL}\" rel=\"noopener noreferrer\" class=\"govuk-link\" target=\"_blank\">Download the agreement</a></p>"),
"<p class=\"govuk-body\">You made an agreement which means the claim is now ended and sets out the terms of how Mr. Sole Trader must repay you.</p><p class=\"govuk-body\"><a href=\"{MEDIATION_SUCCESSFUL_URL}\" rel=\"noopener noreferrer\" class=\"govuk-link\" target=\"_blank\">Download the agreement (opens in a new tab)</a></p>"),
jsonPath("$[0].titleCy").value("Rydych wedi setlo’r hawliad drwy gyfryngu"),
jsonPath("$[0].descriptionCy")
.value(
"<p class=\"govuk-body\">Mi wnaethoch gytundeb sy’n golygu bod yr hawliad nawr ar ben. " +
"Mae’r cytundeb yn nodi’r telerau ar gyfer sut mae'n rhaid i Mr. Sole Trader eich ad-dalu.</p>" +
"<p class=\"govuk-body\"><a href=\"{MEDIATION_SUCCESSFUL_URL}\" rel=\"noopener noreferrer\" class=\"govuk-link\" target=\"_blank\">Lawrlwytho’r cytundeb</a></p>"
"<p class=\"govuk-body\"><a href=\"{MEDIATION_SUCCESSFUL_URL}\" rel=\"noopener noreferrer\" class=\"govuk-link\" target=\"_blank\">Lawrlwytho’r cytundeb (yn agor mewn tab newydd)</a></p>"
)
);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,11 @@ void should_create_defendant_accepts_settlement_agreement() throws Exception {
jsonPath("$[0].titleEn").value(
"Settlement agreement"),
jsonPath("$[0].descriptionEn").value(
"<p class=\"govuk-body\">Dave Indent has accepted the settlement agreement. You cannot <a href=\"{COUNTY_COURT_JUDGEMENT_URL}\" rel=\"noopener noreferrer\" class=\"govuk-link\">request a County Court Judgment(CCJ)</a>, unless they break the terms of the agreement.</p> <p class=\"govuk-body\">You can <a href=\"{DOWNLOAD_SETTLEMENT_AGREEMENT}\" target=\"_blank\" rel=\"noopener noreferrer\" class=\"govuk-link\">view the settlement agreement</a> or <a href=\"{TELL_US_IT_IS_SETTLED}\" rel=\"noopener noreferrer\" class=\"govuk-link\">tell us it's settled</a>.</p>"),
"<p class=\"govuk-body\">Dave Indent has accepted the settlement agreement. You cannot <a href=\"{COUNTY_COURT_JUDGEMENT_URL}\" rel=\"noopener noreferrer\" class=\"govuk-link\">request a County Court Judgment(CCJ)</a>, unless they break the terms of the agreement.</p> <p class=\"govuk-body\">You can <a href=\"{DOWNLOAD_SETTLEMENT_AGREEMENT}\" target=\"_blank\" rel=\"noopener noreferrer\" class=\"govuk-link\">view the settlement agreement (opens in a new tab)</a> or <a href=\"{TELL_US_IT_IS_SETTLED}\" rel=\"noopener noreferrer\" class=\"govuk-link\">tell us it's settled</a>.</p>"),
jsonPath("$[0].titleCy").value(
"Cytundeb setlo"),
jsonPath("$[0].descriptionCy").value(
"<p class=\"govuk-body\">Mae Dave Indent wedi derbyn y cytundeb setlo. Ni allwch <a href=\"{COUNTY_COURT_JUDGEMENT_URL}\" rel=\"noopener noreferrer\" class=\"govuk-link\">wneud cais am Ddyfarniad Llys Sirol(CCJ)</a>, oni bai eu bod yn torri telerau’r cytundeb.</p> <p class=\"govuk-body\">Gallwch <a href=\"{DOWNLOAD_SETTLEMENT_AGREEMENT}\" target=\"_blank\" rel=\"noopener noreferrer\" class=\"govuk-link\"> weld y cytundeb setlo</a> neu <a href=\"{TELL_US_IT_IS_SETTLED}\" rel=\"noopener noreferrer\" class=\"govuk-link\">ddweud wrthym ei fod wedi’i setlo</a>.</p>")
"<p class=\"govuk-body\">Mae Dave Indent wedi derbyn y cytundeb setlo. Ni allwch <a href=\"{COUNTY_COURT_JUDGEMENT_URL}\" rel=\"noopener noreferrer\" class=\"govuk-link\">wneud cais am Ddyfarniad Llys Sirol(CCJ)</a>, oni bai eu bod yn torri telerau’r cytundeb.</p> <p class=\"govuk-body\">Gallwch <a href=\"{DOWNLOAD_SETTLEMENT_AGREEMENT}\" target=\"_blank\" rel=\"noopener noreferrer\" class=\"govuk-link\"> weld y cytundeb setlo (yn agor mewn tab newydd)</a> neu <a href=\"{TELL_US_IT_IS_SETTLED}\" rel=\"noopener noreferrer\" class=\"govuk-link\">ddweud wrthym ei fod wedi’i setlo</a>.</p>")

);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,13 @@ void should_create_go_to_hearing_scenario() throws Exception {
.value(
"<p class=\"govuk-body\">Mr. John Rambo wants to proceed with the claim. They said no to mediation." +
" The case will be referred to a judge who will decide what should happen next.</p> <p class=\"govuk-body\">You can <a href={VIEW_RESPONSE_TO_CLAIM} class=\"govuk-link\">view your" +
" response</a> or <a target=\"_blank\" href={VIEW_CLAIMANT_HEARING_REQS} rel=\"noopener noreferrer\" class=\"govuk-link\">view the claimant's hearing requirements</a>.</p>"),
" response</a> or <a target=\"_blank\" href={VIEW_CLAIMANT_HEARING_REQS} rel=\"noopener noreferrer\" class=\"govuk-link\">view the claimant's hearing requirements (opens in a new tab)</a>.</p>"),
jsonPath("$[0].titleCy").value("Aros i’r llys adolygu’r achos"),
jsonPath("$[0].descriptionCy")
.value(
"<p class=\"govuk-body\">Mae Mr. John Rambo eisiau parhau â’r hawliad. Mi wnaethant wrthod rhoi cynnig ar gyfryngu." +
" Bydd yr achos yn cael ei gyfeirio at farnwr a fydd yn penderfynu beth ddylai ddigwydd nesaf.</p> <p class=\"govuk-body\">Gallwch" +
" <a href={VIEW_RESPONSE_TO_CLAIM} class=\"govuk-link\">weld eich ymateb</a> neu <a target=\"_blank\" href={VIEW_CLAIMANT_HEARING_REQS} rel=\"noopener noreferrer\" class=\"govuk-link\">weld gofynion ar gyfer y gwrandawiad yr hawlydd</a>.</p>")
" <a href={VIEW_RESPONSE_TO_CLAIM} class=\"govuk-link\">weld eich ymateb</a> neu <a target=\"_blank\" href={VIEW_CLAIMANT_HEARING_REQS} rel=\"noopener noreferrer\" class=\"govuk-link\">weld gofynion ar gyfer y gwrandawiad yr hawlydd (yn agor mewn tab newydd)</a>.</p>")
);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,13 @@ void should_create_scenario_for_claim_settled() throws Exception {
.value("<p class=\"govuk-body\">Mr. John Rambo wants to proceed with the claim." +
" The case will be referred to a judge who will decide what should happen next.</p>" +
"<p class=\"govuk-body\">You can <a href=\"{VIEW_RESPONSE_TO_CLAIM}\" class=\"govuk-link\">view your response</a> or " +
"<a href=\"{VIEW_CLAIMANT_HEARING_REQS}\" rel=\"noopener noreferrer\" class=\"govuk-link\" target=\"_blank\">view the claimant's hearing requirements</a>.</p>"),
"<a href=\"{VIEW_CLAIMANT_HEARING_REQS}\" rel=\"noopener noreferrer\" class=\"govuk-link\" target=\"_blank\">view the claimant's hearing requirements (opens in a new tab)</a>.</p>"),
jsonPath("$[0].titleCy").value("Aros i’r llys adolygu’r achos"),
jsonPath("$[0].descriptionCy").value(
"<p class=\"govuk-body\">Mae Mr. John Rambo eisiau parhau â’r hawliad." +
" Bydd yr achos yn cael ei gyfeirio at farnwr a fydd yn penderfynu beth ddylai ddigwydd nesaf.</p>" +
"<p class=\"govuk-body\">Gallwch <a href=\"{VIEW_RESPONSE_TO_CLAIM}\" class=\"govuk-link\">weld eich ymateb</a> neu " +
"<a href=\"{VIEW_CLAIMANT_HEARING_REQS}\" rel=\"noopener noreferrer\" class=\"govuk-link\" target=\"_blank\">weld gofynion ar gyfer y gwrandawiad yr hawlydd</a>.</p>")
"<a href=\"{VIEW_CLAIMANT_HEARING_REQS}\" rel=\"noopener noreferrer\" class=\"govuk-link\" target=\"_blank\">weld gofynion ar gyfer y gwrandawiad yr hawlydd (yn agor mewn tab newydd)</a>.</p>")
);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,14 @@ void should_create_mediation_successful_scenario() throws Exception {
jsonPath("$[0].titleEn").value("You settled the claim through mediation"),
jsonPath("$[0].descriptionEn")
.value(
"<p class=\"govuk-body\">You made an agreement which means the claim is now ended and sets out the terms of how you must repay Mr. John Rambo.</p> <p class=\"govuk-body\"><a href=\"{MEDIATION_SUCCESSFUL_URL}\" target=\"_blank\" rel=\"noopener noreferrer\" class=\"govuk-link\">Download the agreement</a></p> <p class=\"govuk-body\"><a href=\"{CITIZEN_CONTACT_THEM_URL}\" rel=\"noopener noreferrer\" class=\"govuk-link\">Contact Mr. John Rambo</a> if you need their payment details. Make sure you get receipts for any payments.</p>"),
"<p class=\"govuk-body\">You made an agreement which means the claim is now ended and sets out the terms of how you must repay Mr. John Rambo.</p> <p class=\"govuk-body\"><a href=\"{MEDIATION_SUCCESSFUL_URL}\" target=\"_blank\" rel=\"noopener noreferrer\" class=\"govuk-link\">Download the agreement (opens in a new tab)</a></p> <p class=\"govuk-body\"><a href=\"{CITIZEN_CONTACT_THEM_URL}\" rel=\"noopener noreferrer\" class=\"govuk-link\">Contact Mr. John Rambo</a> if you need their payment details. Make sure you get receipts for any payments.</p>"),
jsonPath("$[0].titleCy").value("Rydych wedi setlo’r hawliad drwy gyfryngu"),
jsonPath("$[0].descriptionCy")
.value(
"<p class=\"govuk-body\">Mi wnaethoch gytundeb sy’n golygu bod yr hawliad nawr ar ben. Mae’r " +
"cytundeb yn nodi’r telerau ar gyfer sut mae rhaid i chi ad-dalu Mr. John Rambo.</p> " +
"<p class=\"govuk-body\"><a href=\"{MEDIATION_SUCCESSFUL_URL}\" target=\"_blank\" rel=\"noopener noreferrer\" " +
"class=\"govuk-link\">Lawrlwytho’r cytundeb</a></p> <p class=\"govuk-body\">" +
"class=\"govuk-link\">Lawrlwytho’r cytundeb (yn agor mewn tab newydd)</a></p> <p class=\"govuk-body\">" +
"<a href=\"{CITIZEN_CONTACT_THEM_URL}\" rel=\"noopener noreferrer\" class=\"govuk-link\">Cysylltwch â " +
"Mr. John Rambo</a> ios oes arnoch angen eu manylion talu. Gwnewch yn siŵr eich bod yn cael derbynebau am unrhyw daliadau.</p>")
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,14 +52,14 @@ void should_create_scenario_for_claimant_reject_for_not_paid_defendant_notificat
+ " They said you have not paid the £1000 you admit you owe."
+ " The case will be referred to a judge who will decide what should happen next.</p>"
+ "<p class=\"govuk-body\">You can <a href=\"{VIEW_RESPONSE_TO_CLAIM}\" rel=\"noopener noreferrer\" class=\"govuk-link\">view your response</a> or "
+ "<a target=\"_blank\" href=\"{VIEW_CLAIMANT_HEARING_REQS}\" rel=\"noopener noreferrer\" class=\"govuk-link\">view the claimant's hearing requirements</a>.</p>"),
+ "<a target=\"_blank\" href=\"{VIEW_CLAIMANT_HEARING_REQS}\" rel=\"noopener noreferrer\" class=\"govuk-link\">view the claimant's hearing requirements (opens in a new tab)</a>.</p>"),
jsonPath("$[0].descriptionCy")
.value(
"<p class=\"govuk-body\">Mae Mr. John Rambo eisiau parhau â’r hawliad."
+ " Maent yn dweud nad ydych wedi talu £1000 sef y swm rydych yn cyfaddef sy’n ddyledus gennych."
+ " Bydd yr achos yn cael ei gyfeirio at farnwr a fydd yn penderfynu beth ddylai ddigwydd nesaf.</p>"
+ "<p class=\"govuk-body\">Gallwch <a href=\"{VIEW_RESPONSE_TO_CLAIM}\" rel=\"noopener noreferrer\" class=\"govuk-link\">weld eich ymateb</a> neu "
+ "<a target=\"_blank\" href=\"{VIEW_CLAIMANT_HEARING_REQS}\" rel=\"noopener noreferrer\" class=\"govuk-link\">weld gofynion ar gyfer y gwrandawiad yr hawlydd</a>.</p>")
+ "<a target=\"_blank\" href=\"{VIEW_CLAIMANT_HEARING_REQS}\" rel=\"noopener noreferrer\" class=\"govuk-link\">weld gofynion ar gyfer y gwrandawiad yr hawlydd (yn agor mewn tab newydd)</a>.</p>")
);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,10 @@ void should_create_mediation_unsuccessful_scenario() throws Exception {
status().is(HttpStatus.OK.value()),
jsonPath("$[0].titleEn").value("Mediation was unsuccessful"),
jsonPath("$[0].descriptionEn").value(
"<p class=\"govuk-body\">You weren\'t able to resolve John Doe\'s claim against you using mediation. The court will review the case. We\'ll contact you to tell you what to do next. <a href={VIEW_CLAIMANT_HEARING_REQS} target=\"_blank\" class=\"govuk-link\">View John Doe\'s hearing requirements</a>.</p>"),
"<p class=\"govuk-body\">You weren\'t able to resolve John Doe\'s claim against you using mediation. The court will review the case. We\'ll contact you to tell you what to do next. <a href={VIEW_CLAIMANT_HEARING_REQS} target=\"_blank\" class=\"govuk-link\">View John Doe\'s hearing requirements (opens in a new tab)</a>.</p>"),
jsonPath("$[0].titleCy").value("Nid oedd y cyfryngu yn llwyddiannus"),
jsonPath("$[0].descriptionCy").value(
"<p class=\"govuk-body\">Nid oeddech yn gallu datrys hawliad John Doe yn eich erbyn drwy gyfryngu. Bydd y llys yn adolygu’r achos. Mi wnawn gysylltu â chi i ddweud wrthych beth i’w wneud nesaf. <a href={VIEW_CLAIMANT_HEARING_REQS} target=\"_blank\" class=\"govuk-link\">Gweld gofynion ar gyfer y gwrandawiad John Doe</a>.</p>"));
"<p class=\"govuk-body\">Nid oeddech yn gallu datrys hawliad John Doe yn eich erbyn drwy gyfryngu. Bydd y llys yn adolygu’r achos. Mi wnawn gysylltu â chi i ddweud wrthych beth i’w wneud nesaf. <a href={VIEW_CLAIMANT_HEARING_REQS} target=\"_blank\" class=\"govuk-link\">Gweld gofynion ar gyfer y gwrandawiad John Doe (yn agor mewn tab newydd)</a>.</p>"));
}

@Test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,12 @@ void should_create_scenario_for_defendant_accept_defendant_plan_settlement_agree
.value(
"<p class=\"govuk-body\">You have accepted the "
+ "<a href={VIEW_SETTLEMENT_AGREEMENT} target=\"_blank\" class=\"govuk-link\"> settlement"
+ " agreement</a>. The claimant cannot request a County Court "
+ " agreement (opens in a new tab)</a>. The claimant cannot request a County Court "
+ "Judgment (CCJ), unless you break the terms of the agreement.</p>"),
jsonPath("$[0].titleCy").value("Cytundeb setlo"),
jsonPath("$[0].descriptionCy")
.value(
"<p class=\"govuk-body\">Rydych wedi derbyn y <a href={VIEW_SETTLEMENT_AGREEMENT} target=\"_blank\" class=\"govuk-link\"> cytundeb setlo</a>." +
"<p class=\"govuk-body\">Rydych wedi derbyn y <a href={VIEW_SETTLEMENT_AGREEMENT} target=\"_blank\" class=\"govuk-link\"> cytundeb setlo (yn agor mewn tab newydd)</a>." +
" Ni all yr hawlydd wneud cais am Ddyfarniad Llys Sirol (CCJ) oni bai eich bod yn torri telerau’r cytundeb.</p>")
);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,15 +48,15 @@ void should_create_go_to_hearing_scenario_defendant_part_admit() throws Exceptio
" The case will be referred to a judge who will decide what should happen next.</p>" +
"<p class=\"govuk-body\">You can <a href={VIEW_RESPONSE_TO_CLAIM} class=\"govuk-link\">view your response</a>" +
" or <a href={VIEW_CLAIMANT_HEARING_REQS} target=\"_blank\" class=\"govuk-link\">" +
"view the claimant's hearing requirements</a>.</p>"),
"view the claimant's hearing requirements (opens in a new tab)</a>.</p>"),
jsonPath("$[0].titleCy").value("Aros i’r llys adolygu’r achos"),
jsonPath("$[0].descriptionCy")
.value("<p class=\"govuk-body\">Mae Mr. John Rambo eisiau parhau â’r hawliad." +
" Maent wedi gwrthod eich addefiad o £700." +
" Bydd yr achos yn cael ei gyfeirio at farnwr a fydd yn penderfynu beth ddylai ddigwydd nesaf.</p>" +
"<p class=\"govuk-body\">Gallwch <a href={VIEW_RESPONSE_TO_CLAIM} class=\"govuk-link\">weld eich ymateb</a>" +
" neu <a href={VIEW_CLAIMANT_HEARING_REQS} target=\"_blank\" class=\"govuk-link\">" +
"weld gofynion ar gyfer y gwrandawiad yr hawlydd</a>.</p>")
"weld gofynion ar gyfer y gwrandawiad yr hawlydd (yn agor mewn tab newydd)</a>.</p>")
);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -53,14 +53,14 @@ void should_create_scenario_for_judicial_referral_full_defence_or_part_admit_pai
+ " The case will be referred to a judge who will decide what should happen next.</p>"
+ "<p class=\"govuk-body\">You can <a href=\"{VIEW_RESPONSE_TO_CLAIM}\" rel=\"noopener noreferrer\" class=\"govuk-link\">view your response</a> or "
+ "<a target=\"_blank\" href=\"{VIEW_CLAIMANT_HEARING_REQS}\" rel=\"noopener noreferrer\" "
+ "class=\"govuk-link\">view the claimant's hearing requirements</a>.</p>"),
+ "class=\"govuk-link\">view the claimant's hearing requirements (opens in a new tab)</a>.</p>"),
jsonPath("$[0].descriptionCy")
.value("<p class=\"govuk-body\">Mae Mr. John Rambo eisiau parhau â’r hawliad."
+ " Maent wedi gwrthod eich addefiad o £3000 ond yn derbyn eich bod wedi’i dalu’n barod."
+ " Bydd yr achos yn cael ei gyfeirio at farnwr a fydd yn penderfynu beth ddylai ddigwydd nesaf.</p>"
+ "<p class=\"govuk-body\">Gallwch <a href=\"{VIEW_RESPONSE_TO_CLAIM}\" rel=\"noopener noreferrer\" class=\"govuk-link\">weld eich ymateb</a> neu "
+ "<a target=\"_blank\" href=\"{VIEW_CLAIMANT_HEARING_REQS}\" rel=\"noopener noreferrer\" "
+ "class=\"govuk-link\">weld gofynion ar gyfer y gwrandawiad yr hawlydd</a>.</p>")
+ "class=\"govuk-link\">weld gofynion ar gyfer y gwrandawiad yr hawlydd (yn agor mewn tab newydd)</a>.</p>")
);
}
}
Loading

0 comments on commit 9673b30

Please sign in to comment.