@ministryofjustice/hmpps-probation-integration-e2e-tests 1.222.0 → 1.224.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.222.0",
+  "version": "1.224.0",
   "license": "MIT",
   "homepage": "https://github.com/ministryofjustice/hmpps-probation-integration-e2e-tests#readme",
   "bugs": {

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

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

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

@@ -15,7 +15,7 @@ async function recordAttendanceCompliedOutcome(page, startTime, endTime) {
 	await page.getByRole("button", { name: "Continue" }).click();
 	await page.locator("input[name=\"hiVis\"][value=\"yes\"]").click();
 	await page.locator("input[name=\"workedIntensively\"][value=\"yes\"]").click();
-	await page.locator("input[name=\"workQuality\"][value=\"GOOD\"]").click();
+	await page.locator("input[name=\"workQuality\"][value=\"EXCELLENT\"]").click();
 	await page.locator("input[name=\"behaviour\"][value=\"GOOD\"]").click();
 	await page.getByRole("button", { name: "Continue" }).click();
 	await page.getByRole("heading", { name: "Confirm details" }).isVisible();
@@ -38,12 +38,16 @@ async function recordUnacceptableAbsenceOutcome(page) {
 	await page.getByRole("link", { name: "Sign out" }).click();
 }
 async function adjustTravelTime(page, hours, minutes) {
+	const today = DateTime.now();
+	await page.locator("#date-day").fill(today.day.toString());
+	await page.locator("#date-month").fill(today.month.toString());
+	await page.locator("#date-year").fill(today.year.toString());
 	await page.locator("#hours").fill(hours);
 	await page.locator("#minutes").fill(minutes);
 	await page.getByRole("button", { name: "Credit travel time" }).click();
 	await expect(page.locator("#success-title-1")).toContainText(/Success/);
 	const hoursString = hours === "1" ? "hour" : "hours";
-	const minutesString = hours === "1" ? "minute" : "minutes";
+	const minutesString = minutes === "1" ? "minute" : "minutes";
 	await expect(page.locator(".govuk-notification-banner__content h3")).toContainText(RegExp(` has been adjusted for ${hours} ${hoursString} ${minutes} ${minutesString} of travel time.`, "i"));
 	await page.getByRole("link", { name: "Sign out" }).click();
 }
@@ -66,10 +70,7 @@ async function findGroupSession(page, crn, person, projectName, provider, teamNa
 	await page.getByRole("cell", { name: crn }).isVisible();
 	await page.getByRole("link", { name: "Update" }).first().click();
 	await expect(page.locator(".govuk-caption-l")).toContainText(crn);
-	await page.getByRole("button", { name: "Update appointment" }).click();
-	await expect(page.getByRole("heading", { name: "Add supervisor details" })).toBeVisible();
-	await selectOption(page, "#supervisor", supervisor);
-	await page.getByRole("button", { name: "Continue" }).click();
+	await addSupervisorDetails(page, teamName, supervisor);
 }
 async function findAnIndividualPlacement(page, provider, teamName) {
 	const supervisor = "Unallocated Staff";
@@ -81,10 +82,7 @@ async function findAnIndividualPlacement(page, provider, teamName) {
 	await page.getByRole("link", { name: "Update" }).first().click();
 	const crn = await page.locator(".govuk-caption-l").textContent();
 	await expect(page.locator("h2.govuk-heading-m")).toContainText("Appointment details");
-	await page.getByRole("button", { name: "Update appointment" }).click();
-	await expect(page.getByRole("heading", { name: "Add supervisor details" })).toBeVisible();
-	await selectOption(page, "#supervisor", supervisor);
-	await page.getByRole("button", { name: "Continue" }).click();
+	await addSupervisorDetails(page, teamName, supervisor);
 	return crn;
 }
 async function findAnAppointment(page, provider) {
@@ -95,6 +93,14 @@ async function findAnAppointment(page, provider) {
 	await page.getByRole("link", { name: "Update" }).nth(3).click();
 	return crn;
 }
+async function addSupervisorDetails(page, teamName, supervisor) {
+	await page.getByRole("button", { name: "Update appointment" }).click();
+	await expect(page.getByRole("heading", { name: "Add supervisor details" })).toBeVisible();
+	await selectOption(page, "#team", teamName);
+	await page.getByRole("button", { name: "Select team" }).click();
+	await selectOption(page, "#supervisor", supervisor);
+	await page.getByRole("button", { name: "Continue" }).click();
+}
 async function recordSessionAttendance(page, startTime, endTime) {
 	await expect(page).toHaveTitle(/Record group session attendance/);
 	await page.getByRole("button", { name: "View details" }).first().click();
@@ -115,4 +121,4 @@ async function recordSessionAttendance(page, startTime, endTime) {
 	return crn;
 }
 //#endregion
-export { adjustTravelTime, findAnAppointment, findAnIndividualPlacement, findGroupSession, recordAttendanceCompliedOutcome, recordSessionAttendance, recordUnacceptableAbsenceOutcome };
+export { addSupervisorDetails, adjustTravelTime, findAnAppointment, findAnIndividualPlacement, findGroupSession, recordAttendanceCompliedOutcome, recordSessionAttendance, recordUnacceptableAbsenceOutcome };

package/steps/manage-a-supervision/check-in.mjs

@@ -92,7 +92,7 @@ async function reviewCheckinInMPoP(page, crn) {
 	await refreshUntil(page, () => expect(page.getByRole("link", { name: /Manage +Online probation/ })).toBeVisible());
 	await page.getByRole("link", { name: /Manage +Online probation/ }).click();
 	await expect(heading).toContainText("Online check in submitted");
-	await page.getByRole("radio", { name: "Yes" }).check();
+	await page.getByRole("radio", { name: "Yes, and there is nothing" }).click();
 	await page.getByRole("button", { name: "Confirm and review responses" }).click();
 	await expect(heading).toContainText("Online check in submitted");
 	await page.locator("textarea.govuk-textarea").fill(faker.lorem.sentence());

package/steps/oasys/login.d.mts

@@ -9,7 +9,8 @@ declare enum UserType {
   Assessment = 3,
   OPD = 4,
   ApprovedPSORole = 5,
-  AccreditedProgrammesAssessment = 6
+  AccreditedProgrammesAssessment = 6,
+  ManageAndDeliver = 7
 }
 //#endregion
 export { UserType, login };

package/steps/oasys/login.mjs

@@ -16,6 +16,7 @@ let UserType = /* @__PURE__ */ function(UserType) {
 	UserType[UserType["OPD"] = 4] = "OPD";
 	UserType[UserType["ApprovedPSORole"] = 5] = "ApprovedPSORole";
 	UserType[UserType["AccreditedProgrammesAssessment"] = 6] = "AccreditedProgrammesAssessment";
+	UserType[UserType["ManageAndDeliver"] = 7] = "ManageAndDeliver";
 	return UserType;
 }({});
 const oasysUserConfig = (userType) => {
@@ -48,6 +49,10 @@ const oasysUserConfig = (userType) => {
 			username: process.env.OASYS_USERNAME_ACCREDITED_PROGRAMMES,
 			password: process.env.OASYS_PASSWORD_ACCREDITED_PROGRAMMES
 		};
+		case 7: return {
+			username: process.env.OASYS_USERNAME_MANAGE_AND_DELIVER,
+			password: process.env.OASYS_PASSWORD_MANAGE_AND_DELIVER
+		};
 	}
 };
 //#endregion