@ministryofjustice/hmpps-probation-integration-e2e-tests 1.117.0 → 1.119.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.117.0",
+  "version": "1.119.0",
   "license": "MIT",
   "homepage": "https://github.com/ministryofjustice/hmpps-probation-integration-e2e-tests#readme",
   "bugs": {
@@ -17,7 +17,7 @@
   "dependencies": {
     "@faker-js/faker": "^10.0.0",
     "@kubernetes/client-node": "^1.0.0",
-    "@playwright/test": "1.56.0",
+    "@playwright/test": "1.56.1",
     "dotenv": "^17.0.0",
     "luxon": "^3.5.0",
     "node-stream-zip": "^1.15.0",
@@ -97,6 +97,7 @@
     "./steps/cvl-licences/application": "./steps/cvl-licences/application.mjs",
     "./steps/cvl-licences/login": "./steps/cvl-licences/login.mjs",
     "./steps/delius/address/create-address": "./steps/delius/address/create-address.mjs",
+    "./steps/delius/address/delete-addresses": "./steps/delius/address/delete-addresses.mjs",
     "./steps/delius/contact/create-contact": "./steps/delius/contact/create-contact.mjs",
     "./steps/delius/contact/find-contacts": "./steps/delius/contact/find-contacts.mjs",
     "./steps/delius/court-report/find-court-report": "./steps/delius/court-report/find-court-report.mjs",

package/steps/accredited-programmes/application.mjs

@@ -53,8 +53,7 @@ async function clickOnOffenderLink(page, linkName, fullName) {
 	await nameLink.click();
 }
 async function verifyAssessmentDateTextToBe(page, expectedText) {
-	const actualText = await page.locator(oasysImportDateText).first().evaluate((el) => el.textContent?.trim().replace(/\s+/g, " "));
-	expect(actualText).toBe(expectedText);
+	expect(await page.locator(oasysImportDateText).first().evaluate((el) => el.textContent?.trim().replace(/\s+/g, " "))).toBe(expectedText);
 }
 async function assertRoSHRiskTable(page, assertions) {
 	const selectors = {

package/steps/api/prison-identifier-and-delius/prison-identifier-and-delius.mjs

@@ -3,14 +3,13 @@ import { expect, request } from "@playwright/test";
 
 //#region steps/api/prison-identifier-and-delius/prison-identifier-and-delius.ts
 async function triggerMatching(nomsNumber) {
-	const response = await (await request.newContext({ baseURL: process.env.PRISON_IDENTIFIER_AND_DELIUS_URL })).post(`/person/match-by-noms?dryRun=false`, {
+	expect((await (await request.newContext({ baseURL: process.env.PRISON_IDENTIFIER_AND_DELIUS_URL })).post(`/person/match-by-noms?dryRun=false`, {
 		headers: {
 			Authorization: `Bearer ${await getToken()}`,
 			"Content-Type": "application/json"
 		},
 		data: JSON.stringify([nomsNumber])
-	});
-	expect(response.ok()).toBeTruthy();
+	})).ok()).toBeTruthy();
 }
 
 //#endregion

package/steps/api/utils/api-utils.d.mts

@@ -1,6 +1,6 @@
 //#region steps/api/utils/api-utils.d.ts
 declare const sanitiseError: <T>(fn: AsyncFunction<T>) => AsyncFunction<T>;
 declare const retry: <T>(fn: AsyncFunction<T>, retryCount?: number) => AsyncFunction<T>;
-type AsyncFunction<T> = (...args: unknown[]) => Promise<T>;
+type AsyncFunction<T$1> = (...args: unknown[]) => Promise<T$1>;
 //#endregion
 export { retry, sanitiseError };

package/steps/cas2-short-term-accommodation/application.mjs

@@ -45,9 +45,7 @@ async function confirmEligibilityAndConsent(page) {
 	await fillDateInput(page, "When did they give consent?");
 	await page.getByRole("button", { name: "Save and continue" }).click();
 	await expect(page).toHaveTitle("The person's Home Detention Curfew (HDC) licence dates - Short-Term Accommodation (CAS-2)");
-	const hdcEligibilityDate = await fillDateInput(page, "HDC eligibility date", 1);
-	const conditionalReleaseDate = await fillDateInput(page, "conditional release date", 2);
-	if (hdcEligibilityDate >= conditionalReleaseDate) throw new Error("HDC eligibility date must be before the conditional release date.");
+	if (await fillDateInput(page, "HDC eligibility date", 1) >= await fillDateInput(page, "conditional release date", 2)) throw new Error("HDC eligibility date must be before the conditional release date.");
 	await page.getByRole("button", { name: "Save and continue" }).click();
 	await expect(page).toHaveTitle(/Task list/);
 }

package/steps/court-case/prepare-case-for-sentence/application.mjs

@@ -54,11 +54,9 @@ async function extractRegistrationDetails(page) {
 async function extractProbationRecordDetails(page) {
 	await page.getByRole("link", { name: "Probation record" }).click();
 	await expect(page).toHaveTitle("Probation record - Prepare a case for sentence");
-	const outcome = await page.locator(".govuk-summary-card__title").innerText();
-	const offence = await page.locator("dd p.govuk-body").first().innerText();
 	return {
-		outcome,
-		offence
+		outcome: await page.locator(".govuk-summary-card__title").innerText(),
+		offence: await page.locator("dd p.govuk-body").first().innerText()
 	};
 }
 

package/steps/cvl-licences/application.mjs

@@ -58,9 +58,7 @@ const approveLicence = async (page, crn, nomsNumber, establishment) => {
 	await page.getByRole("link", { name: /Sign out/ }).click();
 };
 const cvlFormattedPhoneNumber = () => {
-	const areaCode = "01" + Math.floor(Math.random() * 1e3).toString().padStart(2, "0");
-	const cityNumber = Math.floor(Math.random() * 1e6).toString().padStart(6, "0");
-	return `${areaCode} ${cityNumber}`;
+	return `${"01" + Math.floor(Math.random() * 1e3).toString().padStart(2, "0")} ${Math.floor(Math.random() * 1e6).toString().padStart(6, "0")}`;
 };
 
 //#endregion

package/steps/delius/address/delete-addresses.d.mts

@@ -0,0 +1,6 @@
+import { Page } from "@playwright/test";
+
+//#region steps/delius/address/delete-addresses.d.ts
+declare const deleteAddresses: (page: Page, crn: string) => Promise<void>;
+//#endregion
+export { deleteAddresses };

package/steps/delius/address/delete-addresses.mjs

@@ -0,0 +1,19 @@
+import { findOffenderByCRN } from "../offender/find-offender.mjs";
+import { expect } from "@playwright/test";
+
+//#region steps/delius/address/delete-addresses.ts
+const deleteAddresses = async (page, crn) => {
+	await findOffenderByCRN(page, crn);
+	await page.getByRole("link", { name: "Personal Details" }).click();
+	await page.getByRole("link", { name: "Addresses" }).click();
+	await expect(page.locator("h1")).toContainText("Addresses and Accommodation");
+	while (await page.locator("#otherAddressTable tbody tr").count() > 1) {
+		await page.locator("#otherAddressTable tbody tr").first().locator("a[title=\"Link to Delete this Address\"]").click();
+		await expect(page.locator("h1")).toContainText("Delete Address");
+		await page.locator("input", { hasText: "Confirm" }).click();
+		await expect(page.locator("h1")).toContainText("Addresses and Accommodation");
+	}
+};
+
+//#endregion
+export { deleteAddresses };

package/steps/delius/contact/find-contacts.mjs

@@ -107,13 +107,11 @@ const updateSAAppointmentLocation = async (page, referralRef, appointmentMethod,
 	await page.waitForURL(/service-provider\/referrals\/.*\/supplier-assessment\/rescheduled-confirmation/);
 	await page.locator(".govuk-button", { hasText: "Return to progress" }).click();
 	await page.getByRole("link", { name: "View details or reschedule" }).click();
-	const appointmentDL = await page.locator(".govuk-summary-list");
-	await expect(await appointmentDL.locator("p").nth(4).textContent()).toContain(NPSLocationToBeVerifiedInRAndM);
+	await expect(await (await page.locator(".govuk-summary-list")).locator("p").nth(4).textContent()).toContain(NPSLocationToBeVerifiedInRAndM);
 };
 const verifySAApptmntLocationInDelius = async (page, appointmentType, NPSOfficeLocationToBeVerified) => {
 	await (await page.locator("tr", { hasText: appointmentType })).locator("[title=\"Link to view the contact details.\"]").click();
-	const location = await page.locator("#location\\:outputText").textContent();
-	await expect(location).toBe(NPSOfficeLocationToBeVerified);
+	await expect(await page.locator("#location\\:outputText").textContent()).toBe(NPSOfficeLocationToBeVerified);
 };
 const fillAndSaveIfTextBoxIsAvailable = async (page, textBoxLocator, textToBeEnteredInTextBox, saveButtonLocator, radioButtonLocator) => {
 	const textBox = page.locator(textBoxLocator);

package/steps/delius/event/find-events.mjs

@@ -36,8 +36,7 @@ const verifyDate = async (page, label, date) => {
 	await expect(page.locator(`[id="${id}"]`)).toHaveText(DeliusDateFormatter(date));
 };
 const verifyTableDate = async (page, label, date) => {
-	const matchingRecord = page.locator("tr", { hasText: label });
-	await expect(matchingRecord).toContainText(DeliusDateFormatter(date));
+	await expect(page.locator("tr", { hasText: label })).toContainText(DeliusDateFormatter(date));
 };
 
 //#endregion

package/steps/delius/offender/find-offender.mjs

@@ -23,7 +23,7 @@ async function findOffenderByCRN(page, crn) {
 		await page.locator("tr", { hasText: crn }).locator("a", { hasText: "View" }).click();
 		await dismissModals(page);
 	}
-	await expect(page).toHaveTitle(/Case Summary/);
+	await expect(page.getByRole("heading", { name: "Case Summary" })).toBeVisible({ timeout: 1e4 });
 }
 async function findOffenderByCRNNoContextCheck(page, crn) {
 	await page.locator("#navigation-include\\:linkNavigation1Search", { hasText: "National search" }).click();

package/steps/make-recall-decisions/start-recommendation.mjs

@@ -81,8 +81,7 @@ const verifyRecallOffendersAddress = async (page, street, city, postcode) => {
 };
 const verifyLicenceCondition = async (page, licenceCondition) => {
 	await page.getByRole("link", { name: "Licence conditions" }).click();
-	const recallLicenseDesc = await page.locator("#accordion-with-summary-sections-content-2 p, [data-qa=\"condition-description\"]").first().textContent();
-	await expect(recallLicenseDesc).toMatch(licenceCondition.replace(/(.*)-/, "").trim());
+	await expect(await page.locator("#accordion-with-summary-sections-content-2 p, [data-qa=\"condition-description\"]").first().textContent()).toMatch(licenceCondition.replace(/(.*)-/, "").trim());
 };
 const verifyContact = async (page, contactDetails) => {
 	await page.getByRole("link", { name: "Contact history" }).click();

package/steps/workforce/utils.mjs

@@ -15,10 +15,7 @@ const months = [
 ];
 const WorkforceDateFormat = (date) => {
 	if (!date.isValid) throw new Error("Invalid DateTime object provided");
-	const day = date.day;
-	const month = months[date.month - 1];
-	const year = date.year;
-	return `${day} ${month} ${year}`;
+	return `${date.day} ${months[date.month - 1]} ${date.year}`;
 };
 
 //#endregion