From bff04e8c2b6a7223a577926de44ba16683c1c887 Mon Sep 17 00:00:00 2001
From: Benny Joo <sldisek783@gmail.com>
Date: Thu, 26 Sep 2024 19:00:35 -0400
Subject: [PATCH 01/29] add comment to signup-view

---
 apps/web/modules/signup-view.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/web/modules/signup-view.tsx b/apps/web/modules/signup-view.tsx
index cc28b2bea7876f..37522246590829 100644
--- a/apps/web/modules/signup-view.tsx
+++ b/apps/web/modules/signup-view.tsx
@@ -457,6 +457,7 @@ export default function Signup({
                       onClick={() => {
                         const username = formMethods.getValues("username");
                         if (!username) {
+                          // should not be reached but needed to bypass type errors
                           showToast("error", t("username_required"));
                           return;
                         }

From df537bdd33acdf0177a3d7fc92b594f5666a8c4f Mon Sep 17 00:00:00 2001
From: Benny Joo <sldisek783@gmail.com>
Date: Thu, 26 Sep 2024 19:03:13 -0400
Subject: [PATCH 02/29] add a basic test for saml button in signup

---
 apps/web/modules/signup-view.tsx  | 1 +
 apps/web/playwright/signup.e2e.ts | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/apps/web/modules/signup-view.tsx b/apps/web/modules/signup-view.tsx
index 37522246590829..4bf955a56cd39a 100644
--- a/apps/web/modules/signup-view.tsx
+++ b/apps/web/modules/signup-view.tsx
@@ -573,6 +573,7 @@ export default function Signup({
                   </Button>
                   {isSAMLLoginEnabled && (
                     <Button
+                      data-testid="continue-with-saml-button"
                       color="minimal"
                       disabled={isGoogleLoading}
                       className={classNames("w-full justify-center rounded-md text-center")}
diff --git a/apps/web/playwright/signup.e2e.ts b/apps/web/playwright/signup.e2e.ts
index 227c9483b51424..27961146d8553c 100644
--- a/apps/web/playwright/signup.e2e.ts
+++ b/apps/web/playwright/signup.e2e.ts
@@ -27,6 +27,13 @@ test.describe("Signup Main Page Test", async () => {
     await page.locator('[data-testid="continue-with-google-button"]').click();
     await page.waitForURL("/auth/sso/google");
   });
+
+  test("Continue with SAML button must exist / work", async ({ page }) => {
+    await page.goto("/signup");
+    await expect(page.locator('[data-testid="continue-with-saml-button"]')).toBeVisible();
+    await page.locator('[data-testid="continue-with-saml-button"]').click();
+    await page.waitForURL("/auth/sso/saml");
+  });
 });
 
 test.describe("Email Signup Flow Test", async () => {

From 544207b3b8fa4050a0b47e5e9394d0b1e4bd18e1 Mon Sep 17 00:00:00 2001
From: Benny Joo <sldisek783@gmail.com>
Date: Thu, 26 Sep 2024 19:12:25 -0400
Subject: [PATCH 03/29] add a test for cookie consent checkbox

---
 apps/web/modules/signup-view.tsx  |  3 ++-
 apps/web/playwright/signup.e2e.ts | 22 ++++++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/apps/web/modules/signup-view.tsx b/apps/web/modules/signup-view.tsx
index 4bf955a56cd39a..b2a150403d141d 100644
--- a/apps/web/modules/signup-view.tsx
+++ b/apps/web/modules/signup-view.tsx
@@ -206,7 +206,7 @@ export default function Signup({
     }
   }, [redirectUrl]);
 
-  const [COOKIE_CONSENT, setCOOKIE_CONSENT] = useState(false);
+  const [COOKIE_CONSENT, setCOOKIE_CONSENT] = useState(false); // No need to be checked for user to proceed
 
   function handleConsentChange(consent: boolean) {
     setCOOKIE_CONSENT(!consent);
@@ -432,6 +432,7 @@ export default function Signup({
                   ) : null}
 
                   <CheckboxField
+                    data-testid="signup-cookie-content-checkbox"
                     onChange={() => handleConsentChange(COOKIE_CONSENT)}
                     description={t("cookie_consent_checkbox")}
                   />
diff --git a/apps/web/playwright/signup.e2e.ts b/apps/web/playwright/signup.e2e.ts
index 27961146d8553c..01faae25d4286c 100644
--- a/apps/web/playwright/signup.e2e.ts
+++ b/apps/web/playwright/signup.e2e.ts
@@ -338,4 +338,26 @@ test.describe("Email Signup Flow Test", async () => {
       await context.close();
     });
   });
+
+  test("Checkbox for cookie consent does not need to be checked", async ({ page, users }) => {
+    // log in trail user
+    await test.step("Sign up", async () => {
+      await page.goto("/signup");
+
+      // Navigate to email form
+      await page.locator('[data-testid="continue-with-email-button"]').click();
+
+      // Fill form
+      await page.locator('input[name="username"]').fill("pro");
+      await page.locator('input[name="email"]').fill("pro@example.com");
+      await page.locator('input[name="password"]').fill("Password99!");
+
+      await page.locator('[data-testid="signup-cookie-content-checkbox"]').check();
+      await expect(page.locator('[data-testid="signup-submit-button"]')).toBeEnabled();
+
+      // the cookie consent checkbox does not need to be checked for user to proceed
+      await page.locator('[data-testid="signup-cookie-content-checkbox"]').uncheck();
+      await expect(page.locator('[data-testid="signup-submit-button"]')).toBeEnabled();
+    });
+  });
 });

From 50af4e6c0b64fd4395dfdc1ba1d03295aa42516b Mon Sep 17 00:00:00 2001
From: Benny Joo <sldisek783@gmail.com>
Date: Thu, 26 Sep 2024 19:28:01 -0400
Subject: [PATCH 04/29] refactor and remove duplicates

---
 apps/web/modules/signup-view.tsx  |  1 +
 apps/web/playwright/signup.e2e.ts | 29 +++++++++++++++++------------
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/apps/web/modules/signup-view.tsx b/apps/web/modules/signup-view.tsx
index b2a150403d141d..a1dfc006184be5 100644
--- a/apps/web/modules/signup-view.tsx
+++ b/apps/web/modules/signup-view.tsx
@@ -446,6 +446,7 @@ export default function Signup({
                   )}
                   {isSamlSignup ? (
                     <Button
+                      data-testid="saml-signup-button"
                       color="primary"
                       disabled={
                         !!formMethods.formState.errors.username ||
diff --git a/apps/web/playwright/signup.e2e.ts b/apps/web/playwright/signup.e2e.ts
index 01faae25d4286c..e720d841608446 100644
--- a/apps/web/playwright/signup.e2e.ts
+++ b/apps/web/playwright/signup.e2e.ts
@@ -49,12 +49,13 @@ test.describe("Email Signup Flow Test", async () => {
       await users.create({
         username: "pro",
       });
+      const submitButton = page.locator('[data-testid="signup-submit-button"]');
 
       await page.goto("/signup");
       await expect(page.locator("text=Create your account")).toBeVisible();
       await expect(page.locator('[data-testid="continue-with-email-button"]')).toBeVisible();
       await page.locator('[data-testid="continue-with-email-button"]').click();
-      await expect(page.locator('[data-testid="signup-submit-button"]')).toBeVisible();
+      await expect(submitButton).toBeVisible();
 
       const alertMessage = "Username or email is already taken";
 
@@ -64,7 +65,7 @@ test.describe("Email Signup Flow Test", async () => {
       await page.locator('input[name="password"]').fill("Password99!");
 
       // Submit form
-      await page.click('button[type="submit"]');
+      await submitButton.click();
 
       const alert = await page.waitForSelector('[data-testid="alert"]');
       const alertMessageInner = await alert.innerText();
@@ -79,12 +80,13 @@ test.describe("Email Signup Flow Test", async () => {
       const user = await users.create({
         username: "pro",
       });
+      const submitButton = page.locator('[data-testid="signup-submit-button"]');
 
       await page.goto("/signup");
       await expect(page.locator("text=Create your account")).toBeVisible();
       await expect(page.locator('[data-testid="continue-with-email-button"]')).toBeVisible();
       await page.locator('[data-testid="continue-with-email-button"]').click();
-      await expect(page.locator('[data-testid="signup-submit-button"]')).toBeVisible();
+      await expect(submitButton).toBeVisible();
 
       const alertMessage = "Username or email is already taken";
 
@@ -95,7 +97,7 @@ test.describe("Email Signup Flow Test", async () => {
 
       // Submit form
 
-      await page.click('button[type="submit"]');
+      await submitButton.click();
       const alert = await page.waitForSelector('[data-testid="alert"]');
       const alertMessageInner = await alert.innerText();
 
@@ -110,6 +112,7 @@ test.describe("Email Signup Flow Test", async () => {
       username: "rock",
       password: "Password99!",
     });
+    const submitButton = page.locator('[data-testid="signup-submit-button"]');
     // Ensure the premium username is available
     await prisma.user.deleteMany({ where: { username: "rock" } });
 
@@ -118,14 +121,14 @@ test.describe("Email Signup Flow Test", async () => {
     await expect(page.locator("text=Create your account")).toBeVisible();
     await expect(page.locator('[data-testid="continue-with-email-button"]')).toBeVisible();
     await page.locator('[data-testid="continue-with-email-button"]').click();
-    await expect(page.locator('[data-testid="signup-submit-button"]')).toBeVisible();
+    await expect(submitButton).toBeVisible();
 
     // Fill form
     await page.locator('input[name="username"]').fill("rock");
     await page.locator('input[name="email"]').fill(userToCreate.email);
     await page.locator('input[name="password"]').fill(userToCreate.password);
 
-    await page.click('button[type="submit"]');
+    await submitButton.click();
 
     // Check that stripe checkout is present
     const expectedUrl = "https://checkout.stripe.com";
@@ -144,19 +147,20 @@ test.describe("Email Signup Flow Test", async () => {
       // Email intentonally kept as different from username
       email: `rickjones${Math.random()}-${Date.now()}@example.com`,
     });
+    const submitButton = page.locator('[data-testid="signup-submit-button"]');
 
     await page.goto("/signup");
     await expect(page.locator("text=Create your account")).toBeVisible();
     await expect(page.locator('[data-testid="continue-with-email-button"]')).toBeVisible();
     await page.locator('[data-testid="continue-with-email-button"]').click();
-    await expect(page.locator('[data-testid="signup-submit-button"]')).toBeVisible();
+    await expect(submitButton).toBeVisible();
 
     // Fill form
     await page.locator('input[name="username"]').fill(userToCreate.username);
     await page.locator('input[name="email"]').fill(userToCreate.email);
     await page.locator('input[name="password"]').fill(userToCreate.password);
 
-    await page.click('button[type="submit"]');
+    await submitButton.click();
     await page.waitForURL("/auth/verify-email**");
 
     // Check that the URL matches the expected URL
@@ -251,19 +255,19 @@ test.describe("Email Signup Flow Test", async () => {
       username: "email-verify",
       password: "Password99!",
     });
+    const submitButton = page.locator('[data-testid="signup-submit-button"]');
 
     await page.goto("/signup");
     await expect(page.locator("text=Create your account")).toBeVisible();
     await expect(page.locator('[data-testid="continue-with-email-button"]')).toBeVisible();
     await page.locator('[data-testid="continue-with-email-button"]').click();
-    await expect(page.locator('[data-testid="signup-submit-button"]')).toBeVisible();
+    await expect(submitButton).toBeVisible();
 
     // Fill form
     await page.locator('input[name="username"]').fill(userToCreate.username);
     await page.locator('input[name="email"]').fill(userToCreate.email);
     await page.locator('input[name="password"]').fill(userToCreate.password);
 
-    const submitButton = page.locator('button[type="submit"]');
     await expect(submitButton).toBeEnabled();
     await submitButton.click();
 
@@ -342,6 +346,7 @@ test.describe("Email Signup Flow Test", async () => {
   test("Checkbox for cookie consent does not need to be checked", async ({ page, users }) => {
     // log in trail user
     await test.step("Sign up", async () => {
+      const submitButton = page.locator('[data-testid="signup-submit-button"]');
       await page.goto("/signup");
 
       // Navigate to email form
@@ -353,11 +358,11 @@ test.describe("Email Signup Flow Test", async () => {
       await page.locator('input[name="password"]').fill("Password99!");
 
       await page.locator('[data-testid="signup-cookie-content-checkbox"]').check();
-      await expect(page.locator('[data-testid="signup-submit-button"]')).toBeEnabled();
+      await expect(submitButton).toBeEnabled();
 
       // the cookie consent checkbox does not need to be checked for user to proceed
       await page.locator('[data-testid="signup-cookie-content-checkbox"]').uncheck();
-      await expect(page.locator('[data-testid="signup-submit-button"]')).toBeEnabled();
+      await expect(submitButton).toBeEnabled();
     });
   });
 });

From 47c66ce1175dee923b0c42bac9b925dfb67fdde4 Mon Sep 17 00:00:00 2001
From: Benny Joo <sldisek783@gmail.com>
Date: Thu, 26 Sep 2024 19:29:07 -0400
Subject: [PATCH 05/29] rename data-testid for saml button

---
 apps/web/modules/signup-view.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/web/modules/signup-view.tsx b/apps/web/modules/signup-view.tsx
index a1dfc006184be5..fdadcaacc9ba6c 100644
--- a/apps/web/modules/signup-view.tsx
+++ b/apps/web/modules/signup-view.tsx
@@ -446,7 +446,7 @@ export default function Signup({
                   )}
                   {isSamlSignup ? (
                     <Button
-                      data-testid="saml-signup-button"
+                      data-testid="saml-submit-button"
                       color="primary"
                       disabled={
                         !!formMethods.formState.errors.username ||

From 77107e8ae3e00a8fdd18705ab19707753940eaaf Mon Sep 17 00:00:00 2001
From: Benny Joo <sldisek783@gmail.com>
Date: Thu, 26 Sep 2024 19:35:18 -0400
Subject: [PATCH 06/29] add test for saml

---
 apps/web/playwright/signup.e2e.ts | 53 ++++++++++++++++++++++++++++++-
 1 file changed, 52 insertions(+), 1 deletion(-)

diff --git a/apps/web/playwright/signup.e2e.ts b/apps/web/playwright/signup.e2e.ts
index e720d841608446..cbfa75c9a6ece8 100644
--- a/apps/web/playwright/signup.e2e.ts
+++ b/apps/web/playwright/signup.e2e.ts
@@ -32,7 +32,6 @@ test.describe("Signup Main Page Test", async () => {
     await page.goto("/signup");
     await expect(page.locator('[data-testid="continue-with-saml-button"]')).toBeVisible();
     await page.locator('[data-testid="continue-with-saml-button"]').click();
-    await page.waitForURL("/auth/sso/saml");
   });
 });
 
@@ -366,3 +365,55 @@ test.describe("Email Signup Flow Test", async () => {
     });
   });
 });
+
+test.describe("SAML Signup Flow Test", async () => {
+  test.beforeEach(async ({ features }) => {
+    features.reset(); // This resets to the inital state not an empt yarray
+  });
+  test.afterEach(async ({ users }) => {
+    await users.deleteAll();
+  });
+  test("Password input should not exist", async ({ page }) => {
+    await page.goto("/signup");
+    await page.locator('[data-testid="continue-with-saml-button"]').click();
+
+    await expect(page.locator('input[name="password"]')).not.toBeVisible();
+  });
+
+  test("Premium Username Flow - creates stripe checkout", async ({ page, users, prisma }) => {
+    const submitButton = page.locator('[data-testid="saml-submit-button"]');
+    await page.goto("/signup");
+
+    // Navigate to email form
+    await page.locator('[data-testid="continue-with-saml-button"]').click();
+    // Fill form
+    await page.locator('input[name="username"]').fill("pro");
+    await page.locator('input[name="email"]').fill("pro@example.com");
+
+    await submitButton.click();
+
+    await page.waitForURL("/auth/sso/saml");
+  });
+
+  test("Checkbox for cookie consent does not need to be checked", async ({ page, users }) => {
+    // log in trail user
+    await test.step("Sign up", async () => {
+      const submitButton = page.locator('[data-testid="saml-submit-button"]');
+      await page.goto("/signup");
+
+      // Navigate to email form
+      await page.locator('[data-testid="continue-with-saml-button"]').click();
+
+      // Fill form
+      await page.locator('input[name="username"]').fill("pro");
+      await page.locator('input[name="email"]').fill("pro@example.com");
+
+      await page.locator('[data-testid="signup-cookie-content-checkbox"]').check();
+      await expect(submitButton).toBeEnabled();
+
+      // the cookie consent checkbox does not need to be checked for user to proceed
+      await page.locator('[data-testid="signup-cookie-content-checkbox"]').uncheck();
+      await expect(submitButton).toBeEnabled();
+    });
+  });
+});

From 918740f2aba0ca8dfc791bcedc31322c583b9ead Mon Sep 17 00:00:00 2001
From: Benny Joo <sldisek783@gmail.com>
Date: Thu, 26 Sep 2024 19:37:58 -0400
Subject: [PATCH 07/29] remove code not needed

---
 apps/web/playwright/signup.e2e.ts | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/apps/web/playwright/signup.e2e.ts b/apps/web/playwright/signup.e2e.ts
index cbfa75c9a6ece8..0e4c1a96f5b9b4 100644
--- a/apps/web/playwright/signup.e2e.ts
+++ b/apps/web/playwright/signup.e2e.ts
@@ -367,12 +367,6 @@ test.describe("Email Signup Flow Test", async () => {
 });
 
 test.describe("SAML Signup Flow Test", async () => {
-  test.beforeEach(async ({ features }) => {
-    features.reset(); // This resets to the inital state not an empt yarray
-  });
-  test.afterEach(async ({ users }) => {
-    await users.deleteAll();
-  });
   test("Password input should not exist", async ({ page }) => {
     await page.goto("/signup");
     await page.locator('[data-testid="continue-with-saml-button"]').click();
@@ -380,7 +374,7 @@ test.describe("SAML Signup Flow Test", async () => {
     await expect(page.locator('input[name="password"]')).not.toBeVisible();
   });
 
-  test("Premium Username Flow - creates stripe checkout", async ({ page, users, prisma }) => {
+  test("Premium Username Flow - creates stripe checkout", async ({ page }) => {
     const submitButton = page.locator('[data-testid="saml-submit-button"]');
     await page.goto("/signup");
 
@@ -395,7 +389,7 @@ test.describe("SAML Signup Flow Test", async () => {
     await page.waitForURL("/auth/sso/saml");
   });
 
-  test("Checkbox for cookie consent does not need to be checked", async ({ page, users }) => {
+  test("Checkbox for cookie consent does not need to be checked", async ({ page }) => {
     // log in trail user
     await test.step("Sign up", async () => {
       const submitButton = page.locator('[data-testid="saml-submit-button"]');

From b278084b0b0ee76e4bba2f34bcb5421cfd9b294d Mon Sep 17 00:00:00 2001
From: Benny Joo <sldisek783@gmail.com>
Date: Thu, 26 Sep 2024 20:25:54 -0400
Subject: [PATCH 08/29] better naming

---
 apps/web/modules/signup-view.tsx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/web/modules/signup-view.tsx b/apps/web/modules/signup-view.tsx
index fdadcaacc9ba6c..95568f4dd912c6 100644
--- a/apps/web/modules/signup-view.tsx
+++ b/apps/web/modules/signup-view.tsx
@@ -206,10 +206,10 @@ export default function Signup({
     }
   }, [redirectUrl]);
 
-  const [COOKIE_CONSENT, setCOOKIE_CONSENT] = useState(false); // No need to be checked for user to proceed
+  const [userConsentToCookie, setUserConsentToCookie] = useState(false); // No need to be checked for user to proceed
 
   function handleConsentChange(consent: boolean) {
-    setCOOKIE_CONSENT(!consent);
+    setUserConsentToCookie(!consent);
   }
 
   const loadingSubmitState = isSubmitSuccessful || isSubmitting;
@@ -297,7 +297,7 @@ export default function Signup({
 
   return (
     <>
-      {IS_CALCOM && (!IS_EUROPE || COOKIE_CONSENT) ? (
+      {IS_CALCOM && (!IS_EUROPE || userConsentToCookie) ? (
         <>
           {process.env.NEXT_PUBLIC_GTM_ID && (
             <>
@@ -433,7 +433,7 @@ export default function Signup({
 
                   <CheckboxField
                     data-testid="signup-cookie-content-checkbox"
-                    onChange={() => handleConsentChange(COOKIE_CONSENT)}
+                    onChange={() => handleConsentChange(userConsentToCookie)}
                     description={t("cookie_consent_checkbox")}
                   />
                   {errors.apiError && (

From a1810f28fa2073166bfec93c9376c8fb11534e8b Mon Sep 17 00:00:00 2001
From: Benny Joo <sldisek783@gmail.com>
Date: Thu, 26 Sep 2024 20:53:24 -0400
Subject: [PATCH 09/29] improve

---
 apps/web/playwright/signup.e2e.ts | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/apps/web/playwright/signup.e2e.ts b/apps/web/playwright/signup.e2e.ts
index 0e4c1a96f5b9b4..705d1794bcf465 100644
--- a/apps/web/playwright/signup.e2e.ts
+++ b/apps/web/playwright/signup.e2e.ts
@@ -346,6 +346,7 @@ test.describe("Email Signup Flow Test", async () => {
     // log in trail user
     await test.step("Sign up", async () => {
       const submitButton = page.locator('[data-testid="signup-submit-button"]');
+      const checkbox = page.locator('[data-testid="signup-cookie-content-checkbox"]');
       await page.goto("/signup");
 
       // Navigate to email form
@@ -356,25 +357,19 @@ test.describe("Email Signup Flow Test", async () => {
       await page.locator('input[name="email"]').fill("pro@example.com");
       await page.locator('input[name="password"]').fill("Password99!");
 
-      await page.locator('[data-testid="signup-cookie-content-checkbox"]').check();
+      await expect(checkbox).toBeVisible();
+      await checkbox.check();
       await expect(submitButton).toBeEnabled();
 
       // the cookie consent checkbox does not need to be checked for user to proceed
-      await page.locator('[data-testid="signup-cookie-content-checkbox"]').uncheck();
+      await checkbox.uncheck();
       await expect(submitButton).toBeEnabled();
     });
   });
 });
 
 test.describe("SAML Signup Flow Test", async () => {
-  test("Password input should not exist", async ({ page }) => {
-    await page.goto("/signup");
-    await page.locator('[data-testid="continue-with-saml-button"]').click();
-
-    await expect(page.locator('input[name="password"]')).not.toBeVisible();
-  });
-
-  test("Premium Username Flow - creates stripe checkout", async ({ page }) => {
+  test("Should navigate user to another URL", async ({ page }) => {
     const submitButton = page.locator('[data-testid="saml-submit-button"]');
     await page.goto("/signup");
 
@@ -389,10 +384,18 @@ test.describe("SAML Signup Flow Test", async () => {
     await page.waitForURL("/auth/sso/saml");
   });
 
+  test("Password input should not exist", async ({ page }) => {
+    await page.goto("/signup");
+    await page.locator('[data-testid="continue-with-saml-button"]').click();
+
+    await expect(page.locator('input[name="password"]')).not.toBeVisible();
+  });
+
   test("Checkbox for cookie consent does not need to be checked", async ({ page }) => {
     // log in trail user
     await test.step("Sign up", async () => {
       const submitButton = page.locator('[data-testid="saml-submit-button"]');
+      const checkbox = page.locator('[data-testid="signup-cookie-content-checkbox"]');
       await page.goto("/signup");
 
       // Navigate to email form
@@ -401,12 +404,12 @@ test.describe("SAML Signup Flow Test", async () => {
       // Fill form
       await page.locator('input[name="username"]').fill("pro");
       await page.locator('input[name="email"]').fill("pro@example.com");
-
-      await page.locator('[data-testid="signup-cookie-content-checkbox"]').check();
+      await expect(checkbox).toBeVisible();
+      await checkbox.check();
       await expect(submitButton).toBeEnabled();
 
       // the cookie consent checkbox does not need to be checked for user to proceed
-      await page.locator('[data-testid="signup-cookie-content-checkbox"]').uncheck();
+      await checkbox.uncheck();
       await expect(submitButton).toBeEnabled();
     });
   });

From 6fc0d342675de0b10926af72f1db0bfb252b697c Mon Sep 17 00:00:00 2001
From: Benny Joo <sldisek783@gmail.com>
Date: Fri, 27 Sep 2024 15:26:07 -0400
Subject: [PATCH 10/29] address code nit

---
 apps/web/playwright/signup.e2e.ts | 74 +++++++++++++++----------------
 1 file changed, 37 insertions(+), 37 deletions(-)

diff --git a/apps/web/playwright/signup.e2e.ts b/apps/web/playwright/signup.e2e.ts
index 705d1794bcf465..eb621439944abe 100644
--- a/apps/web/playwright/signup.e2e.ts
+++ b/apps/web/playwright/signup.e2e.ts
@@ -17,21 +17,21 @@ test.describe("Signup Main Page Test", async () => {
 
   test("Continue with email button must exist / work", async ({ page }) => {
     await page.goto("/signup");
-    await expect(page.locator('[data-testid="continue-with-email-button"]')).toBeVisible();
-    await page.locator('[data-testid="continue-with-email-button"]').click();
+    await expect(page.getByTestId("continue-with-email-button")).toBeVisible();
+    await page.getByTestId("continue-with-email-button").click();
   });
 
   test("Continue with google button must exist / work", async ({ page }) => {
     await page.goto("/signup");
-    await expect(page.locator('[data-testid="continue-with-google-button"]')).toBeVisible();
-    await page.locator('[data-testid="continue-with-google-button"]').click();
+    await expect(page.getByTestId("continue-with-google-button")).toBeVisible();
+    await page.getByTestId("continue-with-google-button").click();
     await page.waitForURL("/auth/sso/google");
   });
 
   test("Continue with SAML button must exist / work", async ({ page }) => {
     await page.goto("/signup");
-    await expect(page.locator('[data-testid="continue-with-saml-button"]')).toBeVisible();
-    await page.locator('[data-testid="continue-with-saml-button"]').click();
+    await expect(page.getByTestId("continue-with-saml-button")).toBeVisible();
+    await page.getByTestId("continue-with-saml-button").click();
   });
 });
 
@@ -48,12 +48,12 @@ test.describe("Email Signup Flow Test", async () => {
       await users.create({
         username: "pro",
       });
-      const submitButton = page.locator('[data-testid="signup-submit-button"]');
+      const submitButton = page.getByTestId("signup-submit-button");
 
       await page.goto("/signup");
       await expect(page.locator("text=Create your account")).toBeVisible();
-      await expect(page.locator('[data-testid="continue-with-email-button"]')).toBeVisible();
-      await page.locator('[data-testid="continue-with-email-button"]').click();
+      await expect(page.getByTestId("continue-with-email-button")).toBeVisible();
+      await page.getByTestId("continue-with-email-button").click();
       await expect(submitButton).toBeVisible();
 
       const alertMessage = "Username or email is already taken";
@@ -79,12 +79,12 @@ test.describe("Email Signup Flow Test", async () => {
       const user = await users.create({
         username: "pro",
       });
-      const submitButton = page.locator('[data-testid="signup-submit-button"]');
+      const submitButton = page.getByTestId("signup-submit-button");
 
       await page.goto("/signup");
       await expect(page.locator("text=Create your account")).toBeVisible();
-      await expect(page.locator('[data-testid="continue-with-email-button"]')).toBeVisible();
-      await page.locator('[data-testid="continue-with-email-button"]').click();
+      await expect(page.getByTestId("continue-with-email-button")).toBeVisible();
+      await page.getByTestId("continue-with-email-button").click();
       await expect(submitButton).toBeVisible();
 
       const alertMessage = "Username or email is already taken";
@@ -111,15 +111,15 @@ test.describe("Email Signup Flow Test", async () => {
       username: "rock",
       password: "Password99!",
     });
-    const submitButton = page.locator('[data-testid="signup-submit-button"]');
+    const submitButton = page.getByTestId("signup-submit-button");
     // Ensure the premium username is available
     await prisma.user.deleteMany({ where: { username: "rock" } });
 
     // Signup with premium username name
     await page.goto("/signup");
     await expect(page.locator("text=Create your account")).toBeVisible();
-    await expect(page.locator('[data-testid="continue-with-email-button"]')).toBeVisible();
-    await page.locator('[data-testid="continue-with-email-button"]').click();
+    await expect(page.getByTestId("continue-with-email-button")).toBeVisible();
+    await page.getByTestId("continue-with-email-button").click();
     await expect(submitButton).toBeVisible();
 
     // Fill form
@@ -146,12 +146,12 @@ test.describe("Email Signup Flow Test", async () => {
       // Email intentonally kept as different from username
       email: `rickjones${Math.random()}-${Date.now()}@example.com`,
     });
-    const submitButton = page.locator('[data-testid="signup-submit-button"]');
+    const submitButton = page.getByTestId("signup-submit-button");
 
     await page.goto("/signup");
     await expect(page.locator("text=Create your account")).toBeVisible();
-    await expect(page.locator('[data-testid="continue-with-email-button"]')).toBeVisible();
-    await page.locator('[data-testid="continue-with-email-button"]').click();
+    await expect(page.getByTestId("continue-with-email-button")).toBeVisible();
+    await page.getByTestId("continue-with-email-button").click();
     await expect(submitButton).toBeVisible();
 
     // Fill form
@@ -172,9 +172,9 @@ test.describe("Email Signup Flow Test", async () => {
     const signupUrlWithParams = "/signup?username=rick-jones&email=rick-jones%40example.com";
     await page.goto(signupUrlWithParams);
     await expect(page.locator("text=Create your account")).toBeVisible();
-    await expect(page.locator('[data-testid="continue-with-email-button"]')).toBeVisible();
-    await page.locator('[data-testid="continue-with-email-button"]').click();
-    await expect(page.locator('[data-testid="signup-submit-button"]')).toBeVisible();
+    await expect(page.getByTestId("continue-with-email-button")).toBeVisible();
+    await page.getByTestId("continue-with-email-button").click();
+    await expect(page.getByTestId("signup-submit-button")).toBeVisible();
 
     // Fill form
     const usernameInput = page.locator('input[name="username"]');
@@ -225,7 +225,7 @@ test.describe("Email Signup Flow Test", async () => {
     const signupUrlWithToken = `/signup?token=${token}`;
     await page.goto(signupUrlWithToken);
     await expect(page.locator("text=Create your account")).toBeVisible();
-    await expect(page.locator('[data-testid="signup-submit-button"]')).toBeVisible();
+    await expect(page.getByTestId("signup-submit-button")).toBeVisible();
 
     const usernameField = page.locator('input[name="username"]');
     const emailField = page.locator('input[name="email"]');
@@ -254,12 +254,12 @@ test.describe("Email Signup Flow Test", async () => {
       username: "email-verify",
       password: "Password99!",
     });
-    const submitButton = page.locator('[data-testid="signup-submit-button"]');
+    const submitButton = page.getByTestId("signup-submit-button");
 
     await page.goto("/signup");
     await expect(page.locator("text=Create your account")).toBeVisible();
-    await expect(page.locator('[data-testid="continue-with-email-button"]')).toBeVisible();
-    await page.locator('[data-testid="continue-with-email-button"]').click();
+    await expect(page.getByTestId("continue-with-email-button")).toBeVisible();
+    await page.getByTestId("continue-with-email-button").click();
     await expect(submitButton).toBeVisible();
 
     // Fill form
@@ -330,9 +330,9 @@ test.describe("Email Signup Flow Test", async () => {
 
       const url = new URL(newPage.url());
       expect(url.pathname).toBe("/signup");
-      await expect(page.locator('[data-testid="continue-with-email-button"]')).toBeVisible();
-      await page.locator('[data-testid="continue-with-email-button"]').click();
-      await expect(page.locator('[data-testid="signup-submit-button"]')).toBeVisible();
+      await expect(page.getByTestId("continue-with-email-button")).toBeVisible();
+      await page.getByTestId("continue-with-email-button").click();
+      await expect(page.getByTestId("signup-submit-button")).toBeVisible();
       // Check required fields
       await newPage.locator("input[name=password]").fill(`P4ssw0rd!`);
       await newPage.locator("button[type=submit]").click();
@@ -345,12 +345,12 @@ test.describe("Email Signup Flow Test", async () => {
   test("Checkbox for cookie consent does not need to be checked", async ({ page, users }) => {
     // log in trail user
     await test.step("Sign up", async () => {
-      const submitButton = page.locator('[data-testid="signup-submit-button"]');
-      const checkbox = page.locator('[data-testid="signup-cookie-content-checkbox"]');
+      const submitButton = page.getByTestId("signup-submit-button");
+      const checkbox = page.getByTestId("signup-cookie-content-checkbox");
       await page.goto("/signup");
 
       // Navigate to email form
-      await page.locator('[data-testid="continue-with-email-button"]').click();
+      await page.getByTestId("continue-with-email-button").click();
 
       // Fill form
       await page.locator('input[name="username"]').fill("pro");
@@ -370,11 +370,11 @@ test.describe("Email Signup Flow Test", async () => {
 
 test.describe("SAML Signup Flow Test", async () => {
   test("Should navigate user to another URL", async ({ page }) => {
-    const submitButton = page.locator('[data-testid="saml-submit-button"]');
+    const submitButton = page.getByTestId("saml-submit-button");
     await page.goto("/signup");
 
     // Navigate to email form
-    await page.locator('[data-testid="continue-with-saml-button"]').click();
+    await page.getByTestId("continue-with-saml-button").click();
     // Fill form
     await page.locator('input[name="username"]').fill("pro");
     await page.locator('input[name="email"]').fill("pro@example.com");
@@ -386,7 +386,7 @@ test.describe("SAML Signup Flow Test", async () => {
 
   test("Password input should not exist", async ({ page }) => {
     await page.goto("/signup");
-    await page.locator('[data-testid="continue-with-saml-button"]').click();
+    await page.getByTestId("continue-with-saml-button").click();
 
     await expect(page.locator('input[name="password"]')).not.toBeVisible();
   });
@@ -394,12 +394,12 @@ test.describe("SAML Signup Flow Test", async () => {
   test("Checkbox for cookie consent does not need to be checked", async ({ page }) => {
     // log in trail user
     await test.step("Sign up", async () => {
-      const submitButton = page.locator('[data-testid="saml-submit-button"]');
-      const checkbox = page.locator('[data-testid="signup-cookie-content-checkbox"]');
+      const submitButton = page.getByTestId("saml-submit-button");
+      const checkbox = page.getByTestId("signup-cookie-content-checkbox");
       await page.goto("/signup");
 
       // Navigate to email form
-      await page.locator('[data-testid="continue-with-saml-button"]').click();
+      await page.getByTestId("continue-with-saml-button").click();
 
       // Fill form
       await page.locator('input[name="username"]').fill("pro");

From 84dd4fd599dc57b0f09f3cc2b2de9f06eac1b2da Mon Sep 17 00:00:00 2001
From: Benny Joo <sldisek783@gmail.com>
Date: Fri, 27 Sep 2024 15:30:40 -0400
Subject: [PATCH 11/29] skip saml test when needed

---
 apps/web/playwright/signup.e2e.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/apps/web/playwright/signup.e2e.ts b/apps/web/playwright/signup.e2e.ts
index eb621439944abe..6c0bd759c0b415 100644
--- a/apps/web/playwright/signup.e2e.ts
+++ b/apps/web/playwright/signup.e2e.ts
@@ -1,6 +1,7 @@
 import { expect } from "@playwright/test";
 import { randomBytes } from "crypto";
 
+import { isSAMLLoginEnabled } from "@calcom/features/ee/sso/lib/saml";
 import { APP_NAME, IS_PREMIUM_USERNAME_ENABLED, IS_MAILHOG_ENABLED } from "@calcom/lib/constants";
 import prisma from "@calcom/prisma";
 
@@ -369,6 +370,9 @@ test.describe("Email Signup Flow Test", async () => {
 });
 
 test.describe("SAML Signup Flow Test", async () => {
+  // eslint-disable-next-line playwright/no-skipped-test
+  test.skip(isSAMLLoginEnabled, "Skipping due to SAML login being disabled");
+
   test("Should navigate user to another URL", async ({ page }) => {
     const submitButton = page.getByTestId("saml-submit-button");
     await page.goto("/signup");

From f3c7a382abdfe8cbb6dd37646dbe57542270b8e3 Mon Sep 17 00:00:00 2001
From: Benny Joo <sldisek783@gmail.com>
Date: Fri, 27 Sep 2024 15:54:18 -0400
Subject: [PATCH 12/29] fix flag

---
 apps/web/playwright/signup.e2e.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/web/playwright/signup.e2e.ts b/apps/web/playwright/signup.e2e.ts
index 6c0bd759c0b415..e60fa3b1625320 100644
--- a/apps/web/playwright/signup.e2e.ts
+++ b/apps/web/playwright/signup.e2e.ts
@@ -371,7 +371,7 @@ test.describe("Email Signup Flow Test", async () => {
 
 test.describe("SAML Signup Flow Test", async () => {
   // eslint-disable-next-line playwright/no-skipped-test
-  test.skip(isSAMLLoginEnabled, "Skipping due to SAML login being disabled");
+  test.skip(!isSAMLLoginEnabled, "Skipping due to SAML login being disabled");
 
   test("Should navigate user to another URL", async ({ page }) => {
     const submitButton = page.getByTestId("saml-submit-button");

From f7da043c5e12160c8fffc87b2beff518c5bba9f4 Mon Sep 17 00:00:00 2001
From: Benny Joo <sldisek783@gmail.com>
Date: Sat, 28 Sep 2024 18:24:31 -0400
Subject: [PATCH 13/29] improve

---
 apps/web/playwright/signup.e2e.ts | 54 ++++++++++++++++++++-----------
 1 file changed, 36 insertions(+), 18 deletions(-)

diff --git a/apps/web/playwright/signup.e2e.ts b/apps/web/playwright/signup.e2e.ts
index e60fa3b1625320..c591d52832523b 100644
--- a/apps/web/playwright/signup.e2e.ts
+++ b/apps/web/playwright/signup.e2e.ts
@@ -49,13 +49,11 @@ test.describe("Email Signup Flow Test", async () => {
       await users.create({
         username: "pro",
       });
-      const submitButton = page.getByTestId("signup-submit-button");
 
       await page.goto("/signup");
       await expect(page.locator("text=Create your account")).toBeVisible();
       await expect(page.getByTestId("continue-with-email-button")).toBeVisible();
       await page.getByTestId("continue-with-email-button").click();
-      await expect(submitButton).toBeVisible();
 
       const alertMessage = "Username or email is already taken";
 
@@ -65,6 +63,9 @@ test.describe("Email Signup Flow Test", async () => {
       await page.locator('input[name="password"]').fill("Password99!");
 
       // Submit form
+      const submitButton = page.getByTestId("signup-submit-button");
+      await expect(submitButton).toBeVisible();
+      await expect(submitButton).toBeEnabled();
       await submitButton.click();
 
       const alert = await page.waitForSelector('[data-testid="alert"]');
@@ -80,13 +81,11 @@ test.describe("Email Signup Flow Test", async () => {
       const user = await users.create({
         username: "pro",
       });
-      const submitButton = page.getByTestId("signup-submit-button");
 
       await page.goto("/signup");
       await expect(page.locator("text=Create your account")).toBeVisible();
       await expect(page.getByTestId("continue-with-email-button")).toBeVisible();
       await page.getByTestId("continue-with-email-button").click();
-      await expect(submitButton).toBeVisible();
 
       const alertMessage = "Username or email is already taken";
 
@@ -96,8 +95,11 @@ test.describe("Email Signup Flow Test", async () => {
       await page.locator('input[name="password"]').fill("Password99!");
 
       // Submit form
-
+      const submitButton = page.getByTestId("signup-submit-button");
+      await expect(submitButton).toBeVisible();
+      await expect(submitButton).toBeEnabled();
       await submitButton.click();
+
       const alert = await page.waitForSelector('[data-testid="alert"]');
       const alertMessageInner = await alert.innerText();
 
@@ -112,7 +114,6 @@ test.describe("Email Signup Flow Test", async () => {
       username: "rock",
       password: "Password99!",
     });
-    const submitButton = page.getByTestId("signup-submit-button");
     // Ensure the premium username is available
     await prisma.user.deleteMany({ where: { username: "rock" } });
 
@@ -121,13 +122,16 @@ test.describe("Email Signup Flow Test", async () => {
     await expect(page.locator("text=Create your account")).toBeVisible();
     await expect(page.getByTestId("continue-with-email-button")).toBeVisible();
     await page.getByTestId("continue-with-email-button").click();
-    await expect(submitButton).toBeVisible();
 
     // Fill form
     await page.locator('input[name="username"]').fill("rock");
     await page.locator('input[name="email"]').fill(userToCreate.email);
     await page.locator('input[name="password"]').fill(userToCreate.password);
 
+    // Submit form
+    const submitButton = page.getByTestId("signup-submit-button");
+    await expect(submitButton).toBeVisible();
+    await expect(submitButton).toBeEnabled();
     await submitButton.click();
 
     // Check that stripe checkout is present
@@ -147,20 +151,23 @@ test.describe("Email Signup Flow Test", async () => {
       // Email intentonally kept as different from username
       email: `rickjones${Math.random()}-${Date.now()}@example.com`,
     });
-    const submitButton = page.getByTestId("signup-submit-button");
 
     await page.goto("/signup");
     await expect(page.locator("text=Create your account")).toBeVisible();
     await expect(page.getByTestId("continue-with-email-button")).toBeVisible();
     await page.getByTestId("continue-with-email-button").click();
-    await expect(submitButton).toBeVisible();
 
     // Fill form
     await page.locator('input[name="username"]').fill(userToCreate.username);
     await page.locator('input[name="email"]').fill(userToCreate.email);
     await page.locator('input[name="password"]').fill(userToCreate.password);
 
+    // Submit form
+    const submitButton = page.getByTestId("signup-submit-button");
+    await expect(submitButton).toBeVisible();
+    await expect(submitButton).toBeEnabled();
     await submitButton.click();
+
     await page.waitForURL("/auth/verify-email**");
 
     // Check that the URL matches the expected URL
@@ -255,19 +262,20 @@ test.describe("Email Signup Flow Test", async () => {
       username: "email-verify",
       password: "Password99!",
     });
-    const submitButton = page.getByTestId("signup-submit-button");
 
     await page.goto("/signup");
     await expect(page.locator("text=Create your account")).toBeVisible();
     await expect(page.getByTestId("continue-with-email-button")).toBeVisible();
     await page.getByTestId("continue-with-email-button").click();
-    await expect(submitButton).toBeVisible();
 
     // Fill form
     await page.locator('input[name="username"]').fill(userToCreate.username);
     await page.locator('input[name="email"]').fill(userToCreate.email);
     await page.locator('input[name="password"]').fill(userToCreate.password);
 
+    // Submit form
+    const submitButton = page.getByTestId("signup-submit-button");
+    await expect(submitButton).toBeVisible();
     await expect(submitButton).toBeEnabled();
     await submitButton.click();
 
@@ -346,8 +354,6 @@ test.describe("Email Signup Flow Test", async () => {
   test("Checkbox for cookie consent does not need to be checked", async ({ page, users }) => {
     // log in trail user
     await test.step("Sign up", async () => {
-      const submitButton = page.getByTestId("signup-submit-button");
-      const checkbox = page.getByTestId("signup-cookie-content-checkbox");
       await page.goto("/signup");
 
       // Navigate to email form
@@ -358,7 +364,12 @@ test.describe("Email Signup Flow Test", async () => {
       await page.locator('input[name="email"]').fill("pro@example.com");
       await page.locator('input[name="password"]').fill("Password99!");
 
-      await expect(checkbox).toBeVisible();
+      const submitButton = page.getByTestId("signup-submit-button");
+      const checkbox = page.getByTestId("signup-cookie-content-checkbox");
+
+      await submitButton.waitFor({ state: "visible" });
+      await checkbox.waitFor({ state: "visible" });
+      await checkbox.waitFor({ state: "attached" });
       await checkbox.check();
       await expect(submitButton).toBeEnabled();
 
@@ -374,7 +385,6 @@ test.describe("SAML Signup Flow Test", async () => {
   test.skip(!isSAMLLoginEnabled, "Skipping due to SAML login being disabled");
 
   test("Should navigate user to another URL", async ({ page }) => {
-    const submitButton = page.getByTestId("saml-submit-button");
     await page.goto("/signup");
 
     // Navigate to email form
@@ -383,6 +393,10 @@ test.describe("SAML Signup Flow Test", async () => {
     await page.locator('input[name="username"]').fill("pro");
     await page.locator('input[name="email"]').fill("pro@example.com");
 
+    // Submit form
+    const submitButton = page.getByTestId("saml-submit-button");
+    await submitButton.waitFor({ state: "visible" });
+    await expect(submitButton).toBeEnabled();
     await submitButton.click();
 
     await page.waitForURL("/auth/sso/saml");
@@ -398,8 +412,6 @@ test.describe("SAML Signup Flow Test", async () => {
   test("Checkbox for cookie consent does not need to be checked", async ({ page }) => {
     // log in trail user
     await test.step("Sign up", async () => {
-      const submitButton = page.getByTestId("saml-submit-button");
-      const checkbox = page.getByTestId("signup-cookie-content-checkbox");
       await page.goto("/signup");
 
       // Navigate to email form
@@ -408,7 +420,13 @@ test.describe("SAML Signup Flow Test", async () => {
       // Fill form
       await page.locator('input[name="username"]').fill("pro");
       await page.locator('input[name="email"]').fill("pro@example.com");
-      await expect(checkbox).toBeVisible();
+
+      const submitButton = page.getByTestId("saml-submit-button");
+      const checkbox = page.getByTestId("signup-cookie-content-checkbox");
+
+      await submitButton.waitFor({ state: "visible" });
+      await checkbox.waitFor({ state: "visible" });
+      await checkbox.waitFor({ state: "attached" });
       await checkbox.check();
       await expect(submitButton).toBeEnabled();
 

From ab9fefc8044d5c21e7a0b0a73592577634f9659c Mon Sep 17 00:00:00 2001
From: Benny Joo <sldisek783@gmail.com>
Date: Sat, 28 Sep 2024 18:37:07 -0400
Subject: [PATCH 14/29] improve more

---
 apps/web/modules/signup-view.tsx  |  1 +
 apps/web/playwright/signup.e2e.ts | 20 ++++++++++++++------
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/apps/web/modules/signup-view.tsx b/apps/web/modules/signup-view.tsx
index 95568f4dd912c6..321c82698be618 100644
--- a/apps/web/modules/signup-view.tsx
+++ b/apps/web/modules/signup-view.tsx
@@ -342,6 +342,7 @@ export default function Signup({
                   color="minimal"
                   className="hover:bg-subtle todesktop:mt-10 mb-6 flex h-6 max-h-6 w-full items-center rounded-md px-3 py-2"
                   StartIcon="arrow-left"
+                  data-testid="signup-back-button"
                   onClick={() => {
                     setDisplayEmailForm(false);
                     setIsSamlSignup(false);
diff --git a/apps/web/playwright/signup.e2e.ts b/apps/web/playwright/signup.e2e.ts
index c591d52832523b..f86ca9b672094a 100644
--- a/apps/web/playwright/signup.e2e.ts
+++ b/apps/web/playwright/signup.e2e.ts
@@ -18,21 +18,29 @@ test.describe("Signup Main Page Test", async () => {
 
   test("Continue with email button must exist / work", async ({ page }) => {
     await page.goto("/signup");
-    await expect(page.getByTestId("continue-with-email-button")).toBeVisible();
-    await page.getByTestId("continue-with-email-button").click();
+    const button = page.getByTestId("continue-with-email-button");
+    await expect(button).toBeVisible();
+    await expect(button).toBeEnabled();
+    await button.click();
+    await expect(page.getByTestId("signup-back-button")).toBeVisible();
   });
 
   test("Continue with google button must exist / work", async ({ page }) => {
     await page.goto("/signup");
-    await expect(page.getByTestId("continue-with-google-button")).toBeVisible();
-    await page.getByTestId("continue-with-google-button").click();
+    const button = page.getByTestId("continue-with-google-button");
+    await expect(button).toBeVisible();
+    await expect(button).toBeEnabled();
+    await button.click();
     await page.waitForURL("/auth/sso/google");
   });
 
   test("Continue with SAML button must exist / work", async ({ page }) => {
     await page.goto("/signup");
-    await expect(page.getByTestId("continue-with-saml-button")).toBeVisible();
-    await page.getByTestId("continue-with-saml-button").click();
+    const button = page.getByTestId("continue-with-saml-button");
+    await expect(button).toBeVisible();
+    await expect(button).toBeEnabled();
+    await button.click();
+    await expect(page.getByTestId("signup-back-button")).toBeVisible();
   });
 });
 

From 6fe47f2daaf04aa6ba430671682deade9741b2e8 Mon Sep 17 00:00:00 2001
From: Benny Joo <sldisek783@gmail.com>
Date: Sat, 28 Sep 2024 18:39:56 -0400
Subject: [PATCH 15/29] refactor

---
 apps/web/playwright/signup.e2e.ts | 72 ++++++++++++++-----------------
 1 file changed, 33 insertions(+), 39 deletions(-)

diff --git a/apps/web/playwright/signup.e2e.ts b/apps/web/playwright/signup.e2e.ts
index f86ca9b672094a..c150af54074bb8 100644
--- a/apps/web/playwright/signup.e2e.ts
+++ b/apps/web/playwright/signup.e2e.ts
@@ -360,31 +360,28 @@ test.describe("Email Signup Flow Test", async () => {
   });
 
   test("Checkbox for cookie consent does not need to be checked", async ({ page, users }) => {
-    // log in trail user
-    await test.step("Sign up", async () => {
-      await page.goto("/signup");
+    await page.goto("/signup");
 
-      // Navigate to email form
-      await page.getByTestId("continue-with-email-button").click();
+    // Navigate to email form
+    await page.getByTestId("continue-with-email-button").click();
 
-      // Fill form
-      await page.locator('input[name="username"]').fill("pro");
-      await page.locator('input[name="email"]').fill("pro@example.com");
-      await page.locator('input[name="password"]').fill("Password99!");
+    // Fill form
+    await page.locator('input[name="username"]').fill("pro");
+    await page.locator('input[name="email"]').fill("pro@example.com");
+    await page.locator('input[name="password"]').fill("Password99!");
 
-      const submitButton = page.getByTestId("signup-submit-button");
-      const checkbox = page.getByTestId("signup-cookie-content-checkbox");
+    const submitButton = page.getByTestId("signup-submit-button");
+    const checkbox = page.getByTestId("signup-cookie-content-checkbox");
 
-      await submitButton.waitFor({ state: "visible" });
-      await checkbox.waitFor({ state: "visible" });
-      await checkbox.waitFor({ state: "attached" });
-      await checkbox.check();
-      await expect(submitButton).toBeEnabled();
+    await submitButton.waitFor({ state: "visible" });
+    await checkbox.waitFor({ state: "visible" });
+    await checkbox.waitFor({ state: "attached" });
+    await checkbox.check();
+    await expect(submitButton).toBeEnabled();
 
-      // the cookie consent checkbox does not need to be checked for user to proceed
-      await checkbox.uncheck();
-      await expect(submitButton).toBeEnabled();
-    });
+    // the cookie consent checkbox does not need to be checked for user to proceed
+    await checkbox.uncheck();
+    await expect(submitButton).toBeEnabled();
   });
 });
 
@@ -418,29 +415,26 @@ test.describe("SAML Signup Flow Test", async () => {
   });
 
   test("Checkbox for cookie consent does not need to be checked", async ({ page }) => {
-    // log in trail user
-    await test.step("Sign up", async () => {
-      await page.goto("/signup");
+    await page.goto("/signup");
 
-      // Navigate to email form
-      await page.getByTestId("continue-with-saml-button").click();
+    // Navigate to email form
+    await page.getByTestId("continue-with-saml-button").click();
 
-      // Fill form
-      await page.locator('input[name="username"]').fill("pro");
-      await page.locator('input[name="email"]').fill("pro@example.com");
+    // Fill form
+    await page.locator('input[name="username"]').fill("pro");
+    await page.locator('input[name="email"]').fill("pro@example.com");
 
-      const submitButton = page.getByTestId("saml-submit-button");
-      const checkbox = page.getByTestId("signup-cookie-content-checkbox");
+    const submitButton = page.getByTestId("saml-submit-button");
+    const checkbox = page.getByTestId("signup-cookie-content-checkbox");
 
-      await submitButton.waitFor({ state: "visible" });
-      await checkbox.waitFor({ state: "visible" });
-      await checkbox.waitFor({ state: "attached" });
-      await checkbox.check();
-      await expect(submitButton).toBeEnabled();
+    await submitButton.waitFor({ state: "visible" });
+    await checkbox.waitFor({ state: "visible" });
+    await checkbox.waitFor({ state: "attached" });
+    await checkbox.check();
+    await expect(submitButton).toBeEnabled();
 
-      // the cookie consent checkbox does not need to be checked for user to proceed
-      await checkbox.uncheck();
-      await expect(submitButton).toBeEnabled();
-    });
+    // the cookie consent checkbox does not need to be checked for user to proceed
+    await checkbox.uncheck();
+    await expect(submitButton).toBeEnabled();
   });
 });

From bf425d2acc2e47d0c8e97c757bd76ef7a8292547 Mon Sep 17 00:00:00 2001
From: Benny Joo <sldisek783@gmail.com>
Date: Sat, 28 Sep 2024 18:46:42 -0400
Subject: [PATCH 16/29] refactor

---
 apps/web/playwright/signup.e2e.ts | 35 ++++++++++++++++++-------------
 1 file changed, 21 insertions(+), 14 deletions(-)

diff --git a/apps/web/playwright/signup.e2e.ts b/apps/web/playwright/signup.e2e.ts
index c150af54074bb8..5c88797086178d 100644
--- a/apps/web/playwright/signup.e2e.ts
+++ b/apps/web/playwright/signup.e2e.ts
@@ -60,8 +60,9 @@ test.describe("Email Signup Flow Test", async () => {
 
       await page.goto("/signup");
       await expect(page.locator("text=Create your account")).toBeVisible();
-      await expect(page.getByTestId("continue-with-email-button")).toBeVisible();
-      await page.getByTestId("continue-with-email-button").click();
+      const continueWithEmailButton = page.getByTestId("continue-with-email-button");
+      await expect(continueWithEmailButton).toBeVisible();
+      await continueWithEmailButton.click();
 
       const alertMessage = "Username or email is already taken";
 
@@ -92,8 +93,9 @@ test.describe("Email Signup Flow Test", async () => {
 
       await page.goto("/signup");
       await expect(page.locator("text=Create your account")).toBeVisible();
-      await expect(page.getByTestId("continue-with-email-button")).toBeVisible();
-      await page.getByTestId("continue-with-email-button").click();
+      const continueWithEmailButton = page.getByTestId("continue-with-email-button");
+      await expect(continueWithEmailButton).toBeVisible();
+      await continueWithEmailButton.click();
 
       const alertMessage = "Username or email is already taken";
 
@@ -128,8 +130,9 @@ test.describe("Email Signup Flow Test", async () => {
     // Signup with premium username name
     await page.goto("/signup");
     await expect(page.locator("text=Create your account")).toBeVisible();
-    await expect(page.getByTestId("continue-with-email-button")).toBeVisible();
-    await page.getByTestId("continue-with-email-button").click();
+    const continueWithEmailButton = page.getByTestId("continue-with-email-button");
+    await expect(continueWithEmailButton).toBeVisible();
+    await continueWithEmailButton.click();
 
     // Fill form
     await page.locator('input[name="username"]').fill("rock");
@@ -162,8 +165,9 @@ test.describe("Email Signup Flow Test", async () => {
 
     await page.goto("/signup");
     await expect(page.locator("text=Create your account")).toBeVisible();
-    await expect(page.getByTestId("continue-with-email-button")).toBeVisible();
-    await page.getByTestId("continue-with-email-button").click();
+    const continueWithEmailButton = page.getByTestId("continue-with-email-button");
+    await expect(continueWithEmailButton).toBeVisible();
+    await continueWithEmailButton.click();
 
     // Fill form
     await page.locator('input[name="username"]').fill(userToCreate.username);
@@ -188,8 +192,9 @@ test.describe("Email Signup Flow Test", async () => {
     const signupUrlWithParams = "/signup?username=rick-jones&email=rick-jones%40example.com";
     await page.goto(signupUrlWithParams);
     await expect(page.locator("text=Create your account")).toBeVisible();
-    await expect(page.getByTestId("continue-with-email-button")).toBeVisible();
-    await page.getByTestId("continue-with-email-button").click();
+    const continueWithEmailButton = page.getByTestId("continue-with-email-button");
+    await expect(continueWithEmailButton).toBeVisible();
+    await continueWithEmailButton.click();
     await expect(page.getByTestId("signup-submit-button")).toBeVisible();
 
     // Fill form
@@ -273,8 +278,9 @@ test.describe("Email Signup Flow Test", async () => {
 
     await page.goto("/signup");
     await expect(page.locator("text=Create your account")).toBeVisible();
-    await expect(page.getByTestId("continue-with-email-button")).toBeVisible();
-    await page.getByTestId("continue-with-email-button").click();
+    const continueWithEmailButton = page.getByTestId("continue-with-email-button");
+    await expect(continueWithEmailButton).toBeVisible();
+    await continueWithEmailButton.click();
 
     // Fill form
     await page.locator('input[name="username"]').fill(userToCreate.username);
@@ -347,8 +353,9 @@ test.describe("Email Signup Flow Test", async () => {
 
       const url = new URL(newPage.url());
       expect(url.pathname).toBe("/signup");
-      await expect(page.getByTestId("continue-with-email-button")).toBeVisible();
-      await page.getByTestId("continue-with-email-button").click();
+      const continueWithEmailButton = page.getByTestId("continue-with-email-button");
+      await expect(continueWithEmailButton).toBeVisible();
+      await continueWithEmailButton.click();
       await expect(page.getByTestId("signup-submit-button")).toBeVisible();
       // Check required fields
       await newPage.locator("input[name=password]").fill(`P4ssw0rd!`);

From b11da41972ba4f5cb0de36d8d5b1efe93106f215 Mon Sep 17 00:00:00 2001
From: Benny Joo <sldisek783@gmail.com>
Date: Sat, 28 Sep 2024 21:38:50 -0400
Subject: [PATCH 17/29] refactor

---
 apps/web/playwright/saml.e2e.ts   | 84 ++++++++++++++++++++++++++++++-
 apps/web/playwright/signup.e2e.ts | 55 --------------------
 2 files changed, 82 insertions(+), 57 deletions(-)

diff --git a/apps/web/playwright/saml.e2e.ts b/apps/web/playwright/saml.e2e.ts
index 794e2771337e7f..a01c0396bed094 100644
--- a/apps/web/playwright/saml.e2e.ts
+++ b/apps/web/playwright/saml.e2e.ts
@@ -1,4 +1,7 @@
-import { IS_SAML_LOGIN_ENABLED } from "../server/lib/constants";
+import { expect } from "@playwright/test";
+
+import { isSAMLLoginEnabled } from "@calcom/features/ee/sso/lib/saml";
+
 import { login } from "./fixtures/users";
 import { test } from "./lib/fixtures";
 
@@ -8,10 +11,87 @@ test.describe("SAML tests", () => {
     // the SAML_ADMINS env variables dynamically
     await login({ username: "pro", email: "pro@example.com", password: "pro" }, page);
     // eslint-disable-next-line playwright/no-skipped-test
-    test.skip(!IS_SAML_LOGIN_ENABLED, "It should only run if SAML is enabled");
+    test.skip(!isSAMLLoginEnabled, "Skipping due to SAML login being disabled");
     // Try to go Security page
     await page.goto("/settings/security/sso");
     // It should redirect you to the event-types page
     // await page.waitForSelector("[data-testid=saml_config]");
   });
+
+  test.describe("@test SAML Signup Flow Test", async () => {
+    // eslint-disable-next-line playwright/no-skipped-test
+    test.skip(!isSAMLLoginEnabled, "Skipping due to SAML login being disabled");
+
+    test("Submit button should be disabled without username", async ({ page }) => {
+      await page.goto("/signup");
+      await page.getByTestId("continue-with-saml-button").click();
+      await page.locator('input[name="email"]').fill("pro@example.com");
+      const submitButton = page.getByTestId("saml-submit-button");
+      await submitButton.waitFor({ state: "visible" });
+      await expect(submitButton).not.toBeEnabled();
+    });
+
+    test("Submit button should be disabled without email", async ({ page }) => {
+      await page.goto("/signup");
+      await page.getByTestId("continue-with-saml-button").click();
+      await page.locator('input[name="username"]').fill("pro");
+      const submitButton = page.getByTestId("saml-submit-button");
+      await submitButton.waitFor({ state: "visible" });
+      await expect(submitButton).not.toBeEnabled();
+    });
+
+    test("Password input should not exist", async ({ page }) => {
+      await page.goto("/signup");
+      await page.getByTestId("continue-with-saml-button").click();
+
+      await expect(page.locator('input[name="password"]')).not.toBeVisible();
+    });
+
+    test("Checkbox for cookie consent does not need to be checked", async ({ page }) => {
+      await page.goto("/signup");
+
+      // Navigate to email form
+      await page.getByTestId("continue-with-saml-button").click();
+
+      // Fill form
+      await page.locator('input[name="username"]').fill("pro");
+      await page.locator('input[name="email"]').fill("pro@example.com");
+
+      const submitButton = page.getByTestId("saml-submit-button");
+      const checkbox = page.getByTestId("signup-cookie-content-checkbox");
+
+      await submitButton.waitFor({ state: "visible" });
+      await checkbox.waitFor({ state: "visible" });
+      await checkbox.waitFor({ state: "attached" });
+      await checkbox.check();
+      await expect(submitButton).toBeEnabled();
+
+      // the cookie consent checkbox does not need to be checked for user to proceed
+      await checkbox.uncheck();
+      await expect(submitButton).toBeEnabled();
+    });
+  });
+
+  test("Should navigate user to another URL", async ({ page }) => {
+    await page.goto("/signup");
+
+    // Navigate to email form
+    await page.getByTestId("continue-with-saml-button").click();
+
+    // Fill form
+    const username = "pro";
+    const email = "pro@example.com";
+    await page.locator('input[name="username"]').fill(username);
+    await page.locator('input[name="email"]').fill(email);
+
+    // Submit form
+    const submitButton = page.getByTestId("saml-submit-button");
+    await submitButton.waitFor({ state: "visible" });
+    await expect(submitButton).toBeEnabled();
+    await submitButton.click();
+    const sp = new URLSearchParams();
+    sp.set("username", username);
+    sp.set("email", email);
+    await page.waitForURL(`/auth/sso/saml?${sp.toString()}`);
+  });
 });
diff --git a/apps/web/playwright/signup.e2e.ts b/apps/web/playwright/signup.e2e.ts
index 5c88797086178d..777c7e96339576 100644
--- a/apps/web/playwright/signup.e2e.ts
+++ b/apps/web/playwright/signup.e2e.ts
@@ -1,7 +1,6 @@
 import { expect } from "@playwright/test";
 import { randomBytes } from "crypto";
 
-import { isSAMLLoginEnabled } from "@calcom/features/ee/sso/lib/saml";
 import { APP_NAME, IS_PREMIUM_USERNAME_ENABLED, IS_MAILHOG_ENABLED } from "@calcom/lib/constants";
 import prisma from "@calcom/prisma";
 
@@ -391,57 +390,3 @@ test.describe("Email Signup Flow Test", async () => {
     await expect(submitButton).toBeEnabled();
   });
 });
-
-test.describe("SAML Signup Flow Test", async () => {
-  // eslint-disable-next-line playwright/no-skipped-test
-  test.skip(!isSAMLLoginEnabled, "Skipping due to SAML login being disabled");
-
-  test("Should navigate user to another URL", async ({ page }) => {
-    await page.goto("/signup");
-
-    // Navigate to email form
-    await page.getByTestId("continue-with-saml-button").click();
-    // Fill form
-    await page.locator('input[name="username"]').fill("pro");
-    await page.locator('input[name="email"]').fill("pro@example.com");
-
-    // Submit form
-    const submitButton = page.getByTestId("saml-submit-button");
-    await submitButton.waitFor({ state: "visible" });
-    await expect(submitButton).toBeEnabled();
-    await submitButton.click();
-
-    await page.waitForURL("/auth/sso/saml");
-  });
-
-  test("Password input should not exist", async ({ page }) => {
-    await page.goto("/signup");
-    await page.getByTestId("continue-with-saml-button").click();
-
-    await expect(page.locator('input[name="password"]')).not.toBeVisible();
-  });
-
-  test("Checkbox for cookie consent does not need to be checked", async ({ page }) => {
-    await page.goto("/signup");
-
-    // Navigate to email form
-    await page.getByTestId("continue-with-saml-button").click();
-
-    // Fill form
-    await page.locator('input[name="username"]').fill("pro");
-    await page.locator('input[name="email"]').fill("pro@example.com");
-
-    const submitButton = page.getByTestId("saml-submit-button");
-    const checkbox = page.getByTestId("signup-cookie-content-checkbox");
-
-    await submitButton.waitFor({ state: "visible" });
-    await checkbox.waitFor({ state: "visible" });
-    await checkbox.waitFor({ state: "attached" });
-    await checkbox.check();
-    await expect(submitButton).toBeEnabled();
-
-    // the cookie consent checkbox does not need to be checked for user to proceed
-    await checkbox.uncheck();
-    await expect(submitButton).toBeEnabled();
-  });
-});

From f053f92a138d1cade14db0d1392338777a36e805 Mon Sep 17 00:00:00 2001
From: Benny Joo <sldisek783@gmail.com>
Date: Sat, 28 Sep 2024 22:25:53 -0400
Subject: [PATCH 18/29] fix and add 1 more test

---
 apps/web/playwright/saml.e2e.ts | 31 +++++++++++++++++++++++++------
 1 file changed, 25 insertions(+), 6 deletions(-)

diff --git a/apps/web/playwright/saml.e2e.ts b/apps/web/playwright/saml.e2e.ts
index a01c0396bed094..04ed9733ea63c7 100644
--- a/apps/web/playwright/saml.e2e.ts
+++ b/apps/web/playwright/saml.e2e.ts
@@ -1,6 +1,7 @@
 import { expect } from "@playwright/test";
 
 import { isSAMLLoginEnabled } from "@calcom/features/ee/sso/lib/saml";
+import { IS_PREMIUM_USERNAME_ENABLED } from "@calcom/lib/constants";
 
 import { login } from "./fixtures/users";
 import { test } from "./lib/fixtures";
@@ -25,7 +26,7 @@ test.describe("SAML tests", () => {
     test("Submit button should be disabled without username", async ({ page }) => {
       await page.goto("/signup");
       await page.getByTestId("continue-with-saml-button").click();
-      await page.locator('input[name="email"]').fill("pro@example.com");
+      await page.locator('input[name="email"]').fill("tester123@example.com");
       const submitButton = page.getByTestId("saml-submit-button");
       await submitButton.waitFor({ state: "visible" });
       await expect(submitButton).not.toBeEnabled();
@@ -34,7 +35,7 @@ test.describe("SAML tests", () => {
     test("Submit button should be disabled without email", async ({ page }) => {
       await page.goto("/signup");
       await page.getByTestId("continue-with-saml-button").click();
-      await page.locator('input[name="username"]').fill("pro");
+      await page.locator('input[name="username"]').fill("tester123");
       const submitButton = page.getByTestId("saml-submit-button");
       await submitButton.waitFor({ state: "visible" });
       await expect(submitButton).not.toBeEnabled();
@@ -54,8 +55,8 @@ test.describe("SAML tests", () => {
       await page.getByTestId("continue-with-saml-button").click();
 
       // Fill form
-      await page.locator('input[name="username"]').fill("pro");
-      await page.locator('input[name="email"]').fill("pro@example.com");
+      await page.locator('input[name="username"]').fill("tester123");
+      await page.locator('input[name="email"]').fill("tester123@example.com");
 
       const submitButton = page.getByTestId("saml-submit-button");
       const checkbox = page.getByTestId("signup-cookie-content-checkbox");
@@ -79,8 +80,8 @@ test.describe("SAML tests", () => {
     await page.getByTestId("continue-with-saml-button").click();
 
     // Fill form
-    const username = "pro";
-    const email = "pro@example.com";
+    const username = "tester123";
+    const email = "tester123@example.com";
     await page.locator('input[name="username"]').fill(username);
     await page.locator('input[name="email"]').fill(email);
 
@@ -94,4 +95,22 @@ test.describe("SAML tests", () => {
     sp.set("email", email);
     await page.waitForURL(`/auth/sso/saml?${sp.toString()}`);
   });
+
+  test("Submit button should be disabled with a premium username", async ({ page }) => {
+    // eslint-disable-next-line playwright/no-skipped-test
+    test.skip(!IS_PREMIUM_USERNAME_ENABLED, "Only run on Cal.com");
+    await page.goto("/signup");
+
+    // Navigate to email form
+    await page.getByTestId("continue-with-saml-button").click();
+
+    // Fill form
+    await page.locator('input[name="username"]').fill("pro");
+    await page.locator('input[name="email"]').fill("pro@example.com");
+
+    // Submit form
+    const submitButton = page.getByTestId("saml-submit-button");
+    await submitButton.waitFor({ state: "visible" });
+    await expect(submitButton).not.toBeEnabled();
+  });
 });

From b7f8f08a64db6cea32de0b37ec3a5c2e46bae9e1 Mon Sep 17 00:00:00 2001
From: Benny Joo <sldisek783@gmail.com>
Date: Sat, 28 Sep 2024 22:28:58 -0400
Subject: [PATCH 19/29] remove tag

---
 apps/web/playwright/saml.e2e.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/web/playwright/saml.e2e.ts b/apps/web/playwright/saml.e2e.ts
index 04ed9733ea63c7..1005dceddda68f 100644
--- a/apps/web/playwright/saml.e2e.ts
+++ b/apps/web/playwright/saml.e2e.ts
@@ -19,7 +19,7 @@ test.describe("SAML tests", () => {
     // await page.waitForSelector("[data-testid=saml_config]");
   });
 
-  test.describe("@test SAML Signup Flow Test", async () => {
+  test.describe("SAML Signup Flow Test", async () => {
     // eslint-disable-next-line playwright/no-skipped-test
     test.skip(!isSAMLLoginEnabled, "Skipping due to SAML login being disabled");
 

From f34d7602001e3479fb3343394531eb018fabfaa1 Mon Sep 17 00:00:00 2001
From: Benny Joo <sldisek783@gmail.com>
Date: Sat, 28 Sep 2024 23:39:48 -0400
Subject: [PATCH 20/29] remove unneeded code

---
 apps/web/playwright/saml.e2e.ts   | 7 -------
 apps/web/playwright/signup.e2e.ts | 3 ---
 2 files changed, 10 deletions(-)

diff --git a/apps/web/playwright/saml.e2e.ts b/apps/web/playwright/saml.e2e.ts
index 1005dceddda68f..0ceb99abcdd659 100644
--- a/apps/web/playwright/saml.e2e.ts
+++ b/apps/web/playwright/saml.e2e.ts
@@ -28,7 +28,6 @@ test.describe("SAML tests", () => {
       await page.getByTestId("continue-with-saml-button").click();
       await page.locator('input[name="email"]').fill("tester123@example.com");
       const submitButton = page.getByTestId("saml-submit-button");
-      await submitButton.waitFor({ state: "visible" });
       await expect(submitButton).not.toBeEnabled();
     });
 
@@ -37,7 +36,6 @@ test.describe("SAML tests", () => {
       await page.getByTestId("continue-with-saml-button").click();
       await page.locator('input[name="username"]').fill("tester123");
       const submitButton = page.getByTestId("saml-submit-button");
-      await submitButton.waitFor({ state: "visible" });
       await expect(submitButton).not.toBeEnabled();
     });
 
@@ -61,9 +59,6 @@ test.describe("SAML tests", () => {
       const submitButton = page.getByTestId("saml-submit-button");
       const checkbox = page.getByTestId("signup-cookie-content-checkbox");
 
-      await submitButton.waitFor({ state: "visible" });
-      await checkbox.waitFor({ state: "visible" });
-      await checkbox.waitFor({ state: "attached" });
       await checkbox.check();
       await expect(submitButton).toBeEnabled();
 
@@ -87,7 +82,6 @@ test.describe("SAML tests", () => {
 
     // Submit form
     const submitButton = page.getByTestId("saml-submit-button");
-    await submitButton.waitFor({ state: "visible" });
     await expect(submitButton).toBeEnabled();
     await submitButton.click();
     const sp = new URLSearchParams();
@@ -110,7 +104,6 @@ test.describe("SAML tests", () => {
 
     // Submit form
     const submitButton = page.getByTestId("saml-submit-button");
-    await submitButton.waitFor({ state: "visible" });
     await expect(submitButton).not.toBeEnabled();
   });
 });
diff --git a/apps/web/playwright/signup.e2e.ts b/apps/web/playwright/signup.e2e.ts
index 777c7e96339576..d196221ebc5f93 100644
--- a/apps/web/playwright/signup.e2e.ts
+++ b/apps/web/playwright/signup.e2e.ts
@@ -379,9 +379,6 @@ test.describe("Email Signup Flow Test", async () => {
     const submitButton = page.getByTestId("signup-submit-button");
     const checkbox = page.getByTestId("signup-cookie-content-checkbox");
 
-    await submitButton.waitFor({ state: "visible" });
-    await checkbox.waitFor({ state: "visible" });
-    await checkbox.waitFor({ state: "attached" });
     await checkbox.check();
     await expect(submitButton).toBeEnabled();
 

From 35076d9b8932910f0f55ca12ccc78c97a02e9515 Mon Sep 17 00:00:00 2001
From: Benny Joo <sldisek783@gmail.com>
Date: Sat, 28 Sep 2024 23:41:57 -0400
Subject: [PATCH 21/29] fix

---
 apps/web/playwright/saml.e2e.ts   |  1 -
 apps/web/playwright/signup.e2e.ts | 10 ----------
 2 files changed, 11 deletions(-)

diff --git a/apps/web/playwright/saml.e2e.ts b/apps/web/playwright/saml.e2e.ts
index 0ceb99abcdd659..88a3833a61c0b1 100644
--- a/apps/web/playwright/saml.e2e.ts
+++ b/apps/web/playwright/saml.e2e.ts
@@ -82,7 +82,6 @@ test.describe("SAML tests", () => {
 
     // Submit form
     const submitButton = page.getByTestId("saml-submit-button");
-    await expect(submitButton).toBeEnabled();
     await submitButton.click();
     const sp = new URLSearchParams();
     sp.set("username", username);
diff --git a/apps/web/playwright/signup.e2e.ts b/apps/web/playwright/signup.e2e.ts
index d196221ebc5f93..cda341bb97e2ea 100644
--- a/apps/web/playwright/signup.e2e.ts
+++ b/apps/web/playwright/signup.e2e.ts
@@ -72,8 +72,6 @@ test.describe("Email Signup Flow Test", async () => {
 
       // Submit form
       const submitButton = page.getByTestId("signup-submit-button");
-      await expect(submitButton).toBeVisible();
-      await expect(submitButton).toBeEnabled();
       await submitButton.click();
 
       const alert = await page.waitForSelector('[data-testid="alert"]');
@@ -105,8 +103,6 @@ test.describe("Email Signup Flow Test", async () => {
 
       // Submit form
       const submitButton = page.getByTestId("signup-submit-button");
-      await expect(submitButton).toBeVisible();
-      await expect(submitButton).toBeEnabled();
       await submitButton.click();
 
       const alert = await page.waitForSelector('[data-testid="alert"]');
@@ -140,8 +136,6 @@ test.describe("Email Signup Flow Test", async () => {
 
     // Submit form
     const submitButton = page.getByTestId("signup-submit-button");
-    await expect(submitButton).toBeVisible();
-    await expect(submitButton).toBeEnabled();
     await submitButton.click();
 
     // Check that stripe checkout is present
@@ -175,8 +169,6 @@ test.describe("Email Signup Flow Test", async () => {
 
     // Submit form
     const submitButton = page.getByTestId("signup-submit-button");
-    await expect(submitButton).toBeVisible();
-    await expect(submitButton).toBeEnabled();
     await submitButton.click();
 
     await page.waitForURL("/auth/verify-email**");
@@ -288,8 +280,6 @@ test.describe("Email Signup Flow Test", async () => {
 
     // Submit form
     const submitButton = page.getByTestId("signup-submit-button");
-    await expect(submitButton).toBeVisible();
-    await expect(submitButton).toBeEnabled();
     await submitButton.click();
 
     await page.waitForURL((url) => url.pathname.includes("/auth/verify-email"));

From bc06beb71e70d46af71918a1979b305e5e393bf5 Mon Sep 17 00:00:00 2001
From: Benny Joo <sldisek783@gmail.com>
Date: Sun, 29 Sep 2024 00:17:05 -0400
Subject: [PATCH 22/29] fix test

---
 apps/web/playwright/saml.e2e.ts | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/apps/web/playwright/saml.e2e.ts b/apps/web/playwright/saml.e2e.ts
index 88a3833a61c0b1..4633b6dc5cfe83 100644
--- a/apps/web/playwright/saml.e2e.ts
+++ b/apps/web/playwright/saml.e2e.ts
@@ -28,7 +28,8 @@ test.describe("SAML tests", () => {
       await page.getByTestId("continue-with-saml-button").click();
       await page.locator('input[name="email"]').fill("tester123@example.com");
       const submitButton = page.getByTestId("saml-submit-button");
-      await expect(submitButton).not.toBeEnabled();
+      await expect(submitButton).toBeVisible();
+      await expect(submitButton).toBeDisabled();
     });
 
     test("Submit button should be disabled without email", async ({ page }) => {
@@ -36,14 +37,15 @@ test.describe("SAML tests", () => {
       await page.getByTestId("continue-with-saml-button").click();
       await page.locator('input[name="username"]').fill("tester123");
       const submitButton = page.getByTestId("saml-submit-button");
-      await expect(submitButton).not.toBeEnabled();
+      await expect(submitButton).toBeVisible();
+      await expect(submitButton).toBeDisabled();
     });
 
     test("Password input should not exist", async ({ page }) => {
       await page.goto("/signup");
       await page.getByTestId("continue-with-saml-button").click();
 
-      await expect(page.locator('input[name="password"]')).not.toBeVisible();
+      await expect(page.locator('input[name="password"]')).toBeHidden();
     });
 
     test("Checkbox for cookie consent does not need to be checked", async ({ page }) => {
@@ -82,6 +84,7 @@ test.describe("SAML tests", () => {
 
     // Submit form
     const submitButton = page.getByTestId("saml-submit-button");
+    await expect(submitButton).toBeEnabled({ timeout: 10000 });
     await submitButton.click();
     const sp = new URLSearchParams();
     sp.set("username", username);
@@ -103,6 +106,6 @@ test.describe("SAML tests", () => {
 
     // Submit form
     const submitButton = page.getByTestId("saml-submit-button");
-    await expect(submitButton).not.toBeEnabled();
+    await expect(submitButton).toBeDisabled();
   });
 });

From 87f2f8ae36630c4fcc434eb2a6b31fbf3b9cbb51 Mon Sep 17 00:00:00 2001
From: Benny Joo <sldisek783@gmail.com>
Date: Sun, 29 Sep 2024 01:37:42 -0400
Subject: [PATCH 23/29] it needs to be parallel mode

---
 apps/web/playwright/saml.e2e.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/apps/web/playwright/saml.e2e.ts b/apps/web/playwright/saml.e2e.ts
index 4633b6dc5cfe83..503dcb8e322051 100644
--- a/apps/web/playwright/saml.e2e.ts
+++ b/apps/web/playwright/saml.e2e.ts
@@ -6,6 +6,8 @@ import { IS_PREMIUM_USERNAME_ENABLED } from "@calcom/lib/constants";
 import { login } from "./fixtures/users";
 import { test } from "./lib/fixtures";
 
+test.describe.configure({ mode: "parallel" });
+
 test.describe("SAML tests", () => {
   test("test SAML configuration UI with pro@example.com", async ({ page }) => {
     // TODO: Figure out a way to use the users from fixtures here, right now we cannot set
@@ -84,7 +86,7 @@ test.describe("SAML tests", () => {
 
     // Submit form
     const submitButton = page.getByTestId("saml-submit-button");
-    await expect(submitButton).toBeEnabled({ timeout: 10000 });
+    await expect(submitButton).toBeEnabled();
     await submitButton.click();
     const sp = new URLSearchParams();
     sp.set("username", username);

From adbc89c49836f6a1c34f4035c00609fd1b71bf20 Mon Sep 17 00:00:00 2001
From: Benny Joo <sldisek783@gmail.com>
Date: Sun, 29 Sep 2024 01:38:04 -0400
Subject: [PATCH 24/29] reduce code

---
 apps/web/playwright/signup.e2e.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/web/playwright/signup.e2e.ts b/apps/web/playwright/signup.e2e.ts
index cda341bb97e2ea..f7185a7f3409dc 100644
--- a/apps/web/playwright/signup.e2e.ts
+++ b/apps/web/playwright/signup.e2e.ts
@@ -148,7 +148,7 @@ test.describe("Email Signup Flow Test", async () => {
     expect(url).toContain(expectedUrl);
     // TODO: complete the stripe checkout flow
   });
-  test("Signup with valid (non premium) username", async ({ page, users, features }) => {
+  test("Signup with valid (non premium) username", async ({ page, users }) => {
     const userToCreate = users.buildForSignup({
       username: "rick-jones",
       password: "Password99!",

From 8f93ae7dc3e4f162d496d6b391bd9d99d4b1630c Mon Sep 17 00:00:00 2001
From: Benny Joo <sldisek783@gmail.com>
Date: Sun, 29 Sep 2024 02:06:47 -0400
Subject: [PATCH 25/29] simplify

---
 apps/web/playwright/saml.e2e.ts | 81 +++++++++++++--------------------
 1 file changed, 32 insertions(+), 49 deletions(-)

diff --git a/apps/web/playwright/saml.e2e.ts b/apps/web/playwright/saml.e2e.ts
index 503dcb8e322051..c74480125314a0 100644
--- a/apps/web/playwright/saml.e2e.ts
+++ b/apps/web/playwright/saml.e2e.ts
@@ -9,12 +9,14 @@ import { test } from "./lib/fixtures";
 test.describe.configure({ mode: "parallel" });
 
 test.describe("SAML tests", () => {
+  // eslint-disable-next-line playwright/no-skipped-test
+  test.skip(!isSAMLLoginEnabled, "Skipping due to SAML login being disabled");
+
   test("test SAML configuration UI with pro@example.com", async ({ page }) => {
     // TODO: Figure out a way to use the users from fixtures here, right now we cannot set
     // the SAML_ADMINS env variables dynamically
     await login({ username: "pro", email: "pro@example.com", password: "pro" }, page);
     // eslint-disable-next-line playwright/no-skipped-test
-    test.skip(!isSAMLLoginEnabled, "Skipping due to SAML login being disabled");
     // Try to go Security page
     await page.goto("/settings/security/sso");
     // It should redirect you to the event-types page
@@ -22,12 +24,13 @@ test.describe("SAML tests", () => {
   });
 
   test.describe("SAML Signup Flow Test", async () => {
-    // eslint-disable-next-line playwright/no-skipped-test
-    test.skip(!isSAMLLoginEnabled, "Skipping due to SAML login being disabled");
-
-    test("Submit button should be disabled without username", async ({ page }) => {
+    test.beforeEach(async ({ page }) => {
       await page.goto("/signup");
       await page.getByTestId("continue-with-saml-button").click();
+      await page.waitForSelector('[data-testid="saml-submit-button"]');
+    });
+
+    test("Submit button should be disabled without username", async ({ page }) => {
       await page.locator('input[name="email"]').fill("tester123@example.com");
       const submitButton = page.getByTestId("saml-submit-button");
       await expect(submitButton).toBeVisible();
@@ -35,8 +38,6 @@ test.describe("SAML tests", () => {
     });
 
     test("Submit button should be disabled without email", async ({ page }) => {
-      await page.goto("/signup");
-      await page.getByTestId("continue-with-saml-button").click();
       await page.locator('input[name="username"]').fill("tester123");
       const submitButton = page.getByTestId("saml-submit-button");
       await expect(submitButton).toBeVisible();
@@ -44,18 +45,10 @@ test.describe("SAML tests", () => {
     });
 
     test("Password input should not exist", async ({ page }) => {
-      await page.goto("/signup");
-      await page.getByTestId("continue-with-saml-button").click();
-
       await expect(page.locator('input[name="password"]')).toBeHidden();
     });
 
     test("Checkbox for cookie consent does not need to be checked", async ({ page }) => {
-      await page.goto("/signup");
-
-      // Navigate to email form
-      await page.getByTestId("continue-with-saml-button").click();
-
       // Fill form
       await page.locator('input[name="username"]').fill("tester123");
       await page.locator('input[name="email"]').fill("tester123@example.com");
@@ -70,44 +63,34 @@ test.describe("SAML tests", () => {
       await checkbox.uncheck();
       await expect(submitButton).toBeEnabled();
     });
-  });
 
-  test("Should navigate user to another URL", async ({ page }) => {
-    await page.goto("/signup");
-
-    // Navigate to email form
-    await page.getByTestId("continue-with-saml-button").click();
-
-    // Fill form
-    const username = "tester123";
-    const email = "tester123@example.com";
-    await page.locator('input[name="username"]').fill(username);
-    await page.locator('input[name="email"]').fill(email);
-
-    // Submit form
-    const submitButton = page.getByTestId("saml-submit-button");
-    await expect(submitButton).toBeEnabled();
-    await submitButton.click();
-    const sp = new URLSearchParams();
-    sp.set("username", username);
-    sp.set("email", email);
-    await page.waitForURL(`/auth/sso/saml?${sp.toString()}`);
-  });
+    test("Should navigate user to another URL", async ({ page }) => {
+      // Fill form
+      const username = "tester123";
+      const email = "tester123@example.com";
+      await page.locator('input[name="username"]').fill(username);
+      await page.locator('input[name="email"]').fill(email);
 
-  test("Submit button should be disabled with a premium username", async ({ page }) => {
-    // eslint-disable-next-line playwright/no-skipped-test
-    test.skip(!IS_PREMIUM_USERNAME_ENABLED, "Only run on Cal.com");
-    await page.goto("/signup");
+      // Submit form
+      const submitButton = page.getByTestId("saml-submit-button");
+      await submitButton.click();
+      const sp = new URLSearchParams();
+      sp.set("username", username);
+      sp.set("email", email);
+      await page.waitForURL(`/auth/sso/saml?${sp.toString()}`);
+    });
 
-    // Navigate to email form
-    await page.getByTestId("continue-with-saml-button").click();
+    test("Submit button should be disabled with a premium username", async ({ page }) => {
+      // eslint-disable-next-line playwright/no-skipped-test
+      test.skip(!IS_PREMIUM_USERNAME_ENABLED, "Only run on Cal.com");
 
-    // Fill form
-    await page.locator('input[name="username"]').fill("pro");
-    await page.locator('input[name="email"]').fill("pro@example.com");
+      // Fill form
+      await page.locator('input[name="username"]').fill("pro");
+      await page.locator('input[name="email"]').fill("pro@example.com");
 
-    // Submit form
-    const submitButton = page.getByTestId("saml-submit-button");
-    await expect(submitButton).toBeDisabled();
+      // Submit form
+      const submitButton = page.getByTestId("saml-submit-button");
+      await expect(submitButton).toBeDisabled();
+    });
   });
 });

From a49a31eb052e9b21cb463e904b00237795e0da30 Mon Sep 17 00:00:00 2001
From: Benny Joo <sldisek783@gmail.com>
Date: Sun, 29 Sep 2024 02:38:11 -0400
Subject: [PATCH 26/29] fix

---
 apps/web/playwright/saml.e2e.ts | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/apps/web/playwright/saml.e2e.ts b/apps/web/playwright/saml.e2e.ts
index c74480125314a0..865e916f8fd0f0 100644
--- a/apps/web/playwright/saml.e2e.ts
+++ b/apps/web/playwright/saml.e2e.ts
@@ -64,22 +64,6 @@ test.describe("SAML tests", () => {
       await expect(submitButton).toBeEnabled();
     });
 
-    test("Should navigate user to another URL", async ({ page }) => {
-      // Fill form
-      const username = "tester123";
-      const email = "tester123@example.com";
-      await page.locator('input[name="username"]').fill(username);
-      await page.locator('input[name="email"]').fill(email);
-
-      // Submit form
-      const submitButton = page.getByTestId("saml-submit-button");
-      await submitButton.click();
-      const sp = new URLSearchParams();
-      sp.set("username", username);
-      sp.set("email", email);
-      await page.waitForURL(`/auth/sso/saml?${sp.toString()}`);
-    });
-
     test("Submit button should be disabled with a premium username", async ({ page }) => {
       // eslint-disable-next-line playwright/no-skipped-test
       test.skip(!IS_PREMIUM_USERNAME_ENABLED, "Only run on Cal.com");

From 2f424a23e9978260f5666c7234bfa6e49e8236ed Mon Sep 17 00:00:00 2001
From: unknown <adhabal2002@gmail.com>
Date: Mon, 30 Sep 2024 08:27:13 +0530
Subject: [PATCH 27/29] fix flake

---
 apps/web/playwright/saml.e2e.ts   | 1 +
 apps/web/playwright/signup.e2e.ts | 1 +
 2 files changed, 2 insertions(+)

diff --git a/apps/web/playwright/saml.e2e.ts b/apps/web/playwright/saml.e2e.ts
index 865e916f8fd0f0..3b45e3a8bc89d7 100644
--- a/apps/web/playwright/saml.e2e.ts
+++ b/apps/web/playwright/saml.e2e.ts
@@ -26,6 +26,7 @@ test.describe("SAML tests", () => {
   test.describe("SAML Signup Flow Test", async () => {
     test.beforeEach(async ({ page }) => {
       await page.goto("/signup");
+      await expect(page.locator("text=Create your account")).toBeVisible();
       await page.getByTestId("continue-with-saml-button").click();
       await page.waitForSelector('[data-testid="saml-submit-button"]');
     });
diff --git a/apps/web/playwright/signup.e2e.ts b/apps/web/playwright/signup.e2e.ts
index f7185a7f3409dc..2adedb7034f103 100644
--- a/apps/web/playwright/signup.e2e.ts
+++ b/apps/web/playwright/signup.e2e.ts
@@ -357,6 +357,7 @@ test.describe("Email Signup Flow Test", async () => {
 
   test("Checkbox for cookie consent does not need to be checked", async ({ page, users }) => {
     await page.goto("/signup");
+    await expect(page.locator("text=Create your account")).toBeVisible();
 
     // Navigate to email form
     await page.getByTestId("continue-with-email-button").click();

From a9262f9c437ba0fd5add11f66d799b2a17a79b19 Mon Sep 17 00:00:00 2001
From: unknown <adhabal2002@gmail.com>
Date: Mon, 30 Sep 2024 09:34:26 +0530
Subject: [PATCH 28/29] fix another flake

---
 apps/web/playwright/signup.e2e.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/apps/web/playwright/signup.e2e.ts b/apps/web/playwright/signup.e2e.ts
index 2adedb7034f103..5be94c65a0529d 100644
--- a/apps/web/playwright/signup.e2e.ts
+++ b/apps/web/playwright/signup.e2e.ts
@@ -17,6 +17,7 @@ test.describe("Signup Main Page Test", async () => {
 
   test("Continue with email button must exist / work", async ({ page }) => {
     await page.goto("/signup");
+    await expect(page.locator("text=Create your account")).toBeVisible();
     const button = page.getByTestId("continue-with-email-button");
     await expect(button).toBeVisible();
     await expect(button).toBeEnabled();
@@ -35,6 +36,7 @@ test.describe("Signup Main Page Test", async () => {
 
   test("Continue with SAML button must exist / work", async ({ page }) => {
     await page.goto("/signup");
+    await expect(page.locator("text=Create your account")).toBeVisible();
     const button = page.getByTestId("continue-with-saml-button");
     await expect(button).toBeVisible();
     await expect(button).toBeEnabled();

From 3041755852b7241f70c46426a978463f3c29fbf3 Mon Sep 17 00:00:00 2001
From: Benny Joo <sldisek783@gmail.com>
Date: Mon, 30 Sep 2024 12:05:01 -0400
Subject: [PATCH 29/29] add comments + refactor

---
 apps/web/playwright/saml.e2e.ts   |  2 +-
 apps/web/playwright/signup.e2e.ts | 31 +++++++++++++++----------------
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/apps/web/playwright/saml.e2e.ts b/apps/web/playwright/saml.e2e.ts
index 3b45e3a8bc89d7..7c6425e2dc234b 100644
--- a/apps/web/playwright/saml.e2e.ts
+++ b/apps/web/playwright/saml.e2e.ts
@@ -26,7 +26,7 @@ test.describe("SAML tests", () => {
   test.describe("SAML Signup Flow Test", async () => {
     test.beforeEach(async ({ page }) => {
       await page.goto("/signup");
-      await expect(page.locator("text=Create your account")).toBeVisible();
+      await expect(page.locator("text=Create your account")).toBeVisible(); // this prevents flaky test
       await page.getByTestId("continue-with-saml-button").click();
       await page.waitForSelector('[data-testid="saml-submit-button"]');
     });
diff --git a/apps/web/playwright/signup.e2e.ts b/apps/web/playwright/signup.e2e.ts
index 5be94c65a0529d..8684453d591aed 100644
--- a/apps/web/playwright/signup.e2e.ts
+++ b/apps/web/playwright/signup.e2e.ts
@@ -1,4 +1,4 @@
-import { expect } from "@playwright/test";
+import { expect, Page } from "@playwright/test";
 import { randomBytes } from "crypto";
 
 import { APP_NAME, IS_PREMIUM_USERNAME_ENABLED, IS_MAILHOG_ENABLED } from "@calcom/lib/constants";
@@ -10,14 +10,16 @@ import { expectInvitationEmailToBeReceived } from "./team/expects";
 
 test.describe.configure({ mode: "parallel" });
 
+const preventFlakyTest = async (page: Page) => {
+  await expect(page.locator("text=Create your account")).toBeVisible();
+};
 test.describe("Signup Main Page Test", async () => {
-  test.beforeEach(async ({ features }) => {
-    features.reset();
+  test.beforeEach(async ({ page }) => {
+    await page.goto("/signup");
+    await preventFlakyTest(page);
   });
 
   test("Continue with email button must exist / work", async ({ page }) => {
-    await page.goto("/signup");
-    await expect(page.locator("text=Create your account")).toBeVisible();
     const button = page.getByTestId("continue-with-email-button");
     await expect(button).toBeVisible();
     await expect(button).toBeEnabled();
@@ -26,7 +28,6 @@ test.describe("Signup Main Page Test", async () => {
   });
 
   test("Continue with google button must exist / work", async ({ page }) => {
-    await page.goto("/signup");
     const button = page.getByTestId("continue-with-google-button");
     await expect(button).toBeVisible();
     await expect(button).toBeEnabled();
@@ -35,8 +36,6 @@ test.describe("Signup Main Page Test", async () => {
   });
 
   test("Continue with SAML button must exist / work", async ({ page }) => {
-    await page.goto("/signup");
-    await expect(page.locator("text=Create your account")).toBeVisible();
     const button = page.getByTestId("continue-with-saml-button");
     await expect(button).toBeVisible();
     await expect(button).toBeEnabled();
@@ -60,7 +59,7 @@ test.describe("Email Signup Flow Test", async () => {
       });
 
       await page.goto("/signup");
-      await expect(page.locator("text=Create your account")).toBeVisible();
+      await preventFlakyTest(page);
       const continueWithEmailButton = page.getByTestId("continue-with-email-button");
       await expect(continueWithEmailButton).toBeVisible();
       await continueWithEmailButton.click();
@@ -91,7 +90,7 @@ test.describe("Email Signup Flow Test", async () => {
       });
 
       await page.goto("/signup");
-      await expect(page.locator("text=Create your account")).toBeVisible();
+      await preventFlakyTest(page);
       const continueWithEmailButton = page.getByTestId("continue-with-email-button");
       await expect(continueWithEmailButton).toBeVisible();
       await continueWithEmailButton.click();
@@ -126,7 +125,7 @@ test.describe("Email Signup Flow Test", async () => {
 
     // Signup with premium username name
     await page.goto("/signup");
-    await expect(page.locator("text=Create your account")).toBeVisible();
+    await preventFlakyTest(page);
     const continueWithEmailButton = page.getByTestId("continue-with-email-button");
     await expect(continueWithEmailButton).toBeVisible();
     await continueWithEmailButton.click();
@@ -159,7 +158,7 @@ test.describe("Email Signup Flow Test", async () => {
     });
 
     await page.goto("/signup");
-    await expect(page.locator("text=Create your account")).toBeVisible();
+    await preventFlakyTest(page);
     const continueWithEmailButton = page.getByTestId("continue-with-email-button");
     await expect(continueWithEmailButton).toBeVisible();
     await continueWithEmailButton.click();
@@ -184,7 +183,7 @@ test.describe("Email Signup Flow Test", async () => {
   test("Signup fields prefilled with query params", async ({ page, users }) => {
     const signupUrlWithParams = "/signup?username=rick-jones&email=rick-jones%40example.com";
     await page.goto(signupUrlWithParams);
-    await expect(page.locator("text=Create your account")).toBeVisible();
+    await preventFlakyTest(page);
     const continueWithEmailButton = page.getByTestId("continue-with-email-button");
     await expect(continueWithEmailButton).toBeVisible();
     await continueWithEmailButton.click();
@@ -238,7 +237,7 @@ test.describe("Email Signup Flow Test", async () => {
 
     const signupUrlWithToken = `/signup?token=${token}`;
     await page.goto(signupUrlWithToken);
-    await expect(page.locator("text=Create your account")).toBeVisible();
+    await preventFlakyTest(page);
     await expect(page.getByTestId("signup-submit-button")).toBeVisible();
 
     const usernameField = page.locator('input[name="username"]');
@@ -270,7 +269,7 @@ test.describe("Email Signup Flow Test", async () => {
     });
 
     await page.goto("/signup");
-    await expect(page.locator("text=Create your account")).toBeVisible();
+    await preventFlakyTest(page);
     const continueWithEmailButton = page.getByTestId("continue-with-email-button");
     await expect(continueWithEmailButton).toBeVisible();
     await continueWithEmailButton.click();
@@ -359,7 +358,7 @@ test.describe("Email Signup Flow Test", async () => {
 
   test("Checkbox for cookie consent does not need to be checked", async ({ page, users }) => {
     await page.goto("/signup");
-    await expect(page.locator("text=Create your account")).toBeVisible();
+    await preventFlakyTest(page);
 
     // Navigate to email form
     await page.getByTestId("continue-with-email-button").click();