From a5b645e72eab80cf90875fec41bf201b67481448 Mon Sep 17 00:00:00 2001 From: gitstart-calcom Date: Fri, 6 Oct 2023 16:19:25 +0000 Subject: [PATCH] Remove unnecessary changes --- .../checkbox-and-address-question.e2e.ts | 4 ---- .../checkbox-and-checkbox-question.e2e.ts | 4 ---- .../checkbox-and-long-text-question.e2e.ts | 4 ---- .../checkbox-and-multiple-emails-question.e2e.ts | 4 ---- .../checkbox-and-multiselect-question.e2e.ts | 4 ---- .../checkbox-and-number-question.e2e.ts | 4 ---- .../checkbox-and-phone-question.e2e.ts | 4 ---- .../checkbox-and-radio-group-question.e2e.ts | 4 ---- .../checkbox-and-select-question.e2e.ts | 4 ---- .../checkbox-and-short-text-question.e2e.ts | 4 ---- .../phoneQuestione2e/phone-and-address-question.e2e.ts | 4 ---- .../phone-and-checkbox-group-question.e2e.ts | 4 ---- .../phoneQuestione2e/phone-and-checkbox-question.e2e.ts | 4 ---- .../phoneQuestione2e/phone-and-long-text-question.e2e.ts | 4 ---- .../phone-and-multiple-emails-question.e2e.ts | 4 ---- .../phone-and-multiselect-question.e2e.ts | 4 ---- .../phoneQuestione2e/phone-and-number-question.e2e.ts | 4 ---- .../phone-and-radio-group-question.e2e.ts | 4 ---- .../phoneQuestione2e/phone-and-select-question.e2e.ts | 4 ---- .../phoneQuestione2e/phone-and-short-text-question.e2e.ts | 4 ---- apps/web/playwright/booking/utils/bookingUtils.ts | 8 +++++++- 21 files changed, 7 insertions(+), 81 deletions(-) diff --git a/apps/web/playwright/booking/checkboxQuestione2e/checkbox-and-address-question.e2e.ts b/apps/web/playwright/booking/checkboxQuestione2e/checkbox-and-address-question.e2e.ts index 8095886114..5bfe15d009 100644 --- a/apps/web/playwright/booking/checkboxQuestione2e/checkbox-and-address-question.e2e.ts +++ b/apps/web/playwright/booking/checkboxQuestione2e/checkbox-and-address-question.e2e.ts @@ -1,10 +1,6 @@ import { test } from "../../lib/fixtures"; import { initialCommonSteps } from "../utils/bookingUtils"; -test.describe.configure({ mode: "parallel" }); - -test.afterEach(({ users }) => users.deleteAll()); - test.describe("Booking With Checkbox Question and Address Question", () => { const bookingOptions = { hasPlaceholder: true, isRequired: true }; test("Checkbox and Address required", async ({ page, users }) => { diff --git a/apps/web/playwright/booking/checkboxQuestione2e/checkbox-and-checkbox-question.e2e.ts b/apps/web/playwright/booking/checkboxQuestione2e/checkbox-and-checkbox-question.e2e.ts index 0258015f25..8fbd9b6bae 100644 --- a/apps/web/playwright/booking/checkboxQuestione2e/checkbox-and-checkbox-question.e2e.ts +++ b/apps/web/playwright/booking/checkboxQuestione2e/checkbox-and-checkbox-question.e2e.ts @@ -1,10 +1,6 @@ import { test } from "../../lib/fixtures"; import { initialCommonSteps } from "../utils/bookingUtils"; -test.describe.configure({ mode: "parallel" }); - -test.afterEach(({ users }) => users.deleteAll()); - test.describe("Booking With Checkbox Question and Checkbox group Question", () => { const bookingOptions = { hasPlaceholder: false, isRequired: true }; test("Checkbox and Checkbox group required", async ({ page, users }) => { diff --git a/apps/web/playwright/booking/checkboxQuestione2e/checkbox-and-long-text-question.e2e.ts b/apps/web/playwright/booking/checkboxQuestione2e/checkbox-and-long-text-question.e2e.ts index bf3980d465..d6afd8f9b3 100644 --- a/apps/web/playwright/booking/checkboxQuestione2e/checkbox-and-long-text-question.e2e.ts +++ b/apps/web/playwright/booking/checkboxQuestione2e/checkbox-and-long-text-question.e2e.ts @@ -1,10 +1,6 @@ import { test } from "../../lib/fixtures"; import { initialCommonSteps } from "../utils/bookingUtils"; -test.describe.configure({ mode: "parallel" }); - -test.afterEach(({ users }) => users.deleteAll()); - test.describe("Booking With Checkbox Question and Long Text Question", () => { const bookingOptions = { hasPlaceholder: true, isRequired: true }; test("Checkbox and Long Text required", async ({ page, users }) => { diff --git a/apps/web/playwright/booking/checkboxQuestione2e/checkbox-and-multiple-emails-question.e2e.ts b/apps/web/playwright/booking/checkboxQuestione2e/checkbox-and-multiple-emails-question.e2e.ts index bb5b049399..a780bd24f4 100644 --- a/apps/web/playwright/booking/checkboxQuestione2e/checkbox-and-multiple-emails-question.e2e.ts +++ b/apps/web/playwright/booking/checkboxQuestione2e/checkbox-and-multiple-emails-question.e2e.ts @@ -1,10 +1,6 @@ import { test } from "../../lib/fixtures"; import { initialCommonSteps } from "../utils/bookingUtils"; -test.describe.configure({ mode: "parallel" }); - -test.afterEach(({ users }) => users.deleteAll()); - test.describe("Booking With Checkbox Question and Multi email Question", () => { const bookingOptions = { hasPlaceholder: true, isRequired: true }; test("Checkbox and Multi email required", async ({ page, users }) => { diff --git a/apps/web/playwright/booking/checkboxQuestione2e/checkbox-and-multiselect-question.e2e.ts b/apps/web/playwright/booking/checkboxQuestione2e/checkbox-and-multiselect-question.e2e.ts index 5f769d1c4c..07aa8201e7 100644 --- a/apps/web/playwright/booking/checkboxQuestione2e/checkbox-and-multiselect-question.e2e.ts +++ b/apps/web/playwright/booking/checkboxQuestione2e/checkbox-and-multiselect-question.e2e.ts @@ -1,10 +1,6 @@ import { test } from "../../lib/fixtures"; import { initialCommonSteps } from "../utils/bookingUtils"; -test.describe.configure({ mode: "parallel" }); - -test.afterEach(({ users }) => users.deleteAll()); - test.describe("Booking With Checkbox Question and Multiselect Question", () => { const bookingOptions = { hasPlaceholder: false, isRequired: true }; test("Checkbox and Multiselect required", async ({ page, users }) => { diff --git a/apps/web/playwright/booking/checkboxQuestione2e/checkbox-and-number-question.e2e.ts b/apps/web/playwright/booking/checkboxQuestione2e/checkbox-and-number-question.e2e.ts index 5622c1e3c0..655cb37f7f 100644 --- a/apps/web/playwright/booking/checkboxQuestione2e/checkbox-and-number-question.e2e.ts +++ b/apps/web/playwright/booking/checkboxQuestione2e/checkbox-and-number-question.e2e.ts @@ -1,10 +1,6 @@ import { test } from "../../lib/fixtures"; import { initialCommonSteps } from "../utils/bookingUtils"; -test.describe.configure({ mode: "parallel" }); - -test.afterEach(({ users }) => users.deleteAll()); - test.describe("Booking With Checkbox Question and Number Question", () => { const bookingOptions = { hasPlaceholder: true, isRequired: true }; test("Checkbox and Number required", async ({ page, users }) => { diff --git a/apps/web/playwright/booking/checkboxQuestione2e/checkbox-and-phone-question.e2e.ts b/apps/web/playwright/booking/checkboxQuestione2e/checkbox-and-phone-question.e2e.ts index f7b520f153..4a591b3159 100644 --- a/apps/web/playwright/booking/checkboxQuestione2e/checkbox-and-phone-question.e2e.ts +++ b/apps/web/playwright/booking/checkboxQuestione2e/checkbox-and-phone-question.e2e.ts @@ -1,10 +1,6 @@ import { test } from "../../lib/fixtures"; import { initialCommonSteps } from "../utils/bookingUtils"; -test.describe.configure({ mode: "parallel" }); - -test.afterEach(({ users }) => users.deleteAll()); - test.describe("Booking With Checkbox Question and Phone Question", () => { const bookingOptions = { hasPlaceholder: true, isRequired: true }; test("Checkbox and Phone required", async ({ page, users }) => { diff --git a/apps/web/playwright/booking/checkboxQuestione2e/checkbox-and-radio-group-question.e2e.ts b/apps/web/playwright/booking/checkboxQuestione2e/checkbox-and-radio-group-question.e2e.ts index 03b48e78ac..a8d51cae59 100644 --- a/apps/web/playwright/booking/checkboxQuestione2e/checkbox-and-radio-group-question.e2e.ts +++ b/apps/web/playwright/booking/checkboxQuestione2e/checkbox-and-radio-group-question.e2e.ts @@ -1,10 +1,6 @@ import { test } from "../../lib/fixtures"; import { initialCommonSteps } from "../utils/bookingUtils"; -test.describe.configure({ mode: "parallel" }); - -test.afterEach(({ users }) => users.deleteAll()); - test.describe("Booking With Checkbox Question and Radio group Question", () => { const bookingOptions = { hasPlaceholder: false, isRequired: true }; test("Checkbox and Radio group required", async ({ page, users }) => { diff --git a/apps/web/playwright/booking/checkboxQuestione2e/checkbox-and-select-question.e2e.ts b/apps/web/playwright/booking/checkboxQuestione2e/checkbox-and-select-question.e2e.ts index 8316aed836..1fea87249b 100644 --- a/apps/web/playwright/booking/checkboxQuestione2e/checkbox-and-select-question.e2e.ts +++ b/apps/web/playwright/booking/checkboxQuestione2e/checkbox-and-select-question.e2e.ts @@ -1,10 +1,6 @@ import { test } from "../../lib/fixtures"; import { initialCommonSteps } from "../utils/bookingUtils"; -test.describe.configure({ mode: "parallel" }); - -test.afterEach(({ users }) => users.deleteAll()); - test.describe("Booking With Checkbox Question and Select Question", () => { const bookingOptions = { hasPlaceholder: false, isRequired: true }; test("Checkbox and Select required", async ({ page, users }) => { diff --git a/apps/web/playwright/booking/checkboxQuestione2e/checkbox-and-short-text-question.e2e.ts b/apps/web/playwright/booking/checkboxQuestione2e/checkbox-and-short-text-question.e2e.ts index 6852bedaef..752c5f4c34 100644 --- a/apps/web/playwright/booking/checkboxQuestione2e/checkbox-and-short-text-question.e2e.ts +++ b/apps/web/playwright/booking/checkboxQuestione2e/checkbox-and-short-text-question.e2e.ts @@ -1,10 +1,6 @@ import { test } from "../../lib/fixtures"; import { initialCommonSteps } from "../utils/bookingUtils"; -test.describe.configure({ mode: "parallel" }); - -test.afterEach(({ users }) => users.deleteAll()); - test.describe("Booking With Checkbox Question and Short text Question", () => { const bookingOptions = { hasPlaceholder: true, isRequired: true }; test("Checkbox and Short text required", async ({ page, users }) => { diff --git a/apps/web/playwright/booking/phoneQuestione2e/phone-and-address-question.e2e.ts b/apps/web/playwright/booking/phoneQuestione2e/phone-and-address-question.e2e.ts index 056571f858..6e3977aa46 100644 --- a/apps/web/playwright/booking/phoneQuestione2e/phone-and-address-question.e2e.ts +++ b/apps/web/playwright/booking/phoneQuestione2e/phone-and-address-question.e2e.ts @@ -1,10 +1,6 @@ import { test } from "../../lib/fixtures"; import { initialCommonSteps } from "../utils/bookingUtils"; -test.describe.configure({ mode: "parallel" }); - -test.afterEach(({ users }) => users.deleteAll()); - test.describe("Booking With Phone Question and Address Question", () => { const bookingOptions = { hasPlaceholder: true, isRequired: true }; test("Phone and Address required", async ({ page, users }) => { diff --git a/apps/web/playwright/booking/phoneQuestione2e/phone-and-checkbox-group-question.e2e.ts b/apps/web/playwright/booking/phoneQuestione2e/phone-and-checkbox-group-question.e2e.ts index dcfa63323e..11b09ee1a8 100644 --- a/apps/web/playwright/booking/phoneQuestione2e/phone-and-checkbox-group-question.e2e.ts +++ b/apps/web/playwright/booking/phoneQuestione2e/phone-and-checkbox-group-question.e2e.ts @@ -1,10 +1,6 @@ import { test } from "../../lib/fixtures"; import { initialCommonSteps } from "../utils/bookingUtils"; -test.describe.configure({ mode: "parallel" }); - -test.afterEach(({ users }) => users.deleteAll()); - test.describe("Booking With Phone Question and checkbox group Question", () => { const bookingOptions = { hasPlaceholder: false, isRequired: true }; test("Phone and checkbox group required", async ({ page, users }) => { diff --git a/apps/web/playwright/booking/phoneQuestione2e/phone-and-checkbox-question.e2e.ts b/apps/web/playwright/booking/phoneQuestione2e/phone-and-checkbox-question.e2e.ts index 7ecf116668..38d62b98c1 100644 --- a/apps/web/playwright/booking/phoneQuestione2e/phone-and-checkbox-question.e2e.ts +++ b/apps/web/playwright/booking/phoneQuestione2e/phone-and-checkbox-question.e2e.ts @@ -1,10 +1,6 @@ import { test } from "../../lib/fixtures"; import { initialCommonSteps } from "../utils/bookingUtils"; -test.describe.configure({ mode: "parallel" }); - -test.afterEach(({ users }) => users.deleteAll()); - test.describe("Booking With Phone Question and checkbox Question", () => { const bookingOptions = { hasPlaceholder: false, isRequired: true }; test("Phone and checkbox required", async ({ page, users }) => { diff --git a/apps/web/playwright/booking/phoneQuestione2e/phone-and-long-text-question.e2e.ts b/apps/web/playwright/booking/phoneQuestione2e/phone-and-long-text-question.e2e.ts index 242f214bbb..e2cd090b93 100644 --- a/apps/web/playwright/booking/phoneQuestione2e/phone-and-long-text-question.e2e.ts +++ b/apps/web/playwright/booking/phoneQuestione2e/phone-and-long-text-question.e2e.ts @@ -1,10 +1,6 @@ import { test } from "../../lib/fixtures"; import { initialCommonSteps } from "../utils/bookingUtils"; -test.describe.configure({ mode: "parallel" }); - -test.afterEach(({ users }) => users.deleteAll()); - test.describe("Booking With Phone Question and Long text Question", () => { const bookingOptions = { hasPlaceholder: true, isRequired: true }; test("Phone and Long text required", async ({ page, users }) => { diff --git a/apps/web/playwright/booking/phoneQuestione2e/phone-and-multiple-emails-question.e2e.ts b/apps/web/playwright/booking/phoneQuestione2e/phone-and-multiple-emails-question.e2e.ts index 393e58c161..194b8c3536 100644 --- a/apps/web/playwright/booking/phoneQuestione2e/phone-and-multiple-emails-question.e2e.ts +++ b/apps/web/playwright/booking/phoneQuestione2e/phone-and-multiple-emails-question.e2e.ts @@ -1,10 +1,6 @@ import { test } from "../../lib/fixtures"; import { initialCommonSteps } from "../utils/bookingUtils"; -test.describe.configure({ mode: "parallel" }); - -test.afterEach(({ users }) => users.deleteAll()); - test.describe("Booking With Phone Question and Multi email Question", () => { const bookingOptions = { hasPlaceholder: true, isRequired: true }; test("Phone and Multi email required", async ({ page, users }) => { diff --git a/apps/web/playwright/booking/phoneQuestione2e/phone-and-multiselect-question.e2e.ts b/apps/web/playwright/booking/phoneQuestione2e/phone-and-multiselect-question.e2e.ts index a6119d8922..e8a6edaf87 100644 --- a/apps/web/playwright/booking/phoneQuestione2e/phone-and-multiselect-question.e2e.ts +++ b/apps/web/playwright/booking/phoneQuestione2e/phone-and-multiselect-question.e2e.ts @@ -1,10 +1,6 @@ import { test } from "../../lib/fixtures"; import { initialCommonSteps } from "../utils/bookingUtils"; -test.describe.configure({ mode: "parallel" }); - -test.afterEach(({ users }) => users.deleteAll()); - test.describe("Booking With Phone Question and multiselect Question", () => { const bookingOptions = { hasPlaceholder: false, isRequired: true }; test("Phone and multiselect text required", async ({ page, users }) => { diff --git a/apps/web/playwright/booking/phoneQuestione2e/phone-and-number-question.e2e.ts b/apps/web/playwright/booking/phoneQuestione2e/phone-and-number-question.e2e.ts index da53592b9a..b35c727de8 100644 --- a/apps/web/playwright/booking/phoneQuestione2e/phone-and-number-question.e2e.ts +++ b/apps/web/playwright/booking/phoneQuestione2e/phone-and-number-question.e2e.ts @@ -1,10 +1,6 @@ import { test } from "../../lib/fixtures"; import { initialCommonSteps } from "../utils/bookingUtils"; -test.describe.configure({ mode: "parallel" }); - -test.afterEach(({ users }) => users.deleteAll()); - test.describe("Booking With Phone Question and Number Question", () => { const bookingOptions = { hasPlaceholder: true, isRequired: true }; test("Phone and Number required", async ({ page, users }) => { diff --git a/apps/web/playwright/booking/phoneQuestione2e/phone-and-radio-group-question.e2e.ts b/apps/web/playwright/booking/phoneQuestione2e/phone-and-radio-group-question.e2e.ts index 2e9f0ccff9..e4ead7a230 100644 --- a/apps/web/playwright/booking/phoneQuestione2e/phone-and-radio-group-question.e2e.ts +++ b/apps/web/playwright/booking/phoneQuestione2e/phone-and-radio-group-question.e2e.ts @@ -1,10 +1,6 @@ import { test } from "../../lib/fixtures"; import { initialCommonSteps } from "../utils/bookingUtils"; -test.describe.configure({ mode: "parallel" }); - -test.afterEach(({ users }) => users.deleteAll()); - test.describe("Booking With Phone Question and Radio group Question", () => { const bookingOptions = { hasPlaceholder: false, isRequired: true }; test("Phone and Radio group required", async ({ page, users }) => { diff --git a/apps/web/playwright/booking/phoneQuestione2e/phone-and-select-question.e2e.ts b/apps/web/playwright/booking/phoneQuestione2e/phone-and-select-question.e2e.ts index bb963f956b..c054c259e2 100644 --- a/apps/web/playwright/booking/phoneQuestione2e/phone-and-select-question.e2e.ts +++ b/apps/web/playwright/booking/phoneQuestione2e/phone-and-select-question.e2e.ts @@ -1,10 +1,6 @@ import { test } from "../../lib/fixtures"; import { initialCommonSteps } from "../utils/bookingUtils"; -test.describe.configure({ mode: "parallel" }); - -test.afterEach(({ users }) => users.deleteAll()); - test.describe("Booking With Phone Question and select Question", () => { const bookingOptions = { hasPlaceholder: false, isRequired: true }; test("Phone and select required", async ({ page, users }) => { diff --git a/apps/web/playwright/booking/phoneQuestione2e/phone-and-short-text-question.e2e.ts b/apps/web/playwright/booking/phoneQuestione2e/phone-and-short-text-question.e2e.ts index 82bac518e3..95e393d0c0 100644 --- a/apps/web/playwright/booking/phoneQuestione2e/phone-and-short-text-question.e2e.ts +++ b/apps/web/playwright/booking/phoneQuestione2e/phone-and-short-text-question.e2e.ts @@ -1,10 +1,6 @@ import { test } from "../../lib/fixtures"; import { initialCommonSteps } from "../utils/bookingUtils"; -test.describe.configure({ mode: "parallel" }); - -test.afterEach(({ users }) => users.deleteAll()); - test.describe("Booking With Phone Question and Short text question", () => { const bookingOptions = { hasPlaceholder: true, isRequired: true }; test("Phone and Short text required", async ({ page, users }) => { diff --git a/apps/web/playwright/booking/utils/bookingUtils.ts b/apps/web/playwright/booking/utils/bookingUtils.ts index e393e5d11e..cd556635fc 100644 --- a/apps/web/playwright/booking/utils/bookingUtils.ts +++ b/apps/web/playwright/booking/utils/bookingUtils.ts @@ -212,7 +212,10 @@ export const initialCommonSteps = async ( await bookingPage.getByTestId("preview-button").click(); const eventTypePage = await eventtypePromise; - // Select the first available time + while (await bookingPage.getByRole("button", { name: "View next" }).isVisible()) { + await bookingPage.getByRole("button", { name: "View next" }).click(); + } + await eventTypePage.getByTestId("time").first().click(); fillAndConfirmBooking( eventTypePage, @@ -228,6 +231,9 @@ export const initialCommonSteps = async ( }; const rescheduleAndCancel = async (eventTypePage: Page) => { await eventTypePage.getByText("Reschedule").click(); + while (await eventTypePage.getByRole("button", { name: "View next" }).isVisible()) { + await eventTypePage.getByRole("button", { name: "View next" }).click(); + } await eventTypePage.getByTestId("time").first().click(); await eventTypePage.getByPlaceholder(reschedulePlaceholderText).click(); await eventTypePage.getByPlaceholder(reschedulePlaceholderText).fill("Test reschedule");