refactor: streamline error handling and improve test reliability across actions and notifications

Author: NiallJoeMaher

app/(app)/alpha/additional-details/_actions.ts

@@ -2,7 +2,6 @@
 
 import { getServerAuthSession } from "@/server/auth";
 import { redirect } from "next/navigation";
-import { z } from "zod";
 
 import {
   type TypeSlideOneSchema,
@@ -35,12 +34,7 @@ export async function slideOneSubmitAction(dataInput: TypeSlideOneSchema) {
       .where(eq(user.id, session.user.id));
 
     return true;
-  } catch (error) {
-    if (error instanceof z.ZodError) {
-      console.error("Validation error:", error.issues);
-    } else {
-      console.error("Error updating the User model:", error);
-    }
+  } catch {
     return false;
   }
 }
@@ -63,12 +57,7 @@ export async function slideTwoSubmitAction(dataInput: TypeSlideTwoSchema) {
       .where(eq(user.id, session.user.id));
 
     return true;
-  } catch (error) {
-    if (error instanceof z.ZodError) {
-      console.error("Validation error:", error.issues);
-    } else {
-      console.error("Error updating the User model:", error);
-    }
+  } catch {
     return false;
   }
 }
@@ -95,12 +84,7 @@ export async function slideThreeSubmitAction(dataInput: TypeSlideThreeSchema) {
       .where(eq(user.id, session.user.id));
 
     return true;
-  } catch (error) {
-    if (error instanceof z.ZodError) {
-      console.error("Validation error:", error.issues);
-    } else {
-      console.error("Error updating the User model:", error);
-    }
+  } catch {
     return false;
   }
 }

app/(app)/alpha/additional-details/_client.tsx

@@ -120,7 +120,7 @@ function SlideOne({ details }: { details: UserDetails }) {
       } else {
         toast.error("Error, saving was unsuccessful.");
       }
-    } catch (error) {
+    } catch {
       toast.error("An unexpected error occurred.");
     }
   };
@@ -274,7 +274,7 @@ function SlideTwo({ details }: { details: UserDetails }) {
       } else {
         toast.error("Error, saving was unsuccessful.");
       }
-    } catch (error) {
+    } catch {
       toast.error("An unexpected error occurred.");
     }
   };
@@ -441,7 +441,7 @@ function SlideThree({ details }: { details: UserDetails }) {
         } else {
           toast.error("Error, saving was unsuccessful.");
         }
-      } catch (error) {
+      } catch {
         toast.error("An unexpected error occurred.");
       }
     }

e2e/admin.spec.ts

@@ -92,10 +92,19 @@ test.describe("Admin Dashboard", () => {
 
   test("Should navigate to feed sources", async ({ page }) => {
     await page.goto("http://localhost:3000/admin");
+    await page.waitForLoadState("domcontentloaded");
+
     // Use role link to be more specific since "Feed Sources" appears multiple times
-    await page
-      .getByRole("link", { name: /Feed Sources.*Manage RSS feed/i })
-      .click();
+    const feedSourcesLink = page.getByRole("link", {
+      name: /Feed Sources.*Manage RSS feed/i,
+    });
+    await expect(feedSourcesLink).toBeVisible({ timeout: 10000 });
+
+    // Wait for navigation to complete after click
+    await Promise.all([
+      page.waitForURL("http://localhost:3000/admin/sources"),
+      feedSourcesLink.click(),
+    ]);
     await expect(page).toHaveURL("http://localhost:3000/admin/sources");
   });
 });

e2e/articles.spec.ts

@@ -337,9 +337,9 @@ test.describe("Authenticated Feed Page (Articles)", () => {
     await page.waitForLoadState("domcontentloaded");
 
     // Wait for action bar to load - bookmark button has text "Save"
-    await expect(page.getByRole("button", { name: "Save" })).toBeVisible({
-      timeout: 15000,
-    });
+    const saveButton = page.getByRole("button", { name: "Save" });
+    await expect(saveButton).toBeVisible({ timeout: 15000 });
+    await expect(saveButton).toBeEnabled({ timeout: 5000 });
 
     // Wait for TRPC bookmark mutation response
     const bookmarkResponsePromise = page.waitForResponse(
@@ -348,12 +348,15 @@ test.describe("Authenticated Feed Page (Articles)", () => {
         response.url().includes("bookmark") &&
         response.status() === 200,
     );
-    await page.getByRole("button", { name: "Save" }).click();
+    await saveButton.click();
     await bookmarkResponsePromise;
 
-    // Button text should change to "Saved" - add explicit timeout for slow mobile browsers
+    // Wait for DOM to update after TRPC response
+    await page.waitForLoadState("domcontentloaded");
+
+    // Button text should change to "Saved" - use toHaveText with polling for reliability
     await expect(page.getByRole("button", { name: "Saved" })).toBeVisible({
-      timeout: 15000,
+      timeout: 20000,
     });
   });
 });

e2e/my-posts.spec.ts

@@ -17,24 +17,31 @@ async function openTab(
   if (isMobile) {
     const tabSelect = page.locator("select#tabs");
     await expect(tabSelect).toBeVisible({ timeout: 10000 });
+    await expect(tabSelect).toBeEnabled({ timeout: 5000 });
     await tabSelect.selectOption({ label: tabName });
+    // Wait for mobile navigation to settle
+    await page.waitForLoadState("domcontentloaded");
   } else {
     await page.getByRole("link", { name: tabName }).click();
   }
 
   const slug = tabName.toLowerCase();
-  await page.waitForURL(`http://localhost:3000/my-posts?tab=${slug}`);
+  await page.waitForURL(`http://localhost:3000/my-posts?tab=${slug}`, {
+    timeout: 15000,
+  });
   await expect(page).toHaveURL(new RegExp(`\\/my-posts\\?tab=${slug}`));
 
   // Wait for loading state to complete
   await expect(page.getByText("Fetching your posts...")).toBeHidden({
     timeout: 20000,
   });
 
-  // Wait for network to settle and at least one article to be visible
+  // Wait for network to settle and content to load
   await page.waitForLoadState("domcontentloaded");
+
+  // Wait for at least one article to be visible with increased timeout for mobile
   await expect(page.locator("article").first()).toBeVisible({
-    timeout: 15000,
+    timeout: 20000,
   });
 }
 
@@ -74,7 +81,9 @@ test.describe("Authenticated my-posts Page", () => {
       const tabSelect = page.locator("select#tabs");
       await expect(tabSelect).toBeVisible({ timeout: 10000 });
       // Verify the select has the correct options
-      await expect(tabSelect.locator('option:has-text("Drafts")')).toBeVisible();
+      await expect(
+        tabSelect.locator('option:has-text("Drafts")'),
+      ).toBeVisible();
       await expect(
         tabSelect.locator('option:has-text("Scheduled")'),
       ).toBeVisible();

e2e/notifications.spec.ts

@@ -113,10 +113,15 @@ test.describe("Notifications Page", () => {
       await page.goto("http://localhost:3000/notifications");
       await responsePromise;
 
-      // Wait for notification to appear
-      await page.waitForSelector('button[title="Mark as read"]', {
-        timeout: 15000,
-      });
+      // Wait for page to stabilize after TRPC response
+      await page.waitForLoadState("domcontentloaded");
+
+      // Wait for the mark as read button to be visible and enabled
+      const markAsReadButton = page
+        .locator('button[title="Mark as read"]')
+        .first();
+      await expect(markAsReadButton).toBeVisible({ timeout: 15000 });
+      await expect(markAsReadButton).toBeEnabled({ timeout: 5000 });
 
       // Click mark as read button and wait for mutation response
       const markReadResponsePromise = page.waitForResponse(
@@ -125,7 +130,7 @@ test.describe("Notifications Page", () => {
           response.url().includes("notification") &&
           response.status() === 200,
       );
-      await page.locator('button[title="Mark as read"]').first().click();
+      await markAsReadButton.click();
       await markReadResponsePromise;
     });
   });