test(e2e): Add coverage for recent user permission changes

e2e/tests/ui-driven/src/create-flow.spec.ts

@@ -91,6 +91,66 @@ test.describe("Navigation", () => {
     await expect(nodes.getByText(noBranchNoticeText)).toBeVisible();
   });
 
+  test("user data persists on page refresh @regression", async ({
+    browser,
+  }) => {
+    const page = await createAuthenticatedSession({
+      browser,
+      userId: context.user!.id!,
+    });
+
+    let getUserRequestCount = 0;
+    page.on("request", (req) => {
+      const isHasuraRequest = req.url().includes("/graphql");
+      const isGetUserRequest =
+        isHasuraRequest && req.postData()?.toString().includes("GetUserById");
+
+      if (isGetUserRequest) getUserRequestCount++;
+    });
+
+    await page.goto("/");
+    await page.waitForLoadState("networkidle");
+
+    // Get user data on initial page load
+    expect(getUserRequestCount).toBe(1);
+
+    const team = page.locator("h2", { hasText: context.team.name });
+    team.click();
+    await page.waitForLoadState("networkidle");
+
+    // User data not refetched on navigation to a new page
+    expect(getUserRequestCount).toBe(1);
+
+    // User data is refetched when page reloaded
+    await page.reload();
+    await page.waitForLoadState("networkidle");
+    expect(getUserRequestCount).toBe(2);
+  });
+
+  test("team data persists on page refresh @regression", async ({
+    browser,
+  }) => {
+    const page = await createAuthenticatedSession({
+      browser,
+      userId: context.user!.id!,
+    });
+
+    await page.goto("/");
+    const team = page.locator("h2", { hasText: context.team.name });
+    await team.click();
+
+    const teamSlugInHeader = page.getByRole("link", {
+      name: context.team.slug,
+    });
+    await expect(teamSlugInHeader).toBeVisible();
+
+    await page.reload();
+    await expect(teamSlugInHeader).toBeVisible();
+
+    await page.goBack();
+    await expect(teamSlugInHeader).toBeHidden();
+  });
+
   test("Preview a created flow", async ({ browser }: { browser: Browser }) => {
     const page = await createAuthenticatedSession({
       browser,

e2e/tests/ui-driven/src/invite-to-pay/agent.spec.ts

@@ -1,6 +1,6 @@
 import { test, expect, Page, BrowserContext } from "@playwright/test";
 import { addSessionToContext, modifyFlow } from "../helpers";
-import inviteToPayFlow from "../flows/invite-to-pay-flow";
+import inviteToPayFlow from "../mocks/flows/invite-to-pay-flow";
 import {
   Context,
   contextDefaults,
@@ -52,16 +52,16 @@ test.describe("Agent journey @regression", async () => {
     });
     await expect(toggleInviteToPayButton).toBeVisible();
     await toggleInviteToPayButton.click();
-    const inviteToPayFormHeader = await page.getByText(
+    const inviteToPayFormHeader = page.getByText(
       "Invite someone else to pay for this application",
     );
     await expect(inviteToPayFormHeader).toBeVisible();
 
     await answerInviteToPayForm(page);
-    await page.getByRole("button", { name: "Send invitation to pay" }).click();
-    await page.waitForLoadState("networkidle");
+    page.getByRole("button", { name: "Send invitation to pay" }).click();
+    await page.waitForResponse((res) => res.url().includes("invite-to-pay"));
 
-    const errorMessage = await page.getByText(
+    const errorMessage = page.getByText(
       "Error generating payment request, please try again",
     );
     await expect(errorMessage).toBeHidden();
@@ -73,7 +73,7 @@ test.describe("Agent journey @regression", async () => {
     expect(paymentRequest).toBeDefined();
     expect(paymentRequest).toMatchObject(mockPaymentRequest);
 
-    const successMessage = await page.getByText("Payment invitation sent");
+    const successMessage = page.getByText("Payment invitation sent");
     await expect(successMessage).toBeVisible();
   });
 
@@ -108,15 +108,15 @@ test.describe("Agent journey @regression", async () => {
     const secondPage = await browserContext.newPage();
     await secondPage.goto(resumeLink);
     await expect(
-      await secondPage.getByRole("heading", {
+      secondPage.getByRole("heading", {
         name: "Resume your application",
       }),
     ).toBeVisible();
     await secondPage.getByLabel("Email address").fill(context.user.email);
     await secondPage.getByTestId("continue-button").click();
 
     await expect(
-      await secondPage.getByRole("heading", {
+      secondPage.getByRole("heading", {
         name: "Sorry, you can't make changes to this application",
       }),
     ).toBeVisible();
@@ -138,22 +138,22 @@ test.describe("Agent journey @regression", async () => {
     const secondPage = await browserContext.newPage();
     await secondPage.goto(resumeLink);
     await expect(
-      await secondPage.getByRole("heading", {
+      secondPage.getByRole("heading", {
         name: "Resume your application",
       }),
     ).toBeVisible();
     await secondPage.getByLabel("Email address").fill(context.user.email);
     await secondPage.getByTestId("continue-button").click();
 
     // Reconciliation ignored
-    const reconciliationText = await secondPage.getByText(
+    const reconciliationText = secondPage.getByText(
       "This service has been updated since you last saved your application. We will ask you to answer any updated questions again when you continue.",
     );
     await expect(reconciliationText).toBeHidden();
 
     // Locked application message displayed
     await expect(
-      await secondPage.getByRole("heading", {
+      secondPage.getByRole("heading", {
         name: "Sorry, you can't make changes to this application",
       }),
     ).toBeVisible();
@@ -180,7 +180,7 @@ test.describe("Agent journey @regression", async () => {
       sessionId,
       adminGQLClient,
     });
-    await expect(paymentRequest).toBeDefined();
+    expect(paymentRequest).toBeDefined();
 
     // Attempt to make payment in tab 2...
     await tab2.getByText("Pay now using GOV.UK Pay").click();

e2e/tests/ui-driven/src/invite-to-pay/helpers.ts

@@ -95,8 +95,8 @@ export async function makePaymentRequest({
   });
   await toggleInviteToPayButton.click();
   await answerInviteToPayForm(page);
-  await page.getByRole("button", { name: "Send invitation to pay" }).click();
-  await page.waitForLoadState("networkidle");
+  page.getByRole("button", { name: "Send invitation to pay" }).click();
+  await page.waitForResponse((res) => res.url().includes("invite-to-pay"));
 
   return sessionId;
 }

e2e/tests/ui-driven/src/invite-to-pay/mocks.ts

@@ -4,7 +4,7 @@ import {
   PaymentRequest,
   SessionData,
 } from "@opensystemslab/planx-core/types";
-import inviteToPayFlow from "../flows/invite-to-pay-flow";
+import inviteToPayFlow from "../mocks/flows/invite-to-pay-flow";
 import { TEST_EMAIL } from "../helpers";
 
 export const mockPaymentRequest: Partial<PaymentRequest> = {

e2e/tests/ui-driven/src/invite-to-pay/nominee.spec.ts

@@ -1,7 +1,7 @@
 import { test, expect, Page, APIRequestContext } from "@playwright/test";
 import { v4 as uuidV4 } from "uuid";
 import { fillGovUkCardDetails, cards } from "../helpers";
-import inviteToPayFlow from "../flows/invite-to-pay-flow";
+import inviteToPayFlow from "../mocks/flows/invite-to-pay-flow";
 import {
   Context,
   contextDefaults,
@@ -47,7 +47,7 @@ test.describe("Nominee journey @regression", async () => {
     await navigateToPaymentRequestPage(paymentRequest, page);
 
     await expect(
-      await page.getByRole("heading", { name: "Pay for your application" }),
+      page.getByRole("heading", { name: "Pay for your application" }),
     ).toBeVisible();
     await expect(
       page.locator("#main-content").getByText("Invite to pay test"),
@@ -58,7 +58,7 @@ test.describe("Nominee journey @regression", async () => {
       "Alteration of internal walls and addition or alteration of a deck";
     await expect(page.getByText(formattedProjectType)).toBeVisible();
 
-    const payButton = await page.getByRole("button", {
+    const payButton = page.getByRole("button", {
       name: "Pay using GOV.UK Pay",
     });
     await expect(payButton).toBeVisible();
@@ -71,9 +71,6 @@ test.describe("Nominee journey @regression", async () => {
     await page.getByRole("button", { name: "Confirm payment" }).click();
     await page.waitForURL("**/invite-to-pay-test/**");
 
-    // Wait for GovPay re-request to update paymentRequest status
-    await page.waitForLoadState("networkidle");
-
     await expect(page.getByText("Payment received")).toBeVisible();
     const updatedPaymentRequest = await getPaymentRequestBySessionId({
       sessionId,

e2e/tests/ui-driven/src/pay.spec.ts

@@ -7,7 +7,7 @@ import {
   waitForPaymentResponse,
 } from "./helpers";
 import type { Page } from "@playwright/test";
-import payFlow from "./flows/pay-flow.json";
+import payFlow from "./mocks/flows/pay-flow.json";
 import { gql, GraphQLClient } from "graphql-request";
 import type { SessionData } from "@opensystemslab/planx-core/types";
 import type { Context } from "./context";

e2e/tests/ui-driven/src/save-and-return.spec.ts

@@ -2,7 +2,7 @@ import { test, expect } from "@playwright/test";
 import {
   simpleSendFlow,
   modifiedSimpleSendFlow,
-} from "./flows/save-and-return-flows";
+} from "./mocks/flows/save-and-return-flows";
 import {
   contextDefaults,
   setUpTestContext,

e2e/tests/ui-driven/src/sections.spec.ts

@@ -1,5 +1,5 @@
 import { expect, test } from "@playwright/test";
-import { flow, updatedQuestionAnswers } from "./flows/sections-flow";
+import { flow, updatedQuestionAnswers } from "./mocks/flows/sections-flow";
 import {
   contextDefaults,
   setUpTestContext,