fix: filter booking in upcoming (#6406)
* fix: filter booking in upcoming Signed-off-by: Udit Takkar <udit.07814802719@cse.mait.ac.in> * fix: test Signed-off-by: Udit Takkar <udit.07814802719@cse.mait.ac.in> * fix: wipe-my-cal failing test Signed-off-by: Udit Takkar <udit.07814802719@cse.mait.ac.in> --------- Signed-off-by: Udit Takkar <udit.07814802719@cse.mait.ac.in> Co-authored-by: Peer Richelsen <peeroke@gmail.com> Co-authored-by: Peer Richelsen <peer@cal.com>
This commit is contained in:
parent
75509c97fd
commit
24be8a63f2
|
@ -88,6 +88,8 @@ export default function Bookings() {
|
|||
return false;
|
||||
}
|
||||
shownBookings[booking.recurringEventId] = [booking];
|
||||
} else if (status === "upcoming") {
|
||||
return new Date(booking.startTime).toDateString() !== new Date().toDateString();
|
||||
}
|
||||
return true;
|
||||
};
|
||||
|
@ -121,7 +123,7 @@ export default function Bookings() {
|
|||
<p className="mb-2 text-xs font-medium uppercase leading-4 text-gray-500">{t("today")}</p>
|
||||
<div className="overflow-hidden rounded-md border border-gray-200">
|
||||
<table className="w-full max-w-full table-fixed">
|
||||
<tbody className="divide-y divide-gray-200 bg-white">
|
||||
<tbody className="divide-y divide-gray-200 bg-white" data-testid="today-bookings">
|
||||
<Fragment>
|
||||
{bookingsToday.map((booking: BookingOutput) => (
|
||||
<BookingListItem
|
||||
|
@ -138,7 +140,6 @@ export default function Bookings() {
|
|||
</div>
|
||||
)}
|
||||
<div className="pt-2 xl:pt-0">
|
||||
{/* <p className="mb-2 text-xs font-medium uppercase leading-4 text-gray-500">{t("all")}</p> */}
|
||||
<div className="overflow-hidden rounded-md border border-gray-200">
|
||||
<table className="w-full max-w-full table-fixed">
|
||||
<tbody className="divide-y divide-gray-200 bg-white" data-testid="bookings">
|
||||
|
|
|
@ -38,22 +38,15 @@ test.describe("Wipe my Cal App Test", () => {
|
|||
await expect(page.locator("data-testid=wipe-today-button")).toBeVisible();
|
||||
|
||||
const $openBookingCount = await page.locator('[data-testid="bookings"] > *').count();
|
||||
expect($openBookingCount).toBe(3);
|
||||
const $todayBookingCount = await page.locator('[data-testid="today-bookings"] > *').count();
|
||||
expect($openBookingCount + $todayBookingCount).toBe(3);
|
||||
|
||||
await page.locator("data-testid=wipe-today-button").click();
|
||||
|
||||
// Don't await send_request click, otherwise mutation can possibly occur before observer is attached
|
||||
page.locator("data-testid=send_request").click();
|
||||
const $openBookings = page.locator('[data-testid="bookings"]');
|
||||
await $openBookings.evaluate((ul) => {
|
||||
return new Promise<void>((resolve) =>
|
||||
new window.MutationObserver(() => {
|
||||
if (ul.childElementCount === 2) {
|
||||
resolve();
|
||||
}
|
||||
}).observe(ul, { childList: true })
|
||||
);
|
||||
});
|
||||
// There will not be any today-bookings
|
||||
await expect(page.locator('[data-testid="today-bookings"]')).toBeHidden();
|
||||
|
||||
await users.deleteAll();
|
||||
});
|
||||
|
|
Loading…
Reference in New Issue
Block a user