@ministryofjustice/hmpps-probation-integration-e2e-tests 1.120.0 → 1.122.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ministryofjustice/hmpps-probation-integration-e2e-tests",
   "description": "Playwright end to end tests for hmpps-probation-integration-services.",
-  "version": "1.120.0",
+  "version": "1.122.0",
   "license": "MIT",
   "homepage": "https://github.com/ministryofjustice/hmpps-probation-integration-e2e-tests#readme",
   "bugs": {
@@ -21,7 +21,7 @@
     "dotenv": "^17.0.0",
     "luxon": "^3.5.0",
     "node-stream-zip": "^1.15.0",
-    "pdf2json": "^3.1.4"
+    "pdf2json": "^4.0.0"
   },
   "devDependencies": {
     "@types/luxon": "^3.4.2",
@@ -71,6 +71,7 @@
     "./steps/cas1-approved-premises/applications/reallocate": "./steps/cas1-approved-premises/applications/reallocate.mjs",
     "./steps/cas1-approved-premises/applications/release-date-known-status": "./steps/cas1-approved-premises/applications/release-date-known-status.mjs",
     "./steps/cas1-approved-premises/applications/review-prison-information": "./steps/cas1-approved-premises/applications/review-prison-information.mjs",
+    "./steps/cas1-approved-premises/applications/select-ap-placing-reason": "./steps/cas1-approved-premises/applications/select-ap-placing-reason.mjs",
     "./steps/cas1-approved-premises/applications/select-offence": "./steps/cas1-approved-premises/applications/select-offence.mjs",
     "./steps/cas1-approved-premises/applications/select-sentence-type": "./steps/cas1-approved-premises/applications/select-sentence-type.mjs",
     "./steps/cas1-approved-premises/applications/select-situation-option": "./steps/cas1-approved-premises/applications/select-situation-option.mjs",

package/steps/cas1-approved-premises/applications/assess-application.mjs

@@ -22,6 +22,7 @@ const assessApplication = async (page, personName) => {
 	await page.getByRole("group", { name: "Does the application identify the risk factors that an Approved Premises (AP) placement can support?" }).getByLabel("Yes").check();
 	await page.getByRole("group", { name: "Does the application explain how an AP placement would be beneficial for risk management?" }).getByLabel("Yes").check();
 	await page.getByRole("group", { name: "Are there factors to consider regarding the location of placement?" }).getByLabel("No").check();
+	await page.locator("#locationOfPlacementComments").fill("Test risk factors regarding location");
 	await page.getByRole("group", { name: "Is the move on plan sufficient?" }).getByLabel("Yes").check();
 	await page.getByRole("button", { name: "Submit" }).click();
 	await expect(page.locator(".govuk-heading-l")).toHaveText("Application timeliness");
@@ -44,18 +45,9 @@ const assessApplication = async (page, personName) => {
 	await page.getByRole("button", { name: "Submit" }).click();
 	await page.getByRole("link", { name: "Matching information" }).click();
 	await page.getByLabel("Standard AP").check();
-	await page.getByLabel("Is wheelchair designated notRelevant").check();
-	await page.getByLabel("Is single notRelevant").check();
-	await page.getByLabel("Is step free designated notRelevant").check();
-	await page.getByLabel("Is catered notRelevant").check();
-	await page.getByLabel("Has en suite notRelevant").check();
-	await page.getByLabel("Is suited for sex offenders notRelevant").check();
-	await page.getByLabel("Is suitable for vulnerable notRelevant").check();
-	await page.getByLabel("Accepts sex offenders notRelevant").check();
-	await page.getByLabel("Accepts child sex offenders notRelevant").check();
-	await page.getByLabel("Accepts non sexual child offenders notRelevant").check();
-	await page.getByLabel("Accepts hate crime offenders notRelevant").check();
-	await page.getByLabel("Yes").check();
+	await page.getByRole("radio", { name: "Is step free designated required" }).check();
+	await page.getByRole("radio", { name: "Has en suite required" }).check();
+	await page.getByRole("radio", { name: "Yes" }).check();
 	await page.getByRole("button", { name: "Submit" }).click();
 	await page.getByRole("link", { name: "Check assessment answers" }).click();
 	await page.getByRole("button", { name: "Continue" }).click();

package/steps/cas1-approved-premises/applications/select-ap-placing-reason.d.mts

@@ -0,0 +1,6 @@
+import { Page } from "@playwright/test";
+
+//#region steps/cas1-approved-premises/applications/select-ap-placing-reason.d.ts
+declare const selectAPPlacingReason: (page: Page) => Promise<void>;
+//#endregion
+export { selectAPPlacingReason };

package/steps/cas1-approved-premises/applications/select-ap-placing-reason.mjs

@@ -0,0 +1,11 @@
+import { expect } from "@playwright/test";
+
+//#region steps/cas1-approved-premises/applications/select-ap-placing-reason.ts
+const selectAPPlacingReason = async (page) => {
+	await page.getByLabel("Application for risk management/public protection").check();
+	await page.locator(".govuk-button", { hasText: "Save and continue" }).click();
+	await expect(page.locator("#main-content h1")).toHaveText("Do you know the person's release date?");
+};
+
+//#endregion
+export { selectAPPlacingReason };

package/steps/cas1-approved-premises/applications/select-offence.mjs

@@ -2,6 +2,13 @@
 const selectOffence = async (page) => {
 	await page.locator("[name=\"offenceId\"]").check();
 	await page.locator(".govuk-button", { hasText: "Save and continue" }).click();
+	if (await page.locator(".govuk-heading-l", { hasText: "We cannot check this person's tier" }).isVisible()) {
+		await page.getByRole("radio", {
+			name: "High risk",
+			exact: true
+		}).check();
+		await page.locator(".govuk-button", { hasText: "Save and continue" }).click();
+	}
 };
 
 //#endregion

package/steps/cas1-approved-premises/applications/select-sentence-type.mjs

@@ -4,7 +4,7 @@ import { expect } from "@playwright/test";
 const selectSentenceType = async (page) => {
 	await page.getByLabel("Community Order").check();
 	await page.locator(".govuk-button", { hasText: "Save and continue" }).click();
-	await expect(page.locator("#main-content h1")).toHaveText("Which of the following options best describes the situation?");
+	await expect(page.locator("#main-content h1")).toHaveText("What is the reason for placing this person in an AP?");
 };
 
 //#endregion

package/steps/cas1-approved-premises/applications/select-transgender-status.mjs

@@ -25,7 +25,7 @@ const enterSedLedPssDates = async (page) => {
 	await page.locator("#pssEndDate-month").fill(month);
 	await page.locator("#pssEndDate-year").fill(year);
 	await page.locator(".govuk-button", { hasText: "Save and continue" }).click();
-	await expect(page.locator(".govuk-fieldset__heading")).toHaveText("Which of the following best describes the sentence type the person is on?");
+	await expect(page.locator(".govuk-fieldset__heading")).toHaveText("Which sentence type does the person have?");
 };
 
 //#endregion

package/steps/cas1-approved-premises/applications/submit-application-full.mjs

@@ -1,6 +1,5 @@
 import { enterCRN } from "./enter-crn.mjs";
 import { selectSentenceType } from "./select-sentence-type.mjs";
-import { selectSituationOption } from "./select-situation-option.mjs";
 import { selectReleaseDateKnownStatus } from "./release-date-known-status.mjs";
 import { confirmPlacementStartdate } from "./placement-start-date.mjs";
 import { selectAPPlacementPurpose } from "./ap-placement-purpose.mjs";
@@ -18,6 +17,7 @@ import { addFurtherPlacementConsiderations } from "./futher-placement-considerat
 import { addMoveOnInformation } from "./add-move-on-info.mjs";
 import { attachReqrdDocuments } from "./attach-required-documents.mjs";
 import { checkYourAnswers } from "./check-your-answers.mjs";
+import { selectAPPlacingReason } from "./select-ap-placing-reason.mjs";
 import { expect } from "@playwright/test";
 
 //#region steps/cas1-approved-premises/applications/submit-application-full.ts
@@ -28,7 +28,7 @@ const submitAPApplication = async (page, crn) => {
 	await selectTransgenderStatus(page);
 	await enterSedLedPssDates(page);
 	await selectSentenceType(page);
-	await selectSituationOption(page);
+	await selectAPPlacingReason(page);
 	await selectReleaseDateKnownStatus(page);
 	await confirmPlacementStartdate(page);
 	await applicationOutsideNSTimescales(page);

package/steps/cas1-approved-premises/applications/task-list.mjs

@@ -1,10 +1,10 @@
 import { login, navigateToApplications } from "../login.mjs";
 import { enterCRN } from "./enter-crn.mjs";
 import { selectSentenceType } from "./select-sentence-type.mjs";
-import { selectSituationOption } from "./select-situation-option.mjs";
 import { selectReleaseDateKnownStatus } from "./release-date-known-status.mjs";
 import { confirmPlacementStartdate } from "./placement-start-date.mjs";
 import { selectAPPlacementPurpose } from "./ap-placement-purpose.mjs";
+import { selectSituationOption } from "./select-situation-option.mjs";
 import { selectTypeOfAPRequired } from "./select-type-ap-required.mjs";
 import { enterSedLedPssDates, selectTransgenderStatus } from "./select-transgender-status.mjs";
 import { confirmYourDetails } from "./confirm-your-details.mjs";

package/steps/cas3-transitional-accommodation/application.mjs

@@ -6,6 +6,7 @@ import { faker } from "@faker-js/faker";
 async function submitCAS3Referral(page, crn) {
 	await startApplication(page);
 	await searchForPerson(page, crn);
+	await confirmPlacementLocation(page);
 	await addOffenceAndBehaviourSummary(page);
 	await addSentenceInformation(page);
 	await enterContactDetails(page);
@@ -16,7 +17,6 @@ async function submitCAS3Referral(page, crn) {
 	await enterPlacementConsiderations(page);
 	await enterApprovalsForSpecificRisks(page);
 	await outlineBehaviourInCAS(page);
-	await confirmPlacementLocation(page);
 	await addDisabilityCulturalAndSpecificNeeds(page);
 	await addInformationOnSafeguardingAndSupport(page);
 	await provideFoodAllergies(page);
@@ -248,11 +248,11 @@ async function outlineBehaviourInCAS(page) {
 }
 async function confirmPlacementLocation(page) {
 	await page.getByRole("link", { name: "Confirm placement location" }).click();
-	await expect(page).toHaveTitle(/Is placement required/);
-	await page.getByRole("radio", {
-		name: "No",
-		exact: true
-	}).check();
+	await expect(page).toHaveTitle(/Is the placement for the London region/);
+	await page.getByRole("radio", { name: "Yes, London" }).check();
+	await page.getByRole("button", { name: "Save and continue" }).click();
+	await expect(page).toHaveTitle(/Is placement required in a different PDU/);
+	await page.getByRole("radio", { name: "No" }).check();
 	await page.getByRole("button", { name: "Save and continue" }).click();
 	await expect(page).toHaveTitle("Make a referral for Transitional Accommodation (CAS3) - Transitional Accommodation (CAS3)");
 	await expect(page.locator("#placement-location-status")).toHaveText("Completed");

package/steps/cvl-licences/application.mjs

@@ -1,6 +1,6 @@
 import { login, loginAsPrisonOfficer } from "./login.mjs";
 import { expect } from "@playwright/test";
-import { faker } from "@faker-js/faker";
+import { faker } from "@faker-js/faker/locale/en_GB";
 
 //#region steps/cvl-licences/application.ts
 const createLicence = async (page, crn, nomsNumber) => {
@@ -16,13 +16,14 @@ const createLicence = async (page, crn, nomsNumber) => {
 	await page.getByLabel(/Who is the initial appointment with?/).fill(faker.person.fullName());
 	await page.getByRole("button", { name: "Continue" }).click();
 	await expect(page).toHaveTitle("Create and vary a licence - Create a licence - Where is the initial appointment?");
-	await page.getByLabel(/Building and street/).first().fill(faker.location.buildingNumber() + " " + faker.location.street());
+	await page.getByRole("link", { name: /Enter address manually/ }).click();
+	await page.getByLabel(/Address line 1/).first().fill(faker.location.buildingNumber() + " " + faker.location.street());
 	await page.getByLabel(/Town or city/).fill(faker.location.city());
 	await page.getByLabel("County (optional)").fill(faker.location.county());
 	await page.getByLabel(/Postcode/).fill(faker.location.zipCode());
 	await page.getByRole("button", { name: "Continue" }).click();
 	await expect(page).toHaveTitle("Create and vary a licence - Create a licence - What is the contact phone number for the initial appointment?");
-	await page.getByLabel("UK telephone number").fill(cvlFormattedPhoneNumber());
+	await page.getByLabel("UK telephone number").first().fill(cvlFormattedPhoneNumber());
 	await page.getByRole("button", { name: "Continue" }).click();
 	await expect(page).toHaveTitle("Create and vary a licence - Create a licence - When is the initial appointment?");
 	await page.getByLabel(/Immediately after release/).check();

package/steps/delius/registration/create-registration.mjs

@@ -27,8 +27,8 @@ async function createRegistration(page, crn, registrationType, registeringOffice
 	await doUntil(() => saveBtn.click(), () => expect(page.locator("tbody tr")).toContainText(registrationType));
 	const tableRows = await page.$$("#registrationTable tbody tr");
 	const [deliusRegtype, deliusRegDate, deliusRegNextReviewDate] = await Promise.all([
+		tableRows[0].$("td:nth-child(2)"),
 		tableRows[0].$("td:nth-child(3)"),
-		tableRows[0].$("td:nth-child(4)"),
 		tableRows[0].$("td:nth-child(5)")
 	].map(async (cell) => {
 		return cell ? await (await cell).innerText() : "";

package/steps/soc/login.mjs

@@ -9,7 +9,7 @@ const login = async (page) => {
 	await page.click("#submit");
 	await expect(page).toHaveTitle(/HMPPS Digital Services - Home/);
 	await page.getByRole("link", { name: "Manage SOC Cases" }).click();
-	await expect(page).toHaveTitle(/Manage SOC Cases/);
+	await expect(page).toHaveTitle(/Manage SOC cases/);
 };
 
 //#endregion

package/steps/soc/refer-to-soc.mjs

@@ -8,6 +8,8 @@ const referToSOC = async (page, crn) => {
 	await page.getByRole("link", { name: "Add nominal to SOC" }).click();
 	await page.getByLabel("Reason for referral or inclusion").fill("Automated testing");
 	await page.getByRole("button", { name: "Save and continue" }).click();
+	await page.getByLabel("Directorate of Security (DoS").selectOption("North West and West Midlands");
+	await page.getByRole("button", { name: "Save and continue" }).click();
 	await expect(page.getByRole("heading", { name: "Referral successful" })).toBeVisible();
 };
 function formatStaffNameForSOC(name) {

package/steps/workforce/allocations.mjs

@@ -25,7 +25,6 @@ const allocateCase = async (page, crn, allocation) => {
 	await page.getByRole("button", { name: "Continue" }).click();
 	await refreshUntil(page, () => expect(page).toHaveTitle(/Review allocation notes/));
 	await page.fill("#instructions", `${allocation.staff.firstName} ${allocation.staff.lastName} is allocated on case with ${crn}. Allocation for ${crn} completed by hmpps-end-to-end-tests`);
-	await page.click("#isSensitive");
 	await page.getByRole("button", { name: "Continue" }).click();
 	await expect(page).toHaveURL(/spo-oversight-contact-option$/);
 	await page.getByRole("button", { name: "Save my notes without editing" }).click();

package/test-data/environments/test.mjs

@@ -59,8 +59,8 @@ const testEnvironmentData = {
 			provider: "North East Region"
 		},
 		genericTeam: {
-			name: "OMU A",
-			provider: "NPS North East"
+			name: "Vale - Team",
+			provider: "Wales"
 		}
 	},
 	prisoners: {