Merge branch '2013.10' into 2014.11
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 22 Sep 2015 13:25:05 +0000 (15:25 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 22 Sep 2015 13:25:05 +0000 (15:25 +0200)
Conflicts:
tests/tine20/Calendar/Convert/Event/VCalendar/MacOSXTest.php

Change-Id: I19bca261578d8c7af1149c2e4e5d494875805414

1  2 
tests/tine20/Calendar/Convert/Event/VCalendar/MacOSXTest.php
tine20/Calendar/Convert/Event/VCalendar/MacOSX.php

@@@ -117,13 -117,13 +117,23 @@@ class Calendar_Convert_Event_VCalendar_
          $this->assertEquals('2015-04-27 22:00:00', $updateEvent2->rrule_until);
      }
  
 +    public function testConvertToTine20ModelYosemite()
 +    {
 +        $converter = Calendar_Convert_Event_VCalendar_Factory::factory(Calendar_Convert_Event_VCalendar_Factory::CLIENT_MACOSX, '10.10.4');
 +
 +        $vcalendarStream = fopen(dirname(__FILE__) . '/../../../Import/files/apple_calendar_yosemite_attendee.ics', 'r');
 +        $event = $converter->toTine20Model($vcalendarStream);
 +
 +        $this->assertCount(2, $event->attendee, 'CHAIR should be skipped, Attendee should be recognised');
 +    }
++
+     public function testConvertToTine20ModelYosemiteRecurringAllDayWithUntil()
+     {
+         $converter = Calendar_Convert_Event_VCalendar_Factory::factory(Calendar_Convert_Event_VCalendar_Factory::CLIENT_MACOSX, '10.10.5');
+         $vcalendarStream = fopen(dirname(__FILE__) . '/../../../Import/files/apple_calendar_10.10_birthday02-PUT-quit-old.ics', 'r');
+         $event = $converter->toTine20Model($vcalendarStream);
+         $this->assertEquals('FREQ=YEARLY;INTERVAL=1;UNTIL=2016-09-17 22:00:00', $event->rrule);
+     }
  }