Merge branch 'master' into platform/thetaurean/mass-dependabots

frontend-react/e2e/spec/chromium-only/authenticated/last-mile-failures-page-user-flow.spec.ts

@@ -83,7 +83,7 @@ test.describe("Last Mile Failure page",
             await expect(modal).toContainText(`Report ID:${reportIdCell}`);
         });
 
-        test("table column 'Receiver' will open receiver edit page", async ({ lastMileFailuresPage, isMockDisabled }) => {
+        test.skip("table column 'Receiver' will open receiver edit page", async ({ lastMileFailuresPage, isMockDisabled }) => {
             test.skip(!isMockDisabled, "Mocks are ENABLED, skipping test");
             const receiver = tableRows(lastMileFailuresPage.page).nth(0).locator("td").nth(2);
             const receiverCell = await receiver.getByRole("link").innerText();

frontend-react/e2e/spec/chromium-only/authenticated/organization-settings-edit-page-user-flow.spec.ts

@@ -0,0 +1,86 @@
+import { expect } from "@playwright/test";
+import { OrganizationEditPage } from "../../../pages/authenticated/admin/organization-edit";
+import { test as baseTest } from "../../../test";
+
+export interface OrganizationEditPageFixtures {
+    organizationEditPage: OrganizationEditPage;
+}
+
+const test = baseTest.extend<OrganizationEditPageFixtures>({
+    organizationEditPage: async (
+        {
+            page: _page,
+            isMockDisabled,
+            adminLogin,
+            senderLogin,
+            receiverLogin,
+            storageState,
+            frontendWarningsLogPath,
+            isFrontendWarningsLog,
+        },
+        use,
+    ) => {
+        const page = new OrganizationEditPage({
+            page: _page,
+            isMockDisabled,
+            adminLogin,
+            senderLogin,
+            receiverLogin,
+            storageState,
+            frontendWarningsLogPath,
+            isFrontendWarningsLog,
+        });
+        await page.goto();
+        await use(page);
+    },
+});
+
+test.describe("Organization Edit Page", {
+    tag: "@smoke",
+}, () => {
+    test.describe("admin user", () => {
+        test.use({storageState: "e2e/.auth/admin.json"});
+
+        test("has correct title", async ({organizationEditPage}) => {
+            await organizationEditPage.testHeader(false);
+            await expect(organizationEditPage.page.getByText(/Org name: ignore/)).toBeVisible();
+        });
+
+        test.describe("edit section", () => {
+            test("has expected 'Meta'", async ({organizationEditPage}) => {
+                const meta = organizationEditPage.page.getByTestId("gridContainer").getByTestId("grid").nth(2);
+                 await expect(meta).not.toBeEmpty();
+            });
+
+            test("has expected 'Description'", async ({organizationEditPage}) => {
+                 await expect(organizationEditPage.page.getByTestId("description")).not.toBeEmpty();
+            });
+
+            test("has expected 'Jurisdiction'", async ({organizationEditPage}) => {
+                await expect(organizationEditPage.page.getByTestId("jurisdiction")).not.toBeEmpty();
+            });
+        });
+
+        test.describe("'Organization Sender Settings' section", () => {
+            test.beforeEach(async ({ organizationEditPage }) => {
+                await organizationEditPage.page.locator("#orgsendersettings .usa-table tbody").waitFor({ state: "visible" });
+            });
+
+            test("has at least one sender listed in the table", async ({organizationEditPage}) => {
+                const rowCount = await organizationEditPage.page.locator("#orgsendersettings .usa-table tbody tr").count();
+                expect(rowCount).toBeGreaterThanOrEqual(1);
+            });
+        });
+
+        test.describe("'Organization Receiver Settings' section", () => {
+            test.beforeEach(async ({ organizationEditPage }) => {
+                await organizationEditPage.page.locator("#orgreceiversettings .usa-table tbody").waitFor({ state: "visible" });
+            });
+
+            test("has at least one sender listed in the table", async ({organizationEditPage}) => {
+                const rowCount = await organizationEditPage.page.locator("#orgreceiversettings .usa-table tbody tr").count();
+                expect(rowCount).toBeGreaterThanOrEqual(1);
+            });
+        });
+    });
+});

frontend-react/e2e/spec/chromium-only/authenticated/organization-settings-page-user-flow.spec.ts

@@ -1,6 +1,5 @@
 import { expect } from "@playwright/test";
 import { tableRows } from "../../../helpers/utils";
-import { MOCK_GET_ORGANIZATION_SETTINGS_LIST } from "../../../mocks/organizations";
 import { OrganizationPage } from "../../../pages/authenticated/admin/organization";
 import { test as baseTest } from "../../../test";
 
@@ -72,23 +71,24 @@ test.describe("Admin Organization Settings Page - user flow smoke tests", {
 
             test("filtering works as expected", async ({organizationPage}) => {
                 const table = organizationPage.page.getByRole("table");
-                const {description, name, jurisdiction, stateCode} = MOCK_GET_ORGANIZATION_SETTINGS_LIST[2];
+                const firstDataRow = organizationPage.page.getByRole("table").getByRole("row").nth(1);
+                const firstDataRowName = (await firstDataRow.getByRole("cell").nth(0).textContent()) ?? "INVALID";
                 const filterBox = organizationPage.page.getByRole("textbox", {
                     name: "Filter:",
                 });
 
                 await expect(filterBox).toBeVisible();
 
-                await filterBox.fill(name);
+                await filterBox.fill(firstDataRowName);
                 const rows = await table.getByRole("row").all();
                 expect(rows).toHaveLength(2);
                 const cols = rows[1].getByRole("cell").allTextContents();
                 const expectedColContents = [
-                    name,
-                    description ?? "",
-                    jurisdiction ?? "",
-                    stateCode ?? "",
-                    "",
+                    await firstDataRow.getByRole("cell").nth(0).textContent(),
+                    await firstDataRow.getByRole("cell").nth(1).textContent() ?? "",
+                    await firstDataRow.getByRole("cell").nth(2).textContent() ?? "",
+                    await firstDataRow.getByRole("cell").nth(3).textContent() ?? "",
+                    await firstDataRow.getByRole("cell").nth(4).textContent() ?? "",
                     "SetEdit",
                 ];