Merge branch '2013.03' into 2013.10
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 4 Nov 2013 11:29:15 +0000 (12:29 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 4 Nov 2013 11:29:15 +0000 (12:29 +0100)
Conflicts:
tests/tine20/Calendar/Frontend/CalDAVTest.php

1  2 
tests/tine20/Calendar/Frontend/CalDAVTest.php
tine20/Addressbook/Convert/Contact/VCard/MacOSX.php

@@@ -74,7 -65,17 +74,8 @@@ class Calendar_Frontend_CalDAVTest exte
       */
      protected function tearDown()
      {
 -        foreach ($this->objects['containerToDelete'] as $containerId) {
 -            $containerId = $containerId instanceof Tinebase_Model_Container ? $containerId->getId() : $containerId;
 -            
 -            try {
 -                Tinebase_Container::getInstance()->deleteContainer($containerId);
 -            } catch (Tinebase_Exception_NotFound $tenf) {
 -                // do nothing
 -            }
 -        }
          Tinebase_TransactionManager::getInstance()->rollBack();
+         $_SERVER['HTTP_USER_AGENT'] = '';
      }
      
      /**
       */
      public function testGetTasksChild()
      {
 +        $collection = new Calendar_Frontend_CalDAV();
 +        $children = $this->testGetChildren();
 +        
 +        $taskContainer = array_reduce($children, function($result, $container){
 +            return $container instanceof Tasks_Frontend_WebDAV_Container ? $container : NULL;
 +        }, NULL);
 +        $child = $collection->getChild($taskContainer->getName());
 +    
 +        $this->assertTrue($child instanceof Tasks_Frontend_WebDAV_Container);
 +    }
 +    
 +    /**
++     * test testGetTasksChild (Mac_OS_X)
++     */
++    public function testGetTasksChildMacOSX()
++    {
+         $_SERVER['HTTP_USER_AGENT'] = 'Mac_OS_X/10.9 (13A603) CalendarAgent/174';
+         
+         $collection = new Calendar_Frontend_CalDAV();
+         $children = $this->testGetChildren();
+     }
+     
++    /**
 +     * test to a create file. this should not be possible at this level
 +     */
      public function testCreateFile()
      {
          $collection = new Calendar_Frontend_CalDAV();