From 2a786b4652507de8370e127a59bc9c1e200c196e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Omar=20L=C3=B3pez?= <zomars@me.com>
Date: Fri, 23 May 2025 15:30:33 -0700
Subject: [PATCH] Revert "test: fix few e2e flakes (#21408)" (#21501)

---
 apps/web/playwright/bookings-list.e2e.ts        | 6 +-----
 apps/web/playwright/fixtures/users.ts           | 2 +-
 apps/web/playwright/organization/booking.e2e.ts | 6 ++----
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/apps/web/playwright/bookings-list.e2e.ts b/apps/web/playwright/bookings-list.e2e.ts
index df4fe17200..5fe00b7b66 100644
--- a/apps/web/playwright/bookings-list.e2e.ts
+++ b/apps/web/playwright/bookings-list.e2e.ts
@@ -461,14 +461,10 @@ test.describe("Bookings", () => {
 
     await addFilter(page, "userId");
     await openFilter(page, "userId");
-    const bookingsGetResponse2 = page.waitForResponse((response) =>
-      /\/api\/trpc\/bookings\/get.*/.test(response.url())
-    );
-
     await page
       .locator(`[data-testid="select-filter-options-userId"] [role="option"]:has-text("${anotherUser}")`)
       .click();
-    await bookingsGetResponse2;
+    await page.waitForResponse((response) => /\/api\/trpc\/bookings\/get.*/.test(response.url()));
 
     await expect(page.locator('[data-testid="booking-item"]')).toHaveCount(0);
   });
diff --git a/apps/web/playwright/fixtures/users.ts b/apps/web/playwright/fixtures/users.ts
index d42e9a4416..55569252ae 100644
--- a/apps/web/playwright/fixtures/users.ts
+++ b/apps/web/playwright/fixtures/users.ts
@@ -1044,7 +1044,7 @@ export async function login(
   const signInLocator = loginLocator.locator('[type="submit"]');
 
   //login
-  await page.goto("/auth/login");
+  await page.goto("/");
   await page.waitForSelector("text=Welcome back");
 
   await emailLocator.fill(user.email ?? `${user.username}@example.com`);
diff --git a/apps/web/playwright/organization/booking.e2e.ts b/apps/web/playwright/organization/booking.e2e.ts
index 043e3a01ca..e53186147c 100644
--- a/apps/web/playwright/organization/booking.e2e.ts
+++ b/apps/web/playwright/organization/booking.e2e.ts
@@ -431,11 +431,9 @@ test.describe("Bookings", () => {
 
           // Cancel the booking
           await page.goto(`/booking/${bookingUid}`);
-          await page.waitForLoadState("networkidle");
           await page.getByTestId("cancel").click();
-          await submitAndWaitForResponse(page, "/api/cancel", {
-            action: () => page.locator('[data-testid="confirm_cancel"]').click(),
-          });
+          await page.getByTestId("confirm_cancel").click();
+          await page.waitForResponse((response) => response.url().includes("/api/cancel"));
 
           // Logout and go back to booking page
           await page.goto("/auth/logout");