refactor: add test for hitting password reset.

Author: JoshuaSBrown

tests/end-to-end/web-UI/CMakeLists.txt

@@ -8,7 +8,7 @@ configure_file(
   "${CMAKE_CURRENT_SOURCE_DIR}/auth.setup.js"
   @ONLY
 )
-
+message("ENABLE END TO END!!!!!!!")
 #FIXTHIS
 # For E2E web ui test
 if(ENABLE_END_TO_END_WEB_TESTS)

tests/end-to-end/web-UI/playwright.config.js

@@ -50,19 +50,5 @@ module.exports = defineConfig({
                 ...devices["Desktop Chrome"],
             },
         },
-
-        // {
-        //   name: 'firefox',
-        //   use: {
-        //     ...devices['Desktop Firefox'],
-        //   },
-        // },
-
-        // {
-        //   name: 'webkit',
-        //   use: {
-        //     ...devices['Desktop Safari'],
-        //    },
-        // },
     ],
 });

tests/end-to-end/web-UI/scripts/testingBasicFunction.spec.js

@@ -1,54 +1,50 @@
 import { test, expect } from "@playwright/test";
 
 // checking visibility and expanding some dropdowns
-test("test visibility", async ({ page }) => {
-    try {
-        console.log("******Begin test******");
-        // Temporary fix
-        let domain = process.env.DATAFED_DOMAIN;
-        await page.goto("https://" + domain + "/");
-        if (await page.getByRole("button", { name: "Log In / Register" }).isVisible()) {
-            console.log("NOT LOGGED IN");
+test.describe("DataFed UI Navigation", () => {
+    test("should display main navigation elements", async ({ page }) => {
+        const domain = process.env.DATAFED_DOMAIN;
+        if (!domain) {
+            throw new Error("DATAFED_DOMAIN environment variable not set");
         }
-        if (await expect(page.getByText("Continue Registration")).toBeVisible()) {
-            await page.getByText("Continue Registration").click({ timeout: 20000 });
+
+        await page.goto(`https://${domain}/`);
+
+        // Handle optional registration continuation
+        const continueReg = page.getByText("Continue Registration");
+        if (await continueReg.isVisible()) {
+            await continueReg.click();
         }
-        await expect(page.locator(".ui-icon").first()).toBeVisible({
-            timeout: 20000,
-        });
+
+        // Verify main elements
+        await expect(page.locator(".ui-icon").first()).toBeVisible();
         await expect(page.getByText("DataFed - Scientific Data")).toBeVisible();
         await expect(page.getByRole("link", { name: "My Data" })).toBeVisible();
         await expect(page.getByRole("link", { name: "Catalog" })).toBeVisible();
-        await expect(page.getByRole("button", { name: "" })).toBeVisible();
-
-        await page
-            .getByRole("treeitem", { name: "  Public Collections" })
-            .getByRole("button")
-            .click();
-        await page
-            .getByRole("treeitem", { name: "  Public Collections" })
-            .getByRole("group")
-            .click();
-        await page.getByRole("treeitem", { name: "  Allocations" }).getByRole("button").click();
-        await page.getByRole("treeitem", { name: "  Project Data" }).getByRole("button").click();
-        await page.getByRole("treeitem", { name: "  Shared Data" }).getByRole("button").click();
-        await page
-            .getByRole("treeitem", { name: "  Saved Queries" })
-            .locator("span")
-            .first()
-            .click();
-        await page.getByRole("treeitem", { name: "  Saved Queries" }).getByRole("button").click();
-        await page.getByText("Provenance Annotate Upload").click({ timeout: 20000 });
-        await page.getByRole("treeitem", { name: "  By User" }).getByRole("button").click();
-    } catch (error) {
-        // element not visible, either the test broke due to tags changing, or not logged in
-        // try to log out, because if not logged out, future tests will fail due to globus being annoying
-        if (await page.getByRole("button", { name: "" }).isVisible()) {
-            await page.getByRole("button", { name: "" }).click();
-        } else {
-            // if in here, check if you logged out properly
-            throw error;
+    });
+
+    test("should expand tree navigation items", async ({ page }) => {
+        const domain = process.env.DATAFED_DOMAIN;
+        if (!domain) {
+            throw new Error("DATAFED_DOMAIN environment variable not set");
+        }
+
+        await page.goto(`https://${domain}/`);
+
+        // Define tree items to expand
+        const treeItems = [
+            "Public Collections",
+            "Allocations",
+            "Project Data",
+            "Shared Data",
+            "Saved Queries",
+            "By User",
+        ];
+
+        for (const item of treeItems) {
+            const treeItem = page.getByRole("treeitem", { name: new RegExp(item) });
+            await treeItem.getByRole("button").click();
+            // Add assertion that it expanded if needed
         }
-    }
-    //removed logout
+    });
 });

tests/end-to-end/web-UI/scripts/testingUserPasswordChange.spec.js

@@ -0,0 +1,65 @@
+import { test, expect } from "@playwright/test";
+
+// checking visibility and expanding some dropdowns
+test.describe("DataFed UI password change", () => {
+    // Since auth is handled by global setup, we start from authenticated state
+    test.beforeEach(async ({ page }) => {
+        const domain = process.env.DATAFED_DOMAIN || "domain.com";
+
+        // Navigate to main page (already authenticated via storageState)
+        await page.goto(`https://${domain}/ui/main`, {
+            waitUntil: "networkidle",
+        });
+
+        // Verify we're on the main page and authenticated
+        await expect(page).toHaveURL(new RegExp(`https://${domain}/ui/main`));
+
+        // Wait for main UI to be ready
+        await page
+            .waitForSelector('[data-testid="main-content"], .main-content, #main', {
+                state: "visible",
+                timeout: 15000,
+            })
+            .catch(() => {
+                // Fallback: just wait for any main element
+                return page.waitForTimeout(2000);
+            });
+
+        // Log current page state for debugging
+        console.log(`INFO - Test starting on: ${page.url()}`);
+    });
+
+    test("should display main page after entering password", async ({ page }) => {
+        await test.step("Open settings menu", async () => {
+            const button = page.locator("#btn_settings");
+
+            if (await button.isVisible()) {
+                console.log("INFO - Button is visible (btn_settings)");
+                await button.click();
+            } else {
+                console.log("INFO - Button is not visible (btn_settings)");
+            }
+        });
+
+        await test.step("Enter password and confirmation password", async () => {
+            // Define locators for the elements
+            const newPasswordInput = page.locator("#cli_new_pw");
+            const confirmPasswordInput = page.locator("#cli_confirm_pw");
+            const revokeButton = page.locator("#btn_revoke_cred");
+            const saveButton = page.getByRole("button", { name: "Save" });
+
+            // Wait for all elements to be visible
+            await Promise.all([
+                newPasswordInput.waitFor({ state: "visible", timeout: 5000 }),
+                confirmPasswordInput.waitFor({ state: "visible", timeout: 5000 }),
+                revokeButton.waitFor({ state: "visible", timeout: 5000 }),
+                saveButton.waitFor({ state: "visible", timeout: 5000 }),
+            ]);
+            await newPasswordInput.click();
+            await newPasswordInput.fill("Terrible2s!!!");
+            await confirmPasswordInput.click();
+            await confirmPasswordInput.fill("Terrible2s!!!");
+            await saveButton.click();
+        });
+    });
+});