Merge branch '2013.10' into 2014.11
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 25 Aug 2015 16:12:08 +0000 (18:12 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 25 Aug 2015 16:12:08 +0000 (18:12 +0200)
1  2 
tests/tine20/Calendar/Controller/RecurTest.php
tests/tine20/Calendar/Convert/Event/VCalendar/MacOSXTest.php
tine20/Calendar/Model/Event.php

@@@ -114,16 -114,6 +114,16 @@@ class Calendar_Convert_Event_VCalendar_
          $updateEvent2 = $converter->toTine20Model($vcalendarStream2, $eventWithExdateOnBaseEvent);
  
          $this->assertEquals(1, count($updateEvent2->exdate), print_r($updateEvent2->toArray(), true));
-         $this->assertEquals('2015-04-27 21:59:59', $updateEvent2->rrule_until);
+         $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');
 +    }
  }
Simple merge