improve test, change icalendar recurring null-end-date behavior. fixes …

…#6190. further fixes #6139

CHANGELOG.md

@@ -2,12 +2,17 @@
 v5.5.2
 ------
 
+- fix: icalendar recurring events ignoring count rule (#6190)
+- fix: icalendar recurring timed-events with wrong times (#6139)
 - fix: removed accidental ical.js dependency in common's package.json (#6171)
 - fix: for gcal events, restore extendedProperties (#5083)
 - fix: for gcal events, make attachments available (#5024)
 - fix: can't parse rrule strings with newlines after UNTIL statements (#6126)
 - locale: fixed typos in Tamil (#6115)
 - locale: added Bengali (#6096)
+- breaking-change: for icalendar recurring event that don't specify dtend/duration,
+    the resulting Event object's end is now determined by forceEventDuration, defaultTimedEventDuration,
+    and defaultAllDayEventDuration, whereas previously it was *sometimes* null.
 
 
 v5.5.1 (2021-01-16)

packages/__tests__/src/icalendar/data/recurringWeeklyWithoutEnd.ts

@@ -0,0 +1,22 @@
+export default `BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+METHOD:PUBLISH
+X-WR-CALNAME:events@fullcalendar.test
+X-WR-TIMEZONE:Europe/Paris
+BEGIN:VEVENT
+DTSTART;TZID=Europe/Zurich:20190401T173000
+RRULE:FREQ=WEEKLY;WKST=MO;BYDAY=MO
+DTSTAMP:20201006T124223Z
+ORGANIZER;CN=Testy McTestface:mailto:test@fullcalendar.test
+UID:12345678
+CREATED:20181210T150458Z
+DESCRIPTION:
+LAST-MODIFIED:20190508T170523Z
+LOCATION:
+SEQUENCE:0
+STATUS:CONFIRMED
+SUMMARY:Weekly Monday meeting
+TRANSP:OPAQUE
+END:VEVENT
+END:VCALENDAR`

packages/__tests__/src/icalendar/day-view.ts

@@ -3,7 +3,7 @@ import timeGridPlugin from '@fullcalendar/timegrid'
 import { EventSourceInput } from '@fullcalendar/core'
 import iCalendarPlugin from '@fullcalendar/icalendar'
 import oneHourMeeting from './data/oneHourMeeting'
-import recurringWeeklyMeeting from './data/recurringWeeklyMeeting'
+import recurringWeekly from './data/recurringWeekly'
 import mungedOneHourMeeting from './data/mungedOneHourMeeting'
 import meetingWithMungedStart from './data/meetingWithMungedStart'
 import alldayEvent from './data/alldayEvent'
@@ -35,7 +35,7 @@ describe('addICalEventSource with day view', () => {
   })
 
   it('adds a repeating weekly meeting', (done) => {
-    loadICalendarWith(recurringWeeklyMeeting, () => {
+    loadICalendarWith(recurringWeekly, () => {
       setTimeout(() => {
         assertEventCount(1)
         done()
@@ -98,7 +98,7 @@ describe('addICalEventSource with day view', () => {
         setTimeout(() => {
           assertEventCount(1)
           const event = currentCalendar.getEvents()[0]
-          expect(event.end).toBeNull()
+          expect(event.end).toBe(null)
           done()
         }, 100)
       },

packages/__tests__/src/icalendar/month-view.ts

@@ -8,7 +8,8 @@ import multidayEvent from './data/multidayEvent'
 import multipleMultidayEvents from './data/multipleMultidayEvents'
 import multipleEventsOneMunged from './data/multipleEventsOneMunged'
 import oneHourMeeting from './data/oneHourMeeting'
-import recurringWeeklyMeeting from './data/recurringWeeklyMeeting'
+import recurringWeekly from './data/recurringWeekly'
+import recurringWeeklyWithoutEnd from './data/recurringWeeklyWithoutEnd'
 import recurringWeeklyWithCount from './data/recurringWeeklyWithCount'
 import mungedOneHourMeeting from './data/mungedOneHourMeeting'
 
@@ -27,8 +28,10 @@ describe('addICalEventSource with month view', () => {
   it('adds an all day event', (done) => {
     loadICalendarWith(alldayEvent, () => {
       setTimeout(() => {
+        let events = currentCalendar.getEvents()
+        expect(events[0].end).toBe(null)
+        events.forEach((event) => expect(event.allDay).toBeTruthy())
         assertEventCount(1)
-        currentCalendar.getEvents().forEach((event) => expect(event.allDay).toBeTruthy())
         done()
       }, 100)
     })
@@ -68,10 +71,23 @@ describe('addICalEventSource with month view', () => {
   })
 
   it('adds a repeating weekly meeting', (done) => {
-    loadICalendarWith(recurringWeeklyMeeting, () => {
+    loadICalendarWith(recurringWeekly, () => {
+      setTimeout(() => {
+        let events = currentCalendar.getEvents()
+        expect(events[0].start).toEqualDate('2019-04-01T17:30:00')
+        expect(events[0].end).toEqualDate('2019-04-01T18:30:00')
+        assertEventCount(6)
+        done()
+      }, 100)
+    })
+  })
+
+  it('adds a repeating weekly meeting, with null end', (done) => {
+    loadICalendarWith(recurringWeeklyWithoutEnd, () => {
       setTimeout(() => {
         let events = currentCalendar.getEvents()
         expect(events[0].start).toEqualDate('2019-04-01T17:30:00')
+        expect(events[0].end).toBe(null)
         assertEventCount(6)
         done()
       }, 100)
@@ -108,14 +124,14 @@ describe('addICalEventSource with month view', () => {
     })
   })
 
-  it('defaultAllDayEventDuration does not override ical default all day length of one day', (done) => {
+  it('defaultAllDayEventDuration overrides ical default all day length of one day', (done) => {
     loadICalendarWith(
       alldayEvent,
       () => {
         setTimeout(() => {
           assertEventCount(1)
           const event = currentCalendar.getEvents()[0]
-          expect(event.end.getDate()).toEqual(event.start.getDate() + 1)
+          expect(event.end.getDate()).toEqual(event.start.getDate() + 2)
           done()
         }, 100)
       },

packages/icalendar/src/main.ts

@@ -172,9 +172,10 @@ function expandRecurringEvent(iCalEvent: ICAL.Event, range: DateRange): EventInp
   while ((startDateTime = expansion.next())) { // will start expanding ALL occurences
     let startDate = startDateTime.toJSDate()
     let endDate: DateMarker | null = null
+    let endDateTime: ICAL.Time | null = null
 
     if (hasDuration) {
-      let endDateTime = startDateTime.clone()
+      endDateTime = startDateTime.clone()
       endDateTime.addDuration(iCalEvent.duration)
       endDate = endDateTime.toJSDate()
     }
@@ -185,7 +186,7 @@ function expandRecurringEvent(iCalEvent: ICAL.Event, range: DateRange): EventInp
       eventInputs.push({
         title: iCalEvent.summary,
         start: startDateTime.toString(),
-        end: endDate,
+        end: endDateTime ? endDateTime.toString() : null,
       })
     }
   }
@@ -194,7 +195,8 @@ function expandRecurringEvent(iCalEvent: ICAL.Event, range: DateRange): EventInp
 }
 
 function specifiesEnd(iCalEvent: ICAL.Event) {
-  return Boolean(iCalEvent.component.getFirstProperty('dtend'))
+  return Boolean(iCalEvent.component.getFirstProperty('dtend')) ||
+    Boolean(iCalEvent.component.getFirstProperty('duration'))
 }
 
 export default createPlugin({