public-offering
/
cal.pub0.org
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: don't hardcode 12'clock

bugfix/failing-tests-post-dst
Alex van Andel 2023-10-31 12:48:25 +00:00
parent a1820e0730
commit aa0c5185e4
1 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
packages/lib/date-ranges.test.ts
View File

@ -1,5 +1,6 @@
import { describe, expect, it } from "vitest"; import { describe, expect, it } from "vitest";
import type { Dayjs } from "@calcom/dayjs";
import dayjs from "@calcom/dayjs"; import dayjs from "@calcom/dayjs";
import { buildDateRanges, processDateOverride, processWorkingHours, subtract } from "./date-ranges"; import { buildDateRanges, processDateOverride, processWorkingHours, subtract } from "./date-ranges";
@ -8,8 +9,8 @@ describe("processWorkingHours", () => {
it("should return the correct working hours given a specific availability, timezone, and date range", () => { it("should return the correct working hours given a specific availability, timezone, and date range", () => {
const item = { const item = {
days: [1, 2, 3, 4, 5], // Monday to Friday days: [1, 2, 3, 4, 5], // Monday to Friday
startTime: new Date(2023, 5, 12, 8, 0), // 8 AM startTime: new Date(Date.UTC(2023, 5, 12, 8, 0)), // 8 AM
endTime: new Date(2023, 5, 12, 17, 0), // 5 PM endTime: new Date(Date.UTC(2023, 5, 12, 17, 0)), // 5 PM
}; };
const timeZone = "America/New_York"; const timeZone = "America/New_York";
@ -19,21 +20,27 @@ describe("processWorkingHours", () => {
const results = processWorkingHours({ item, timeZone, dateFrom, dateTo }); const results = processWorkingHours({ item, timeZone, dateFrom, dateTo });
expect(results.length).toBe(2); // There should be two working days between the range expect(results.length).toBe(2); // There should be two working days between the range
// "America/New_York" day shifts -1, so we need to add a day to correct this shift.
expect(results[0]).toEqual({ const computeTimes = (date: Dayjs) => {
start: dayjs(`${dateFrom.tz(timeZone).add(1, "day").format("YYYY-MM-DD")}T12:00:00Z`).tz(timeZone), const baseTime = dayjs.tz(`${date.format("YYYY-MM-DD")}T00:00:00Z`, timeZone);
end: dayjs(`${dateFrom.tz(timeZone).add(1, "day").format("YYYY-MM-DD")}T21:00:00Z`).tz(timeZone), const offset = -baseTime.utcOffset() / 60;
}); return {
expect(results[1]).toEqual({ start: date.add(8 + offset, "hours").tz(timeZone),
start: dayjs(`${dateTo.tz(timeZone).format("YYYY-MM-DD")}T12:00:00Z`).tz(timeZone), end: date.add(17 + offset, "hours").tz(timeZone),
end: dayjs(`${dateTo.tz(timeZone).format("YYYY-MM-DD")}T21:00:00Z`).tz(timeZone), };
}); };
const dateFromTimes = computeTimes(dateFrom);
const dateToTimes = computeTimes(dateTo.startOf("day"));
expect(results[0]).toEqual(dateFromTimes);
expect(results[1]).toEqual(dateToTimes);
}); });
it("should have availability on last day of month in the month were DST starts", () => { it("should have availability on last day of month in the month were DST starts", () => {
const item = { const item = {
days: [0, 1, 2, 3, 4, 5, 6], // Monday to Sunday days: [0, 1, 2, 3, 4, 5, 6], // Monday to Sunday
startTime: new Date(2023, 5, 12, 8, 0), // 8 AM startTime: new Date(Date.UTC(2023, 5, 12, 8, 0)), // 8 AM
endTime: new Date(2023, 5, 12, 17, 0), // 5 PM endTime: new Date(Date.UTC(2023, 5, 12, 17, 0)), // 5 PM
}; };
const timeZone = "Europe/London"; const timeZone = "Europe/London";
@ -54,6 +61,8 @@ describe("processWorkingHours", () => {
endTime: new Date(2023, 5, 12, 17, 0), // 5 PM endTime: new Date(2023, 5, 12, 17, 0), // 5 PM
}; };
console.log(item);
// in America/New_York DST ends on first Sunday of November // in America/New_York DST ends on first Sunday of November
const timeZone = "America/New_York"; const timeZone = "America/New_York";