Merge branch '2013.10' into 2014.11
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 16 Mar 2016 16:16:58 +0000 (17:16 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 16 Mar 2016 16:16:58 +0000 (17:16 +0100)
1  2 
tests/tine20/Calendar/Convert/Event/VCalendar/MacOSXTest.php

@@@ -117,16 -117,6 +117,16 @@@ 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');
  
          $this->assertEquals('FREQ=YEARLY;INTERVAL=1;UNTIL=2016-09-17 22:00:00', $event->rrule);
      }
+     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');
+     }
  }