eduvia/workavia-calendar-front
11
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: resolve merge conflict and format code

Browse Source
This commit is contained in:
lenhanphung
2025-09-18 15:54:16 +07:00
parent 7d46aef1fa
commit b049158c4e
1 changed files with 77 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
__test__/features/Events/eventUtils.test.ts
+77 -43
View File
@@ -484,16 +484,20 @@ describe("calendarEventToJCal", () => {
const [vevent, vtimezone] = result[2]; const [vevent, vtimezone] = result[2];
expect(vevent[0]).toBe("vevent"); expect(vevent[0]).toBe("vevent");
expect(vtimezone[0]).toBe("vtimezone"); expect(vtimezone[0]).toBe("vtimezone");
// Should use UTC timezone as fallback - check for UTC standard timezone // Should use UTC timezone as fallback - check for UTC standard timezone
expect(vtimezone[2]).toEqual( expect(vtimezone[2]).toEqual(
expect.arrayContaining([ expect.arrayContaining([
["standard", [ [
["tzoffsetfrom", {}, "utc-offset", "+00:00"], "standard",
["tzoffsetto", {}, "utc-offset", "+00:00"], [
["tzname", {}, "text", "UTC"], ["tzoffsetfrom", {}, "utc-offset", "+00:00"],
["dtstart", {}, "date-time", "1970-01-01T00:00:00"] ["tzoffsetto", {}, "utc-offset", "+00:00"],
], []] ["tzname", {}, "text", "UTC"],
["dtstart", {}, "date-time", "1970-01-01T00:00:00"],
],
[],
],
]) ])
); );
}); });
@@ -515,16 +519,20 @@ describe("calendarEventToJCal", () => {
const [vevent, vtimezone] = result[2]; const [vevent, vtimezone] = result[2];
expect(vevent[0]).toBe("vevent"); expect(vevent[0]).toBe("vevent");
expect(vtimezone[0]).toBe("vtimezone"); expect(vtimezone[0]).toBe("vtimezone");
// Should use UTC timezone as fallback // Should use UTC timezone as fallback
expect(vtimezone[2]).toEqual( expect(vtimezone[2]).toEqual(
expect.arrayContaining([ expect.arrayContaining([
["standard", [ [
["tzoffsetfrom", {}, "utc-offset", "+00:00"], "standard",
["tzoffsetto", {}, "utc-offset", "+00:00"], [
["tzname", {}, "text", "UTC"], ["tzoffsetfrom", {}, "utc-offset", "+00:00"],
["dtstart", {}, "date-time", "1970-01-01T00:00:00"] ["tzoffsetto", {}, "utc-offset", "+00:00"],
], []] ["tzname", {}, "text", "UTC"],
["dtstart", {}, "date-time", "1970-01-01T00:00:00"],
],
[],
],
]) ])
); );
}); });
@@ -546,16 +554,20 @@ describe("calendarEventToJCal", () => {
const [vevent, vtimezone] = result[2]; const [vevent, vtimezone] = result[2];
expect(vevent[0]).toBe("vevent"); expect(vevent[0]).toBe("vevent");
expect(vtimezone[0]).toBe("vtimezone"); expect(vtimezone[0]).toBe("vtimezone");
// Should use UTC timezone as fallback // Should use UTC timezone as fallback
expect(vtimezone[2]).toEqual( expect(vtimezone[2]).toEqual(
expect.arrayContaining([ expect.arrayContaining([
["standard", [ [
["tzoffsetfrom", {}, "utc-offset", "+00:00"], "standard",
["tzoffsetto", {}, "utc-offset", "+00:00"], [
["tzname", {}, "text", "UTC"], ["tzoffsetfrom", {}, "utc-offset", "+00:00"],
["dtstart", {}, "date-time", "1970-01-01T00:00:00"] ["tzoffsetto", {}, "utc-offset", "+00:00"],
], []] ["tzname", {}, "text", "UTC"],
["dtstart", {}, "date-time", "1970-01-01T00:00:00"],
],
[],
],
]) ])
); );
}); });
@@ -577,16 +589,20 @@ describe("calendarEventToJCal", () => {
const [vevent, vtimezone] = result[2]; const [vevent, vtimezone] = result[2];
expect(vevent[0]).toBe("vevent"); expect(vevent[0]).toBe("vevent");
expect(vtimezone[0]).toBe("vtimezone"); expect(vtimezone[0]).toBe("vtimezone");
// Should use UTC timezone as fallback // Should use UTC timezone as fallback
expect(vtimezone[2]).toEqual( expect(vtimezone[2]).toEqual(
expect.arrayContaining([ expect.arrayContaining([
["standard", [ [
["tzoffsetfrom", {}, "utc-offset", "+00:00"], "standard",
["tzoffsetto", {}, "utc-offset", "+00:00"], [
["tzname", {}, "text", "UTC"], ["tzoffsetfrom", {}, "utc-offset", "+00:00"],
["dtstart", {}, "date-time", "1970-01-01T00:00:00"] ["tzoffsetto", {}, "utc-offset", "+00:00"],
], []] ["tzname", {}, "text", "UTC"],
["dtstart", {}, "date-time", "1970-01-01T00:00:00"],
],
[],
],
]) ])
); );
}); });
@@ -608,24 +624,42 @@ describe("calendarEventToJCal", () => {
const [vevent, vtimezone] = result[2]; const [vevent, vtimezone] = result[2];
expect(vevent[0]).toBe("vevent"); expect(vevent[0]).toBe("vevent");
expect(vtimezone[0]).toBe("vtimezone"); expect(vtimezone[0]).toBe("vtimezone");
// Should use the specified timezone - check for Europe/Paris timezone components // Should use the specified timezone - check for Europe/Paris timezone components
expect(vtimezone[2]).toEqual( expect(vtimezone[2]).toEqual(
expect.arrayContaining([ expect.arrayContaining([
["daylight", [ [
["tzoffsetfrom", {}, "utc-offset", "+01:00"], "daylight",
["tzoffsetto", {}, "utc-offset", "+02:00"], [
["tzname", {}, "text", "CEST"], ["tzoffsetfrom", {}, "utc-offset", "+01:00"],
["dtstart", {}, "date-time", "1970-03-29T02:00:00"], ["tzoffsetto", {}, "utc-offset", "+02:00"],
["rrule", {}, "recur", { byday: "-1SU", bymonth: 3, freq: "YEARLY" }] ["tzname", {}, "text", "CEST"],
], []], ["dtstart", {}, "date-time", "1970-03-29T02:00:00"],
["standard", [ [
["tzoffsetfrom", {}, "utc-offset", "+02:00"], "rrule",
["tzoffsetto", {}, "utc-offset", "+01:00"], {},
["tzname", {}, "text", "CET"], "recur",
["dtstart", {}, "date-time", "1970-10-25T03:00:00"], { byday: "-1SU", bymonth: 3, freq: "YEARLY" },
["rrule", {}, "recur", { byday: "-1SU", bymonth: 10, freq: "YEARLY" }] ],
], []] ],
[],
],
[
"standard",
[
["tzoffsetfrom", {}, "utc-offset", "+02:00"],
["tzoffsetto", {}, "utc-offset", "+01:00"],
["tzname", {}, "text", "CET"],
["dtstart", {}, "date-time", "1970-10-25T03:00:00"],
[
"rrule",
{},
"recur",
{ byday: "-1SU", bymonth: 10, freq: "YEARLY" },
],
],
[],
],
]) ])
); );
}); });