diff --git a/apps/web/ee/components/LicenseBanner.tsx b/apps/web/ee/components/LicenseBanner.tsx index 16f2232c..8e547a73 100644 --- a/apps/web/ee/components/LicenseBanner.tsx +++ b/apps/web/ee/components/LicenseBanner.tsx @@ -20,7 +20,7 @@ export default function LicenseBanner() { - Acquire a commercial license to remove these terms by visiting: cal.com/sales NEXT_PUBLIC_LICENSE_CONSENT='' */ - if (process.env.NEXT_PUBLIC_LICENSE_CONSENT === "agree") { + if (process.env.NEXT_PUBLIC_LICENSE_CONSENT === "agree" || process.env.NEXT_PUBLIC_IS_E2E) { return null; } diff --git a/apps/web/pages/event-types/[type].tsx b/apps/web/pages/event-types/[type].tsx index abef3a61..a0f9609b 100644 --- a/apps/web/pages/event-types/[type].tsx +++ b/apps/web/pages/event-types/[type].tsx @@ -1117,7 +1117,10 @@ const EventTypePage = (props: inferSSRProps) => { open={advancedSettingsVisible} onOpenChange={() => setAdvancedSettingsVisible(!advancedSettingsVisible)}> <> - + ) => { {t("show_advanced_settings")} - + {/** * Only display calendar selector if user has connected calendars AND if it's not * a team event. Since we don't have logic to handle each attende calendar (for now). @@ -1663,7 +1666,7 @@ const EventTypePage = (props: inferSSRProps) => { - diff --git a/apps/web/playwright/event-types.test.ts b/apps/web/playwright/event-types.test.ts index 06a4ab2a..f277a3ca 100644 --- a/apps/web/playwright/event-types.test.ts +++ b/apps/web/playwright/event-types.test.ts @@ -69,6 +69,25 @@ test.describe("Event Types tests", () => { await expect(formTitle).toBe(firstTitle); await expect(formSlug).toBe(firstSlug); }); + test("edit first event", async ({ page }) => { + const $eventTypes = await page.locator("[data-testid=event-types] > *"); + const firstEventTypeElement = await $eventTypes.first(); + await firstEventTypeElement.click(); + await page.waitForNavigation({ + url: (url) => { + return !!url.pathname.match(/\/event-types\/.+/); + }, + }); + await expect(page.locator("[data-testid=advanced-settings-content]")).not.toBeVisible(); + await page.locator("[data-testid=show-advanced-settings]").click(); + await expect(page.locator("[data-testid=advanced-settings-content]")).toBeVisible(); + await page.locator("[data-testid=update-eventtype]").click(); + await page.waitForNavigation({ + url: (url) => { + return url.pathname.endsWith("/event-types"); + }, + }); + }); }); test.describe("free user", () => { @@ -88,5 +107,25 @@ test.describe("Event Types tests", () => { test("can not add new event type", async ({ page }) => { await expect(page.locator("[data-testid=new-event-type]")).toBeDisabled(); }); + + test("edit first event", async ({ page }) => { + const $eventTypes = await page.locator("[data-testid=event-types] > *"); + const firstEventTypeElement = await $eventTypes.first(); + await firstEventTypeElement.click(); + await page.waitForNavigation({ + url: (url) => { + return !!url.pathname.match(/\/event-types\/.+/); + }, + }); + await expect(page.locator("[data-testid=advanced-settings-content]")).not.toBeVisible(); + await page.locator("[data-testid=show-advanced-settings]").click(); + await expect(page.locator("[data-testid=advanced-settings-content]")).toBeVisible(); + await page.locator("[data-testid=update-eventtype]").click(); + await page.waitForNavigation({ + url: (url) => { + return url.pathname.endsWith("/event-types"); + }, + }); + }); }); }); diff --git a/apps/web/playwright/integrations.test.ts-snapshots/webhookResponse-chromium.txt b/apps/web/playwright/integrations.test.ts-snapshots/webhookResponse-chromium.txt index 2d8e6d92..07fe93f9 100644 --- a/apps/web/playwright/integrations.test.ts-snapshots/webhookResponse-chromium.txt +++ b/apps/web/playwright/integrations.test.ts-snapshots/webhookResponse-chromium.txt @@ -1 +1 @@ -{"triggerEvent":"BOOKING_CREATED","createdAt":"[redacted/dynamic]","payload":{"type":"30min","title":"30min between Pro Example and Test Testson","description":null,"additionalNotes":"","startTime":"[redacted/dynamic]","endTime":"[redacted/dynamic]","organizer":{"name":"Pro Example","email":"pro@example.com","timeZone":"[redacted/dynamic]","language":"[redacted/dynamic]"},"attendees":[{"email":"test@example.com","name":"Test Testson","timeZone":"[redacted/dynamic]","language":"[redacted/dynamic]"}],"location":"[redacted/dynamic]","destinationCalendar":null,"hideCalendarNotes":false,"uid":"[redacted/dynamic]","metadata":{},"additionInformation":"[redacted/dynamic]"}} \ No newline at end of file +{"triggerEvent":"BOOKING_CREATED","createdAt":"[redacted/dynamic]","payload":{"type":"30min","title":"30min between Pro Example and Test Testson","description":"","additionalNotes":"","startTime":"[redacted/dynamic]","endTime":"[redacted/dynamic]","organizer":{"name":"Pro Example","email":"pro@example.com","timeZone":"[redacted/dynamic]","language":"[redacted/dynamic]"},"attendees":[{"email":"test@example.com","name":"Test Testson","timeZone":"[redacted/dynamic]","language":"[redacted/dynamic]"}],"location":"[redacted/dynamic]","destinationCalendar":null,"hideCalendarNotes":false,"uid":"[redacted/dynamic]","metadata":{},"additionInformation":"[redacted/dynamic]"}} \ No newline at end of file