Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorg Ehrke <developer@georgehrke.com>2018-11-15 13:45:47 +0300
committerGeorg Ehrke <developer@georgehrke.com>2018-11-15 15:01:40 +0300
commit2a31d842eaab87274f091f2d012abae0152c27d6 (patch)
tree1a6f10a46e4546fe108182bd6bf38229b229763b
parentd9b5726455b3c418f1f3b020f14e47ed8023fd22 (diff)
fix caldav tests
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
-rw-r--r--apps/dav/tests/travis/caldavtest/tests/CalDAV/sharing-calendars.xml10
-rw-r--r--apps/dav/tests/travis/caldavtest/tests/CardDAV/sharing-addressbooks.xml26
2 files changed, 18 insertions, 18 deletions
diff --git a/apps/dav/tests/travis/caldavtest/tests/CalDAV/sharing-calendars.xml b/apps/dav/tests/travis/caldavtest/tests/CalDAV/sharing-calendars.xml
index 334fa561aec..6c15a793226 100644
--- a/apps/dav/tests/travis/caldavtest/tests/CalDAV/sharing-calendars.xml
+++ b/apps/dav/tests/travis/caldavtest/tests/CalDAV/sharing-calendars.xml
@@ -73,7 +73,7 @@
<description>Shared calendar exists</description>
<request user="$userid2:" pswd="$pswd2:">
<method>PROPFIND</method>
- <ruri>$calendarhome1:/shared/</ruri>
+ <ruri>$calendarhome2:/shared_shared_by_user01/</ruri>
<header>
<name>Depth</name>
<value>0</value>
@@ -193,7 +193,7 @@
<description>Sharee creates event</description>
<request user="$userid2:" pswd="$pswd2:">
<method>PUT</method>
- <ruri>$calendarhome1:/shared/1.ics</ruri>
+ <ruri>$calendarhome2:/shared_shared_by_user01/1.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/CalDAV/sharing/calendars/read-write/5.ics</filepath>
@@ -235,7 +235,7 @@
<description>Sharee sees changed event</description>
<request user="$userid2:" pswd="$pswd2:">
<method>GET</method>
- <ruri>$calendarhome1:/shared/1.ics</ruri>
+ <ruri>$calendarhome2:/shared_shared_by_user01/1.ics</ruri>
<verify>
<callback>calendarDataMatch</callback>
<arg>
@@ -263,7 +263,7 @@
<description>Sharee sees new event</description>
<request user="$userid2:" pswd="$pswd2:">
<method>GET</method>
- <ruri>$calendarhome1:/shared/2.ics</ruri>
+ <ruri>$calendarhome2:/shared_shared_by_user01/2.ics</ruri>
<verify>
<callback>calendarDataMatch</callback>
<arg>
@@ -277,7 +277,7 @@
<description>Sharee changes event</description>
<request user="$userid2:" pswd="$pswd2:">
<method>PUT</method>
- <ruri>$calendarhome1:/shared/2.ics</ruri>
+ <ruri>$calendarhome2:/shared_shared_by_user01/2.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/CalDAV/sharing/calendars/read-write/8.ics</filepath>
diff --git a/apps/dav/tests/travis/caldavtest/tests/CardDAV/sharing-addressbooks.xml b/apps/dav/tests/travis/caldavtest/tests/CardDAV/sharing-addressbooks.xml
index 84ee6265017..99e40f5c68c 100644
--- a/apps/dav/tests/travis/caldavtest/tests/CardDAV/sharing-addressbooks.xml
+++ b/apps/dav/tests/travis/caldavtest/tests/CardDAV/sharing-addressbooks.xml
@@ -17,7 +17,7 @@
<description>POST invitation</description>
<request>
<method>POST</method>
- <ruri>$addressbookpath1:</ruri>
+ <ruri>$addressbookhome1:/addressbook/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/CardDAV/sharing/read-write/1.xml</filepath>
@@ -31,7 +31,7 @@
<description>Shared addressbook exists</description>
<request user="$userid2:" pswd="$pswd2:">
<method>PROPFIND</method>
- <ruri>$addressbookpath1:/</ruri>
+ <ruri>$addressbookhome2:/addressbook_shared_by_user01/</ruri>
<header>
<name>Depth</name>
<value>0</value>
@@ -62,7 +62,7 @@
</test>
<test name='4a'>
- <description>Shared calendar exists Depth:1</description>
+ <description>Shared addressbook exists Depth:1</description>
<request user="$userid2:" pswd="$pswd2:">
<method>PROPFIND</method>
<ruri>$addressbookhome2:/</ruri>
@@ -100,7 +100,7 @@
</test>
<test name='5'>
- <description>Original calendar unchanged</description>
+ <description>Original addressbook unchanged</description>
<request>
<method>PROPFIND</method>
<ruri>$addressbookpath1:</ruri>
@@ -126,7 +126,7 @@
<description>Sharee creates contact</description>
<request user="$userid2:" pswd="$pswd2:">
<method>PUT</method>
- <ruri>$addressbookpath1:/1.vcf</ruri>
+ <ruri>$addressbookhome2:/addressbook_shared_by_user01/1.vcf</ruri>
<data>
<content-type>text/vcard; charset=utf-8</content-type>
<filepath>Resource/CardDAV/sharing/read-write/6.vcf</filepath>
@@ -171,7 +171,7 @@
<description>Sharee sees changed contact</description>
<request user="$userid2:" pswd="$pswd2:">
<method>GET</method>
- <ruri>$addressbookpath1:/1.vcf</ruri>
+ <ruri>$addressbookhome2:/addressbook_shared_by_user01/1.vcf</ruri>
<verify>
<callback>addressDataMatch</callback>
<arg>
@@ -183,7 +183,7 @@
</test>
<test name='10'>
- <description>Sharer creates event</description>
+ <description>Sharer creates contact</description>
<request>
<method>PUT</method>
<ruri>$addressbookpath1:/2.vcf</ruri>
@@ -197,10 +197,10 @@
</request>
</test>
<test name='11'>
- <description>Sharee sees new event</description>
+ <description>Sharee sees new contact</description>
<request user="$userid2:" pswd="$pswd2:">
<method>GET</method>
- <ruri>$addressbookpath1:/2.vcf</ruri>
+ <ruri>$addressbookhome2:/addressbook_shared_by_user01/2.vcf</ruri>
<verify>
<callback>addressDataMatch</callback>
<arg>
@@ -211,10 +211,10 @@
</request>
</test>
<test name='12'>
- <description>Sharee changes event</description>
+ <description>Sharee changes contact</description>
<request user="$userid2:" pswd="$pswd2:">
<method>PUT</method>
- <ruri>$addressbookpath1:/2.vcf</ruri>
+ <ruri>$addressbookhome2:/addressbook_shared_by_user01/2.vcf</ruri>
<data>
<content-type>text/vcard; charset=utf-8</content-type>
<filepath>Resource/CardDAV/sharing/read-write/9.vcf</filepath>
@@ -225,7 +225,7 @@
</request>
</test>
<test name='13'>
- <description>Sharer sees changed event</description>
+ <description>Sharer sees changed contact</description>
<request>
<method>GET</method>
<ruri>$addressbookpath1:/2.vcf</ruri>
@@ -281,7 +281,7 @@
</verify> </request>
</test>
<test name='16'>
- <description>Shared calendar no longer exists Depth:1</description>
+ <description>Shared addressbook no longer exists Depth:1</description>
<request user="$userid2:" pswd="$pswd2:">
<method>PROPFIND</method>
<ruri>$addressbookhome2:</ruri>