Fix principal collection for CavDAVTester

diff --git a/apps/dav/lib/rootcollection.php b/apps/dav/lib/rootcollection.php
index c0a37a1de9d914207a53fcd0961fa858b5993e15..3e349fa31c91b03ef112d593983860dfff21ccbc 100644 (file)
--- a/apps/dav/lib/rootcollection.php
+++ b/apps/dav/lib/rootcollection.php
@@ -28,12 +28,12 @@ class RootCollection extends SimpleCollection {
                $filesCollection = new Files\RootCollection($principalBackend, 'principals/users');
                $filesCollection->disableListing = $disableListing;
                $caldavBackend = new CalDavBackend($db);
-               $calendarRoot = new CalendarRoot($principalBackend, $caldavBackend);
+               $calendarRoot = new CalendarRoot($principalBackend, $caldavBackend, 'principals/users');
                $calendarRoot->disableListing = $disableListing;
 
                $cardDavBackend = new CardDavBackend(\OC::$server->getDatabaseConnection(), $principalBackend);
 
-               $addressBookRoot = new AddressBookRoot($principalBackend, $cardDavBackend);
+               $addressBookRoot = new AddressBookRoot($principalBackend, $cardDavBackend, 'principals/users');
                $addressBookRoot->disableListing = $disableListing;
 
                $children = [

diff --git a/apps/dav/tests/travis/caldavtest/config/serverinfo.xml b/apps/dav/tests/travis/caldavtest/config/serverinfo.xml
index 24d63d4a3ae4481437cf4a1cf084469c91a39cab..a474bb7135c61f0687f23efdea5ce0024595b85e 100644 (file)
--- a/apps/dav/tests/travis/caldavtest/config/serverinfo.xml
+++ b/apps/dav/tests/travis/caldavtest/config/serverinfo.xml
@@ -180,7 +180,7 @@
                <!-- relative path to main principal collection-->
                <substitution>
                        <key>$principalcollection:</key>
-                       <value>$root:principals/</value>
+                       <value>$root:principals/users/</value>
                </substitution>
 
                <!-- the core recored type collections-->