diff --git a/e2e/allday/create-allday-event-keyboard.spec.ts b/e2e/allday/create-allday-event-keyboard.spec.ts index 6b0e8de19..92455b6fc 100644 --- a/e2e/allday/create-allday-event-keyboard.spec.ts +++ b/e2e/allday/create-allday-event-keyboard.spec.ts @@ -7,7 +7,9 @@ import { prepareCalendarPage, } from "../utils/event-test-utils"; -test.skip("should create an all-day event using keyboard interaction", async ({ +test.skip(({ isMobile }) => isMobile, "Keyboard shortcuts are desktop-only."); + +test("should create an all-day event using keyboard interaction", async ({ page, }) => { await prepareCalendarPage(page); diff --git a/e2e/allday/create-allday-event-mouse.spec.ts b/e2e/allday/create-allday-event-mouse.spec.ts index 424519a54..67acc64b6 100644 --- a/e2e/allday/create-allday-event-mouse.spec.ts +++ b/e2e/allday/create-allday-event-mouse.spec.ts @@ -7,7 +7,12 @@ import { prepareCalendarPage, } from "../utils/event-test-utils"; -test.skip("should create an all-day event using mouse interaction", async ({ +test.skip( + ({ isMobile }) => isMobile, + "Mouse flows are desktop-only in week view.", +); + +test("should create an all-day event using mouse interaction", async ({ page, }) => { await prepareCalendarPage(page); diff --git a/e2e/allday/delete-allday-event-keyboard.spec.ts b/e2e/allday/delete-allday-event-keyboard.spec.ts index 9a8be017c..4bc04ad9c 100644 --- a/e2e/allday/delete-allday-event-keyboard.spec.ts +++ b/e2e/allday/delete-allday-event-keyboard.spec.ts @@ -10,7 +10,9 @@ import { prepareCalendarPage, } from "../utils/event-test-utils"; -test.skip("should delete an all-day event using keyboard interaction", async ({ +test.skip(({ isMobile }) => isMobile, "Keyboard shortcuts are desktop-only."); + +test("should delete an all-day event using keyboard interaction", async ({ page, }) => { await prepareCalendarPage(page); diff --git a/e2e/allday/delete-allday-event-mouse.spec.ts b/e2e/allday/delete-allday-event-mouse.spec.ts index f6fea5d70..f4293fb06 100644 --- a/e2e/allday/delete-allday-event-mouse.spec.ts +++ b/e2e/allday/delete-allday-event-mouse.spec.ts @@ -6,10 +6,16 @@ import { expectAllDayEventVisible, fillTitleAndSaveWithMouse, openAllDayEventFormWithMouse, + openEventForEditingWithMouse, prepareCalendarPage, } from "../utils/event-test-utils"; -test.skip("should delete an all-day event using mouse interaction", async ({ +test.skip( + ({ isMobile }) => isMobile, + "Mouse flows are desktop-only in week view.", +); + +test("should delete an all-day event using mouse interaction", async ({ page, }) => { await prepareCalendarPage(page); @@ -19,7 +25,7 @@ test.skip("should delete an all-day event using mouse interaction", async ({ await fillTitleAndSaveWithMouse(page, title); await expectAllDayEventVisible(page, title); - await page.locator("#allDayRow").getByRole("button", { name: title }).click(); + await openEventForEditingWithMouse(page, title); await deleteEventWithMouse(page); await expectAllDayEventMissing(page, title); diff --git a/e2e/allday/update-allday-event-keyboard.spec.ts b/e2e/allday/update-allday-event-keyboard.spec.ts index ddc339fec..60a555169 100644 --- a/e2e/allday/update-allday-event-keyboard.spec.ts +++ b/e2e/allday/update-allday-event-keyboard.spec.ts @@ -10,7 +10,9 @@ import { updateEventTitle, } from "../utils/event-test-utils"; -test.skip("should update an all-day event using keyboard interaction", async ({ +test.skip(({ isMobile }) => isMobile, "Keyboard shortcuts are desktop-only."); + +test("should update an all-day event using keyboard interaction", async ({ page, }) => { await prepareCalendarPage(page); diff --git a/e2e/allday/update-allday-event-mouse.spec.ts b/e2e/allday/update-allday-event-mouse.spec.ts index 76c55d54c..6b8f70b9f 100644 --- a/e2e/allday/update-allday-event-mouse.spec.ts +++ b/e2e/allday/update-allday-event-mouse.spec.ts @@ -5,6 +5,7 @@ import { expectAllDayEventVisible, fillTitleAndSaveWithMouse, openAllDayEventFormWithMouse, + openEventForEditingWithMouse, prepareCalendarPage, updateEventTitle, } from "../utils/event-test-utils"; @@ -14,7 +15,7 @@ test.skip( "Mouse flows are desktop-only in week view.", ); -test.skip("should update an all-day event using mouse interaction", async ({ +test("should update an all-day event using mouse interaction", async ({ page, }) => { await prepareCalendarPage(page); @@ -24,7 +25,7 @@ test.skip("should update an all-day event using mouse interaction", async ({ await fillTitleAndSaveWithMouse(page, title); await expectAllDayEventVisible(page, title); - await page.locator("#allDayRow").getByRole("button", { name: title }).click(); + await openEventForEditingWithMouse(page, title); const updatedTitle = updateEventTitle("All-Day Event"); await fillTitleAndSaveWithMouse(page, updatedTitle); diff --git a/e2e/someday/delete-someday-event-keyboard.spec.ts b/e2e/someday/delete-someday-event-keyboard.spec.ts index 7eded7039..99de9ef32 100644 --- a/e2e/someday/delete-someday-event-keyboard.spec.ts +++ b/e2e/someday/delete-someday-event-keyboard.spec.ts @@ -12,7 +12,7 @@ import { test.skip(({ isMobile }) => isMobile, "Someday sidebar is desktop-only."); -test.skip("should delete a someday event using keyboard interaction", async ({ +test("should delete a someday event using keyboard interaction", async ({ page, }) => { await prepareCalendarPage(page); diff --git a/e2e/someday/delete-someday-event-mouse.spec.ts b/e2e/someday/delete-someday-event-mouse.spec.ts index f7dd89846..dd3f36925 100644 --- a/e2e/someday/delete-someday-event-mouse.spec.ts +++ b/e2e/someday/delete-someday-event-mouse.spec.ts @@ -11,7 +11,7 @@ import { test.skip(({ isMobile }) => isMobile, "Someday sidebar is desktop-only."); -test.skip("should delete a someday event using mouse interaction", async ({ +test("should delete a someday event using mouse interaction", async ({ page, }) => { await prepareCalendarPage(page); diff --git a/e2e/someday/update-someday-event-keyboard.spec.ts b/e2e/someday/update-someday-event-keyboard.spec.ts index 68ca31df7..e08cf05b3 100644 --- a/e2e/someday/update-someday-event-keyboard.spec.ts +++ b/e2e/someday/update-someday-event-keyboard.spec.ts @@ -12,7 +12,7 @@ import { test.skip(({ isMobile }) => isMobile, "Someday sidebar is desktop-only."); -test.skip("should update a someday event using keyboard interaction", async ({ +test("should update a someday event using keyboard interaction", async ({ page, }) => { await prepareCalendarPage(page); @@ -21,6 +21,7 @@ test.skip("should update a someday event using keyboard interaction", async ({ await openSomedayEventFormWithKeyboard(page); await fillTitleAndSaveWithKeyboard(page, title); await expectSomedayEventVisible(page, title); + await page.waitForTimeout(1000); await openEventForEditingWithKeyboard(page, title); diff --git a/e2e/someday/update-someday-event-mouse.spec.ts b/e2e/someday/update-someday-event-mouse.spec.ts index dcc6e370f..0e4261944 100644 --- a/e2e/someday/update-someday-event-mouse.spec.ts +++ b/e2e/someday/update-someday-event-mouse.spec.ts @@ -11,7 +11,7 @@ import { test.skip(({ isMobile }) => isMobile, "Someday sidebar is desktop-only."); -test.skip("should update a someday event using mouse interaction", async ({ +test("should update a someday event using mouse interaction", async ({ page, }) => { await prepareCalendarPage(page); diff --git a/e2e/timed/delete-event-mouse.spec.ts b/e2e/timed/delete-event-mouse.spec.ts index 0e7f8eaeb..dc8ead1cf 100644 --- a/e2e/timed/delete-event-mouse.spec.ts +++ b/e2e/timed/delete-event-mouse.spec.ts @@ -10,7 +10,12 @@ import { prepareCalendarPage, } from "../utils/event-test-utils"; -test.skip("should delete a timed event using mouse interaction", async ({ +test.skip( + ({ isMobile }) => isMobile, + "Mouse flows are desktop-only in week view.", +); + +test("should delete a timed event using mouse interaction", async ({ page, }) => { await prepareCalendarPage(page); diff --git a/e2e/timed/update-event-keyboard.spec.ts b/e2e/timed/update-event-keyboard.spec.ts index 096b83cf5..bb5ac9a2e 100644 --- a/e2e/timed/update-event-keyboard.spec.ts +++ b/e2e/timed/update-event-keyboard.spec.ts @@ -10,7 +10,9 @@ import { updateEventTitle, } from "../utils/event-test-utils"; -test.skip("should update a timed event using keyboard interaction", async ({ +test.skip(({ isMobile }) => isMobile, "Keyboard shortcuts are desktop-only."); + +test("should update a timed event using keyboard interaction", async ({ page, }) => { await prepareCalendarPage(page);