tests: correct weekend handling and add better labels for UI

Author: chrisgoggins

src/app/rides/new/page.tsx

@@ -586,6 +586,7 @@ export default function CreateRidePage() {
                     <div className={styles.calendarHeader}>
                       <button
                         type="button"
+                        aria-label="Previous month"
                         onClick={prevMonth}
                         className={styles.calendarNav}
                       >
@@ -612,6 +613,7 @@ export default function CreateRidePage() {
                       </div>
                       <button
                         type="button"
+                        aria-label="Next month"
                         onClick={nextMonth}
                         className={styles.calendarNav}
                       >

tests/e2e/routeA.ui.spec.ts

@@ -4,15 +4,15 @@
  *   student  /rides/new          fills the form            Requested
  *   student  /rides              ride is in this/next week
  *   admin    /admin?tab=Rides    assigns driver + vehicle  Scheduled
- *   driver   /rides              Tomorrow tab shows it
+ *   driver   /rides/:id          scheduled ride is visible
  *   student  /rides/:id          scheduled driver/vehicle
  *
  * Stops at Scheduled — the full lifecycle lives in routeB.ui.spec.ts.
  */
 import type { Page } from "@playwright/test";
 import { test, expect } from "./fixtures";
 import { PERSONAS, LOCATIONS, VEHICLE } from "./seed";
-import { estDateDaysFromNow } from "./routeTestHelpers";
+import { estDateDaysFromNow, nextServiceDate } from "./routeTestHelpers";
 
 const PICKUP = LOCATIONS.techSquare;
 const DROPOFF = LOCATIONS.studentCenter;
@@ -25,15 +25,6 @@ async function pickTime(input: ReturnType<Page["locator"]>, label: string) {
   await expect(input).toHaveValue(label);
 }
 
-function isEstSaturday(): boolean {
-  return (
-    new Intl.DateTimeFormat("en-US", {
-      timeZone: "America/New_York",
-      weekday: "short",
-    }).format(new Date()) === "Sat"
-  );
-}
-
 test("route A: student creates, admin schedules (UI)", async ({
   pageAs,
   diag,
@@ -45,26 +36,29 @@ test("route A: student creates, admin schedules (UI)", async ({
   // ── Student requests a ride ────────────────────────────────────────────
   await student.goto("/rides/new");
   await expect(
-    student.getByRole("heading", { name: "Create Ride" }),
+    student.getByRole("heading", { name: "Request Ride" }),
   ).toBeVisible();
 
   const today = estDateDaysFromNow(0);
-  const tomorrow = estDateDaysFromNow(1);
-  if (tomorrow.getMonth() !== today.getMonth()) {
-    await student.locator('button[type="button"]:has(svg)').nth(1).click();
+  const rideDate = nextServiceDate();
+  if (rideDate.getMonth() !== today.getMonth()) {
+    await student.getByRole("button", { name: "Next month" }).click();
   }
   await student
-    .getByRole("button", { name: String(tomorrow.getDate()), exact: true })
+    .getByRole("button", { name: String(rideDate.getDate()), exact: true })
     .click();
 
   const times = student.getByPlaceholder("hh:mm");
   await pickTime(times.nth(0), PICKUP_TIME);
   await pickTime(student.locator("#pickup-window-from"), "1:30 PM");
   await pickTime(student.locator("#pickup-window-to"), "2:30 PM");
 
-  const selects = student.locator("select");
-  await selects.nth(0).selectOption({ label: PICKUP.name });
-  await selects.nth(1).selectOption({ label: DROPOFF.name });
+  await student
+    .getByRole("combobox", { name: "Pickup location" })
+    .selectOption({ label: PICKUP.name });
+  await student
+    .getByRole("combobox", { name: "Dropoff location" })
+    .selectOption({ label: DROPOFF.name });
 
   const created = student.waitForResponse(
     (r) => r.url().endsWith("/api/routes") && r.request().method() === "POST",
@@ -75,8 +69,8 @@ test("route A: student creates, admin schedules (UI)", async ({
   const { _id: routeId } = (await createRes.json()) as { _id: string };
   await expect(student).toHaveURL(/\/rides$/);
 
-  // Tomorrow is next week when today is Saturday (weeks start Sunday EST).
-  if (isEstSaturday()) {
+  // Weeks start Sunday; a lower weekday means the ride is in next week.
+  if (rideDate.getDay() <= today.getDay()) {
     await student.getByText("Next Week", { exact: true }).click();
   }
 
@@ -120,18 +114,27 @@ test("route A: student creates, admin schedules (UI)", async ({
   expect(scheduleRes.status(), await scheduleRes.text()).toBe(200);
   await expect(row).toHaveCount(0);
 
-  // ── Driver sees it on Tomorrow ─────────────────────────────────────────
+  // ── Driver sees the scheduled ride ─────────────────────────────────────
   const driver = await pageAs("driver");
-  await driver.goto("/rides");
-  await driver.getByText("Tomorrow", { exact: true }).click();
-  const driverCard = driver
-    .getByTestId("ride-card")
-    .filter({ hasText: PICKUP.name })
-    .filter({ hasText: DROPOFF.name });
-  await expect(driverCard).toHaveCount(1);
+  // The driver list only covers today and tomorrow, not Monday after a weekend.
+  if (rideDate.toDateString() === estDateDaysFromNow(1).toDateString()) {
+    await driver.goto("/rides");
+    await driver.getByText("Tomorrow", { exact: true }).click();
+    const driverCard = driver
+      .getByTestId("ride-card")
+      .filter({ hasText: PICKUP.name })
+      .filter({ hasText: DROPOFF.name });
+    await expect(driverCard).toHaveCount(1);
+    await expect(
+      driverCard.getByText("Scheduled", { exact: true }),
+    ).toBeVisible();
+  }
+  await driver.goto(`/rides/${routeId}`);
   await expect(
-    driverCard.getByText("Scheduled", { exact: true }),
-  ).toBeVisible();
+    driver
+      .getByRole("heading", { name: "Ride Details" })
+      .locator("xpath=following-sibling::span[1]"),
+  ).toHaveText("Scheduled");
 
   // ── Student sees scheduled assignment ──────────────────────────────────
   await student.goto(`/rides/${routeId}`);

tests/e2e/routeB.ui.spec.ts

@@ -13,7 +13,7 @@
 import type { Page } from "@playwright/test";
 import { test, expect } from "./fixtures";
 import { PERSONAS, LOCATIONS, VEHICLE } from "./seed";
-import { estDateDaysFromNow } from "./routeTestHelpers";
+import { estDateDaysFromNow, nextServiceDate } from "./routeTestHelpers";
 
 /** TimeInput is a text box with a listbox; typing then Enter commits the first match. */
 async function pickTime(input: ReturnType<Page["locator"]>, label: string) {
@@ -37,15 +37,9 @@ test("route B: driver start → pickup → dropoff (UI)", async ({
   ).toBeVisible();
 
   const today = estDateDaysFromNow(0);
-  let offset = 1;
-  let rideDate = estDateDaysFromNow(offset);
-  while (rideDate.getDay() === 0 || rideDate.getDay() === 6) {
-    offset += 1;
-    rideDate = estDateDaysFromNow(offset);
-  }
+  const rideDate = nextServiceDate();
   if (rideDate.getMonth() !== today.getMonth()) {
-    // Calendar header: [prev][month/year][next]; the nav buttons are the only icon buttons.
-    await student.locator('button[type="button"]:has(svg)').nth(1).click();
+    await student.getByRole("button", { name: "Next month" }).click();
   }
   await student
     .getByRole("button", { name: String(rideDate.getDate()), exact: true })

tests/e2e/routeTestHelpers.ts

@@ -19,6 +19,15 @@ export function estDateDaysFromNow(days: number): Date {
   return addDays(toZonedTime(new Date(), "America/New_York"), days);
 }
 
+export function nextServiceDate(): Date {
+  let offset = 1;
+  let date = estDateDaysFromNow(offset);
+  while (date.getDay() === 0 || date.getDay() === 6) {
+    date = estDateDaysFromNow(++offset);
+  }
+  return date;
+}
+
 export function formatEstTime(iso: string): string {
   return new Date(iso).toLocaleTimeString("en-US", {
     timeZone: "America/New_York",