@ministryofjustice/hmpps-probation-integration-e2e-tests 1.212.0 → 1.214.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.212.0",
+  "version": "1.214.0",
   "license": "MIT",
   "homepage": "https://github.com/ministryofjustice/hmpps-probation-integration-e2e-tests#readme",
   "bugs": {
@@ -31,11 +31,12 @@
     "eslint-config-prettier": "^10.0.1",
     "eslint-plugin-prettier": "^5.2.1",
     "prettier": "3.8.3",
-    "tsdown": "^0.21.0"
+    "tsdown": "^0.22.0"
   },
   "exports": {
     "./steps/accredited-programmes/application": "./steps/accredited-programmes/application.mjs",
     "./steps/accredited-programmes/login": "./steps/accredited-programmes/login.mjs",
+    "./steps/accredited-programmes/manageAndDeliverLogin": "./steps/accredited-programmes/manageAndDeliverLogin.mjs",
     "./steps/api/arns/arns-api": "./steps/api/arns/arns-api.mjs",
     "./steps/api/auth/get-token": "./steps/api/auth/get-token.mjs",
     "./steps/api/court-case/court-case-api": "./steps/api/court-case/court-case-api.mjs",

package/steps/accredited-programmes/application.d.mts

@@ -1,7 +1,9 @@
+import { Person } from "../delius/utils/person.mjs";
+import { CreatedEvent } from "../delius/event/create-event.mjs";
 import { Page } from "@playwright/test";
 
 //#region steps/accredited-programmes/application.d.ts
-declare function findProgrammeAndMakeReferral(page: Page, nomisId: string): Promise<void>;
+declare function findProgrammeAndMakeReferral(page: Page, nomisId: string, programmeName?: string): Promise<void>;
 declare function clickOnOffenderLink(page: Page, linkName: string, fullName: string): Promise<void>;
 declare function verifyAssessmentDateTextToBe(page: Page, expectedText: string): Promise<void>;
 interface RoSHRiskAssertion {
@@ -12,8 +14,14 @@ interface RoSHRiskAssertion {
   riskToPrisoners: string;
 }
 declare function assertRoSHRiskTable(page: Page, assertions: RoSHRiskAssertion): Promise<void>;
+declare function findCase(page: Page, person: Person, crn: string): Promise<void>;
+declare function addCaseToGroup(page: Page, person: Person): Promise<void>;
+declare function updateReferralStatusToAwaitingAllocation(page: Page, person: Person, crn: string, event: CreatedEvent, date: Date): Promise<void>;
+declare function updateReferralStatus(page: Page): Promise<void>;
+declare function updateReferralStatusToOnProgramme(page: Page, person: Person, crn: string): Promise<void>;
+declare function updateReferralStatusToComplete(page: Page, person: Person): Promise<void>;
 declare const oasysImportDateText = "[data-testid=\"last-assessment-date-text\"]";
 declare const apFormattedTodayDate: string;
 declare const briefOffenceDetailsSummaryCard = "[data-testid=\"brief-offence-details-summary-card\"]";
 //#endregion
-export { apFormattedTodayDate, assertRoSHRiskTable, briefOffenceDetailsSummaryCard, clickOnOffenderLink, findProgrammeAndMakeReferral, oasysImportDateText, verifyAssessmentDateTextToBe };
+export { addCaseToGroup, apFormattedTodayDate, assertRoSHRiskTable, briefOffenceDetailsSummaryCard, clickOnOffenderLink, findCase, findProgrammeAndMakeReferral, oasysImportDateText, updateReferralStatus, updateReferralStatusToAwaitingAllocation, updateReferralStatusToComplete, updateReferralStatusToOnProgramme, verifyAssessmentDateTextToBe };

package/steps/accredited-programmes/application.mjs

@@ -1,18 +1,28 @@
 import { formatDate } from "../delius/utils/date-time.mjs";
 import { expect } from "@playwright/test";
 import { DateTime } from "luxon";
+import { faker } from "@faker-js/faker";
 //#region steps/accredited-programmes/application.ts
-async function findProgrammeAndMakeReferral(page, nomisId) {
+async function findProgrammeAndMakeReferral(page, nomisId, programmeName) {
 	await page.getByRole("link", { name: "Find a programme and make a referral" }).click();
 	await expect(page).toHaveTitle(/Find recommended programmes - Accredited Programmes - DPS/);
 	await page.getByLabel("Enter a prison number to check what programmes are recommended based on the person's risks and needs.").fill(nomisId);
 	await page.getByRole("button", { name: /Continue/ }).click();
 	await expect(page).toHaveTitle(/Accredited Programmes - DPS/);
 	await page.getByRole("button", { name: /See all programmes/ }).click();
-	await page.getByRole("link", { name: "Becoming New Me Plus: general violence offence" }).click();
-	await expect(page).toHaveTitle(/Becoming New Me Plus: general violence offence programme description - DPS/);
-	await page.getByRole("cell", { name: "Moorland (HMP & YOI)" }).getByRole("link").click();
-	await expect(page).toHaveTitle(/Becoming New Me Plus: general violence offence programme/);
+	if (programmeName == "Accredited Programme") {
+		await page.getByRole("link", { name: "Building Choices: moderate" }).click();
+		await expect(page).toHaveTitle(/Accredited Programmes - DPS/);
+		await page.getByRole("radio", { name: "No" }).click();
+		await page.getByRole("button", { name: "Continue" }).click();
+		await page.getByRole("cell", { name: "Hindley (HMP & YOI)" }).getByRole("link").click();
+		await expect(page).toHaveTitle(/Building Choices: moderate intensity/);
+	} else {
+		await page.getByRole("link", { name: "Becoming New Me Plus: general violence offence" }).click();
+		await expect(page).toHaveTitle(/Becoming New Me Plus: general violence offence programme description - DPS/);
+		await page.getByRole("cell", { name: "Moorland (HMP & YOI)" }).getByRole("link").click();
+		await expect(page).toHaveTitle(/Becoming New Me Plus: general violence offence programme/);
+	}
 	await page.getByRole("button", { name: /Make a referral/ }).click();
 	await expect(page).toHaveTitle(/Start referral - Accredited Programmes/);
 	await page.getByRole("button", { name: "Start now" }).click();
@@ -70,8 +80,74 @@ async function assertRoSHRiskTable(page, assertions) {
 		if (actualValue?.trim() !== expectedValue) throw new Error(`Expected "${expectedValue}" but found "${actualValue?.trim()}" for "${key}"`);
 	}
 }
+async function findCase(page, person, crn) {
+	await page.getByLabel("Primary navigation").getByRole("link", { name: "Case list" }).click();
+	await expect(page.locator(".govuk-heading-xl")).toContainText("Case list");
+	await page.locator("#crnOrPersonName").fill(crn);
+	await page.getByRole("button", { name: "Apply filters" }).click();
+	await page.locator("a", { hasText: `${person.firstName} ${person.lastName}` }).click();
+	await expect(page.locator(".govuk-heading-xl")).toContainText(`Referral details: ${person.firstName} ${person.lastName}`);
+}
+async function addCaseToGroup(page, person) {
+	await page.getByRole("link", { name: "Groups" }).click();
+	await page.getByRole("link", { name: "AutoTestGroup" }).click();
+	await page.getByRole("link", { name: "Allocations and waitlist" }).click();
+	await page.getByRole("link", { name: "Waitlist (1)" }).click();
+	await page.locator("input[name=\"add-to-group\"]").click();
+	await page.getByRole("button", { name: "Add to group" }).click();
+	await expect(page.locator("h1.govuk-fieldset__heading")).toContainText(`Add ${person.firstName} ${person.lastName} to this group?`);
+	await page.locator("input[name=\"add-to-group\"][value=\"yes\"]").click();
+	await page.getByRole("button", { name: "Continue" }).click();
+	await expect(page.locator("h1.govuk-heading-l")).toContainText(`${person.firstName} ${person.lastName}'s referral status will change to Scheduled`);
+	await page.locator("#additional-details").fill(faker.lorem.sentence());
+	await page.getByRole("button", { name: "Submit" }).click();
+	await expect(page.locator(".moj-alert__content")).toContainText(`${person.firstName} ${person.lastName} was added to this group. Their referral status is now Scheduled.`);
+}
+async function updateReferralStatusToAwaitingAllocation(page, person, crn, event, date) {
+	await expect(page.locator("p:right-of(:text(\"Programme Name\"))").first()).toContainText("Building Choices");
+	await expect(page.locator("p:right-of(:text(\"Name\"))").first()).toContainText(person.firstName + " " + person.lastName);
+	await expect(page.locator("p:right-of(:text(\"CRN\"))").first()).toContainText(crn);
+	await expect(page.locator("p:right-of(:text(\"Date of birth\"))").first()).toContainText(DateTime.fromJSDate(person.dob).setLocale("en-gb").toLocaleString(DateTime.DATE_FULL));
+	await expect(page.locator("p:right-of(:text(\"Sex\"))").first()).toContainText(person.sex);
+	await page.locator("a", { hasText: "Offence History" }).click();
+	await expect(page.locator("p:right-of(:text(\"Offence date\"))").first()).toContainText(date.toLocaleString("en-GB", {
+		day: "numeric",
+		month: "long",
+		year: "numeric"
+	}));
+	await page.locator("a", { hasText: "Sentence Information" }).click();
+	await expect(page.locator("p:right-of(:text(\"Sentence type\"))").first()).toContainText(event.outcome);
+	await page.getByRole("button", { name: "Update referral" }).click();
+	await page.getByRole("button", { name: "Update status" }).click();
+	await page.getByRole("radio", { name: "Awaiting allocation" }).click();
+	await page.locator("#more-details").fill(faker.lorem.sentence());
+	await page.getByRole("button", { name: "Submit" }).click();
+	await expect(page.locator(".moj-alert__content")).toContainText(`${person.firstName} ${person.lastName}'s referral status is now Awaiting allocation.`);
+	await expect(page.getByRole("heading", { name: "Awaiting allocation" })).toBeVisible();
+}
+async function updateReferralStatus(page) {
+	await page.getByRole("button", { name: "Update referral" }).click();
+	await page.getByRole("button", { name: "Update status" }).click();
+	await page.locator("#started-or-completed").click();
+	await page.getByRole("button", { name: "Continue" }).click();
+	await page.locator("#more-details").fill(faker.lorem.sentence());
+	await page.getByRole("button", { name: "Submit" }).click();
+}
+async function updateReferralStatusToOnProgramme(page, person, crn) {
+	await findCase(page, person, crn);
+	await updateReferralStatus(page);
+	await expect(page.locator(".moj-alert__content h2")).toContainText("Referral status updated");
+	await expect(page.locator(".moj-alert__content")).toContainText(`${person.firstName} ${person.lastName}'s referral status is now On programme.`);
+	await expect(page.getByRole("heading", { name: "On programme" })).toBeVisible();
+}
+async function updateReferralStatusToComplete(page, person) {
+	await updateReferralStatus(page);
+	await expect(page.locator(".moj-alert__content h2")).toContainText("Referral status updated");
+	await expect(page.locator(".moj-alert__content")).toContainText(`${person.firstName} ${person.lastName}'s referral status is now Programme complete.`);
+	await expect(page.getByRole("heading", { name: "Programme complete" })).toBeVisible();
+}
 const oasysImportDateText = "[data-testid=\"last-assessment-date-text\"]";
 const apFormattedTodayDate = formatDate(DateTime.now(), "d MMMM yyyy");
 const briefOffenceDetailsSummaryCard = "[data-testid=\"brief-offence-details-summary-card\"]";
 //#endregion
-export { apFormattedTodayDate, assertRoSHRiskTable, briefOffenceDetailsSummaryCard, clickOnOffenderLink, findProgrammeAndMakeReferral, oasysImportDateText, verifyAssessmentDateTextToBe };
+export { addCaseToGroup, apFormattedTodayDate, assertRoSHRiskTable, briefOffenceDetailsSummaryCard, clickOnOffenderLink, findCase, findProgrammeAndMakeReferral, oasysImportDateText, updateReferralStatus, updateReferralStatusToAwaitingAllocation, updateReferralStatusToComplete, updateReferralStatusToOnProgramme, verifyAssessmentDateTextToBe };

package/steps/accredited-programmes/manageAndDeliverLogin.d.mts

@@ -0,0 +1,6 @@
+import { Page } from "@playwright/test";
+
+//#region steps/accredited-programmes/manageAndDeliverLogin.d.ts
+declare const login: (page: Page) => Promise<void>;
+//#endregion
+export { login };

package/steps/accredited-programmes/manageAndDeliverLogin.mjs

@@ -0,0 +1,12 @@
+import { expect } from "@playwright/test";
+//#region steps/accredited-programmes/manageAndDeliverLogin.ts
+const login = async (page) => {
+	await page.goto(process.env.ACCREDITED_PROGRAMMES_MANAGE_AND_DELIVER_URL);
+	await expect(page).toHaveTitle(/HMPPS Digital Services - Sign in/);
+	await page.fill("#username", process.env.DELIUS_USERNAME);
+	await page.fill("#password", process.env.DELIUS_PASSWORD);
+	await page.click("#submit");
+	await expect(page).toHaveTitle(/Accredited Programmes/);
+};
+//#endregion
+export { login };

package/steps/community-payback/record-outcome.d.mts

@@ -6,7 +6,7 @@ declare function recordAttendanceCompliedOutcome(page: Page, startTime?: string,
 declare function recordUnacceptableAbsenceOutcome(page: Page): Promise<void>;
 declare function adjustTravelTime(page: Page, hours: string, minutes: string): Promise<void>;
 declare function findGroupSession(page: Page, crn: string, person: Person, projectName: string, provider: string, teamName: string): Promise<void>;
-declare function findPlacementsWithHostPartner(page: Page, provider: string, teamName: string): Promise<string>;
-declare function recordSessionAttendance(page: Page, startTime: string, endTime: string): Promise<string>;
+declare function findPlacementsWithHostPartner(page: Page, provider: string, teamName: string): Promise<string | null>;
+declare function recordSessionAttendance(page: Page, startTime: string, endTime: string): Promise<string | null>;
 //#endregion
 export { adjustTravelTime, findGroupSession, findPlacementsWithHostPartner, recordAttendanceCompliedOutcome, recordSessionAttendance, recordUnacceptableAbsenceOutcome };

package/steps/community-payback/record-outcome.mjs

@@ -94,7 +94,10 @@ async function recordSessionAttendance(page, startTime, endTime) {
 	await page.getByRole("heading", { name: "Automated UI Tests" }).isVisible();
 	await page.getByRole("link", { name: "View and update" }).click();
 	const crn = await page.locator(".govuk-caption-l").textContent();
-	await page.getByRole("button", { name: "Arrived" }).click();
+	await page.getByRole("button", {
+		name: "Arrived",
+		exact: true
+	}).click();
 	await page.locator("#time").fill(startTime);
 	await page.getByRole("button", { name: "Confirm and continue" }).click();
 	await page.locator("input[name=\"ableToWork\"][value=\"yes\"]").click();

package/steps/court-case/hearing-data.d.mts

@@ -32,7 +32,7 @@ declare const hearingData: (person: Person, address?: Address, court?: {
       id: string;
       defendants: {
         id: `${string}-${string}-${string}-${string}-${string}`;
-        pncId: string;
+        pncId: string | undefined;
         prosecutionCaseId: string;
         personDefendant: {
           personDetails: {
@@ -49,7 +49,7 @@ declare const hearingData: (person: Person, address?: Address, court?: {
               work: string;
               mobile: string;
             };
-            dateOfBirth: string;
+            dateOfBirth: string | null;
             firstName: string;
             gender: string;
             lastName: string;

package/steps/delius/offender/find-offender.d.mts

@@ -6,7 +6,7 @@ import { Page } from "@playwright/test";
 declare function findOffenderByName(page: Page, forename: string, surname: string): Promise<void>;
 declare function findOffenderByCRN(page: Page, crn: string): Promise<void>;
 declare function findOffenderByCRNNoContextCheck(page: Page, crn: string): Promise<void>;
-declare function findFirstOffender(page: Page, person: Person, provider: string): Promise<string>;
+declare function findFirstOffender(page: Page, person: Person, provider: string): Promise<string | null | undefined>;
 declare function findOffenderByNomisId(page: Page, nomisId: string): Promise<string>;
 declare function verifyAllocation(page: Page, args: {
   allocation: Allocation;

package/steps/referandmonitor/referral.d.mts

@@ -2,7 +2,7 @@ import { Page } from "@playwright/test";
 
 //#region steps/referandmonitor/referral.d.ts
 declare const referralProgress: (page: Page, referralRef: string) => Promise<void>;
-declare const makeReferral: (page: Page, crn: string) => Promise<string>;
+declare const makeReferral: (page: Page, crn: string) => Promise<string | null>;
 declare const assignReferral: (page: Page, referralRef: string) => Promise<void>;
 declare const withdrawReferral: (page: Page, referralRef: string) => Promise<void>;
 //#endregion

package/test-data/environments/common.mjs

@@ -44,6 +44,10 @@ const commonData = {
 			category: "Unpaid Work",
 			subCategory: "Regular",
 			length: "120"
+		},
+		accreditedProgramme: {
+			category: "Court - Accredited Programme",
+			subCategory: "Building Choices"
 		}
 	},
 	staff: { unallocated: {