diff --git a/integration-tests/integration/createIncident/view-your-report.cy.js b/integration-tests/integration/createIncident/view-your-report.cy.js index 3e438553..5789d9ba 100644 --- a/integration-tests/integration/createIncident/view-your-report.cy.js +++ b/integration-tests/integration/createIncident/view-your-report.cy.js @@ -134,8 +134,8 @@ context('A reporter views their own report', () => { const yourReportPage = YourReportPage.verifyOnPage() yourReportPage.location().contains('–') - yourReportPage.batonDrawnAgainstPrisonerLabel().contains('Was a baton drawn against the prisoner?') - yourReportPage.pavaDrawnAgainstPrisonerLabel().contains('Was PAVA drawn against the prisoner?') + yourReportPage.batonDrawnAgainstPrisonerLabel().contains('Was a baton drawn by anyone against this prisoner?') + yourReportPage.pavaDrawnAgainstPrisonerLabel().contains('Was PAVA drawn by anyone against this prisoner?') }) it('A user can view reports and it will show the old version of the Baton and PAVA questions', () => { diff --git a/integration-tests/pages/createReport/selectPrimaryUofReasonPage.js b/integration-tests/pages/createReport/selectPrimaryUofReasonPage.js index 0ed73293..f0ae38d1 100644 --- a/integration-tests/pages/createReport/selectPrimaryUofReasonPage.js +++ b/integration-tests/pages/createReport/selectPrimaryUofReasonPage.js @@ -12,7 +12,9 @@ const selectPrimaryUofReasonPage = () => }, () => { cy.get('h1').contains('Use of force details') - cy.get('legend.govuk-fieldset__legend--l').contains('What was the primary reason use of force was applied?') + cy.get('legend.govuk-fieldset__legend--l').contains( + 'What was the primary reason use of force was applied against this prisoner?' + ) } ) diff --git a/integration-tests/pages/createReport/selectUofReasonsPage.js b/integration-tests/pages/createReport/selectUofReasonsPage.js index 16038051..af7fdaef 100644 --- a/integration-tests/pages/createReport/selectUofReasonsPage.js +++ b/integration-tests/pages/createReport/selectUofReasonsPage.js @@ -14,7 +14,7 @@ const selectUofReasonsPage = () => }, () => { cy.get('h1').contains('Use of force details') - cy.get('legend.govuk-fieldset__legend--l').contains('Why was use of force applied?') + cy.get('legend.govuk-fieldset__legend--l').contains('Why was use of force applied against this prisoner?') } ) diff --git a/server/routes/creatingReports/checkYourAnswers.test.ts b/server/routes/creatingReports/checkYourAnswers.test.ts index 251620d4..99b1a278 100644 --- a/server/routes/creatingReports/checkYourAnswers.test.ts +++ b/server/routes/creatingReports/checkYourAnswers.test.ts @@ -71,7 +71,7 @@ describe('GET /check-your-answers', () => { .expect(200) .expect('Content-Type', /html/) .expect(res => { - expect(res.text).not.toContain('Which pain inducing techniques were used?') + expect(res.text).not.toContain('Which pain inducing techniques were used against this prisoner?') }) }) @@ -98,7 +98,7 @@ describe('GET /check-your-answers', () => { .expect(200) .expect('Content-Type', /html/) .expect(res => { - expect(res.text).toContain('Which pain inducing techniques were used?') + expect(res.text).toContain('Which pain inducing techniques were used against this prisoner?') }) }) @@ -125,7 +125,7 @@ describe('GET /check-your-answers', () => { .expect(200) .expect('Content-Type', /html/) .expect(res => { - expect(res.text).toContain('Which pain inducing techniques were used?') + expect(res.text).toContain('Which pain inducing techniques were used against this prisoner?') }) }) @@ -151,7 +151,7 @@ describe('GET /check-your-answers', () => { .expect(200) .expect('Content-Type', /html/) .expect(res => { - expect(res.text).toContain('Which pain inducing techniques were used?') + expect(res.text).toContain('Which pain inducing techniques were used against this prisoner?') }) }) it('Should contain prisoner compliant', () => { diff --git a/server/routes/creatingReports/whyWasUoFApplied.test.ts b/server/routes/creatingReports/whyWasUoFApplied.test.ts index 8186ce41..7c79f830 100644 --- a/server/routes/creatingReports/whyWasUoFApplied.test.ts +++ b/server/routes/creatingReports/whyWasUoFApplied.test.ts @@ -35,7 +35,7 @@ describe('/why-was-uof-applied', () => { .get(paths.whyWasUofApplied(-19)) .expect('Content-Type', /html/) .expect(res => { - expect(res.text).toContain('Why was use of force applied?') + expect(res.text).toContain('Why was use of force applied against this prisoner?') expect(res.text).toContain(UofReasons.ASSAULT_BY_A_MEMBER_OF_PUBLIC.label) }) }) @@ -131,7 +131,7 @@ describe('/what-was-the-primary-reason-of-uof', () => { .get(paths.whatWasPrimaryReasonForUoF(-19)) .expect('Content-Type', /html/) .expect(res => { - expect(res.text).toContain('What was the primary reason use of force was applied?') + expect(res.text).toContain('What was the primary reason use of force was applied against this prisoner?') expect(res.text).toContain(UofReasons.ASSAULT_ON_ANOTHER_PRISONER.label) expect(res.text).toContain(UofReasons.HOSTAGE_NTRG.label) // Not present as reasons from flash used rather than DB @@ -150,7 +150,7 @@ describe('/what-was-the-primary-reason-of-uof', () => { .get(paths.whatWasPrimaryReasonForUoF(-19)) .expect('Content-Type', /html/) .expect(res => { - expect(res.text).toContain('What was the primary reason use of force was applied?') + expect(res.text).toContain('What was the primary reason use of force was applied against this prisoner?') expect(res.text).toContain(UofReasons.ASSAULT_ON_ANOTHER_PRISONER.label) expect(res.text).toContain(UofReasons.ASSAULT_BY_A_MEMBER_OF_PUBLIC.label) }) diff --git a/server/views/formPages/incident/select-primary-uof-reason.html b/server/views/formPages/incident/select-primary-uof-reason.html index a91a67ef..dfa85a76 100644 --- a/server/views/formPages/incident/select-primary-uof-reason.html +++ b/server/views/formPages/incident/select-primary-uof-reason.html @@ -20,7 +20,7 @@