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

package/steps/delius/licence-condition/create-licence-condition.mjs

@@ -1,3 +1,4 @@
+import { doUntil } from "../utils/refresh.mjs";
 import { selectOption } from "../utils/inputs.mjs";
 import { findEventByCRN } from "../event/find-events.mjs";
 import { expect } from "@playwright/test";
@@ -21,7 +22,9 @@ const createLicenceCondition = async (page, crn, eventNumber = 1) => {
 };
 const navigateToLicenceConditions = async (page, crn, eventNumber = 1) => {
 	await findEventByCRN(page, crn, eventNumber);
-	await page.getByRole("link", { name: "Licence conditions" }).click();
+	await doUntil(() => page.getByRole("link", { name: "Licence Conditions" }).click(), () => expect(page.locator("h1")).toContainText("Licence Conditions"), { rollback: async () => {
+		if (await page.title() === "Error Page") await page.goBack();
+	} });
 };
 const deliusLicenceCondition = "table tr:first-child td:nth-child(2)";
 

package/steps/delius/utils/refresh.d.mts

@@ -5,6 +5,7 @@ declare const refreshUntil: (page: Page, expectation: () => Promise<void>, optio
 declare const doUntil: <T>(action: () => Promise<T>, expectation: () => Promise<void>, options?: {
   timeout?: number;
   intervals?: number[];
+  rollback?: () => Promise<unknown>;
 }) => Promise<void>;
 declare const waitForJS: (page: Page, timeout?: number) => Promise<unknown>;
 declare const waitForAjax: (page: Page) => Promise<void>;

package/steps/delius/utils/refresh.mjs

@@ -11,11 +11,17 @@ const doUntil = async (action, expectation, options = {
 		500,
 		1e3,
 		5e3
-	]
+	],
+	rollback: null
 }) => {
 	await expect(async () => {
 		await action();
-		return await expectation();
+		try {
+			return await expectation();
+		} catch (e) {
+			if (options.rollback) await options.rollback();
+			throw e;
+		}
 	}).toPass(options);
 };
 const waitForJS = (page, timeout = 0) => {

package/steps/referandmonitor/referral.mjs

@@ -13,7 +13,7 @@ const referralProgress = async (page, referralRef) => {
 };
 const makeReferral = async (page, crn) => {
 	await page.getByRole("link", { name: "Find a CRS intervention and make a referral" }).click();
-	await page.locator("text=GM - Accommodation Support Service").click();
+	await page.locator("text=Accommodation Services - East of England").click();
 	await page.locator("text=Make a referral").click();
 	await page.locator("input[name=\"service-user-crn\"]").fill(crn);
 	await page.locator("text=Continue").click();