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

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

@@ -1,6 +1,6 @@
 import { doUntil } from "../utils/refresh.mjs";
-import { referralProgress } from "../../referandmonitor/referral.mjs";
 import { findOffenderByCRN } from "../offender/find-offender.mjs";
+import { referralProgress } from "../../referandmonitor/referral.mjs";
 import { findEventByCRN } from "../event/find-events.mjs";
 import { expect } from "@playwright/test";
 //#region steps/delius/contact/find-contacts.ts

package/steps/delius/staff/community-manager.mjs

@@ -1,7 +1,7 @@
 import { doUntil } from "../utils/refresh.mjs";
 import { selectOption } from "../utils/inputs.mjs";
-import { login } from "../login.mjs";
 import { findOffenderByNomisId } from "../offender/find-offender.mjs";
+import { login } from "../login.mjs";
 import { expect } from "@playwright/test";
 import { faker } from "@faker-js/faker";
 //#region steps/delius/staff/community-manager.ts

package/steps/delius/utils/table.mjs

@@ -9,11 +9,24 @@ async function getRowByContent(page, tableId, content) {
 		await expect(row).toBeVisible();
 		return row;
 	} catch {
-		const nextPageButtonLocator = page.getByRole("link", { name: "Next" });
-		await expect(nextPageButtonLocator, `Expected - ${content} - not found, try next page`).toBeVisible();
-		await nextPageButtonLocator.click();
+		const lastPageLocator = page.getByRole("link", { name: "Last" });
+		await expect(lastPageLocator, `Expected - ${content} - not found.`).toBeVisible();
+		await lastPageLocator.click();
 		await waitForAjax(page);
-		return getRowByContent(page, tableId, content);
+		return getRowByContentPaginatedFromLast(page, tableLocator, content);
+	}
+}
+async function getRowByContentPaginatedFromLast(page, tableLocator, content) {
+	const row = tableLocator.getByRole("row").filter({ hasText: content });
+	try {
+		await expect(row).toBeVisible();
+		return row;
+	} catch {
+		const previousPageLocator = page.getByRole("link", { name: "Previous" });
+		await expect(previousPageLocator, `Expected - ${content} - not found.`).toBeVisible();
+		await previousPageLocator.click();
+		await waitForAjax(page);
+		return getRowByContentPaginatedFromLast(page, tableLocator, content);
 	}
 }
 async function getRowCellsByContent(page, tableId, content) {