[CalendarServer-changes] [15184] CalDAVTester/trunk

source_changes at macosforge.org source_changes at macosforge.org
Tue Oct 13 10:54:20 PDT 2015


Revision: 15184
          http://trac.calendarserver.org//changeset/15184
Author:   cdaboo at apple.com
Date:     2015-10-13 10:54:20 -0700 (Tue, 13 Oct 2015)
Log Message:
-----------
Test missing attachment error when attendee shares their invite back to the organizer.

Modified Paths:
--------------
    CalDAVTester/trunk/scripts/tests/CalDAV/managed-attachments-sharing.xml

Added Paths:
-----------
    CalDAVTester/trunk/Resource/CalDAV/managedattachments/sharer_attendee/
    CalDAVTester/trunk/Resource/CalDAV/managedattachments/sharer_attendee/1.ics
    CalDAVTester/trunk/Resource/CalDAV/managedattachments/sharer_attendee/2.txt

Added: CalDAVTester/trunk/Resource/CalDAV/managedattachments/sharer_attendee/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/managedattachments/sharer_attendee/1.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/managedattachments/sharer_attendee/1.ics	2015-10-13 17:54:20 UTC (rev 15184)
@@ -0,0 +1,14 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//Example Inc.//Example Calendar//EN
+BEGIN:VEVENT
+UID:put-1 at example.com
+DTSTART:$now.year.1:0101T120000Z
+DURATION:P1DT
+DTSTAMP:20051222T205953Z
+SUMMARY:event 1
+ORGANIZER;CN=$username2::$cuaddr2:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED:$cuaddr2:
+ATTENDEE;CN=$username1:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr1:
+END:VEVENT
+END:VCALENDAR

Added: CalDAVTester/trunk/Resource/CalDAV/managedattachments/sharer_attendee/2.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/managedattachments/sharer_attendee/2.txt	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/managedattachments/sharer_attendee/2.txt	2015-10-13 17:54:20 UTC (rev 15184)
@@ -0,0 +1,3 @@
+This is a text file being used
+as a test of managed attachment
+support in calendarserver.

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/managed-attachments-sharing.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/managed-attachments-sharing.xml	2015-10-13 17:17:59 UTC (rev 15183)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/managed-attachments-sharing.xml	2015-10-13 17:54:20 UTC (rev 15184)
@@ -1711,6 +1711,177 @@
 		</test>
 	</test-suite>
 
+	<test-suite name='Sharer as attendee'>
+		<test name='1' ignore='no'>
+			<description>New calendar created after shared calendar</description>
+			<request user="$userid2:" pswd="$pswd2:">
+				<method>MKCALENDAR</method>
+				<ruri>$calendarhome2:/newcalendar/</ruri>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+		</test>
+		<test name='2'>
+			<description>PUT invite</description>
+			<request user="$userid2:" pswd="$pswd2:" end-delete='no'>
+				<method>PUT</method>
+				<ruri>$calendarhome2:/newcalendar/1.ics</ruri>
+				<data>
+					<content-type>text/calendar; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/managedattachments/sharer_attendee/1.ics</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+			<request>
+				<method>WAITDELETEALL 1</method>
+				<ruri>$inboxpath1:/</ruri>
+			</request>
+		</test>
+		<test name='3'>
+			<description>Sharer MOVE to shared calendar</description>
+			<request>
+				<method>GETNEW</method>
+				<ruri>$calendarpath1:/</ruri>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+			<request>
+				<method>MOVE</method>
+				<ruri>$</ruri>
+				<header>
+					<name>Destination</name>
+					<value>$host:$calendarhome1:/shared/move1.ics</value>
+				</header>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+		</test>
+		<test name='4' ignore='no'>
+			<description>Owner add attachment</description>
+			<request user="$userid2:" pswd="$pswd2:">
+				<method>POST</method>
+				<ruri>$calendarhome2:/newcalendar/1.ics?action=attachment-add</ruri>
+				<header>
+					<name>Content-Disposition</name>
+					<value>attachment;filename=test.txt</value>
+				</header>
+				<header>
+					<name>Prefer</name>
+					<value>return=representation</value>
+				</header>
+				<data>
+					<content-type>text/plain</content-type>
+					<filepath>Resource/CalDAV/managedattachments/sharer_attendee/2.txt</filepath>
+				</data>
+				<verify>
+					<callback>dataString</callback>
+					<arg>
+						<name>unwrap</name>
+						<value/>
+					</arg>
+					<arg>
+						<name>contains</name>
+						<value>ATTACH</value>
+					</arg>
+				</verify>
+				<verify>
+					<callback>header</callback>
+					<arg>
+						<name>header</name>
+						<value>Cal-Managed-ID</value>
+					</arg>
+				</verify>
+				<grabheader>
+					<name>Location</name>
+					<variable>$location:</variable>
+				</grabheader>
+				<grabheader>
+					<name>Cal-Managed-ID</name>
+					<variable>$managed-id:</variable>
+				</grabheader>
+			</request>
+			<request>
+				<method>WAITDELETEALL 1</method>
+				<ruri>$inboxpath1:/</ruri>
+			</request>
+		</test>
+		<test name='5'>
+			<description>Only one dropbox item</description>
+			<request user="$userid2:" pswd="$pswd2:">
+				<method>PROPFIND</method>
+				<ruri>$dropboxpath2:/</ruri>
+				<header>
+					<name>Depth</name>
+					<value>1</value>
+				</header>
+				<data>
+					<content-type>application/xml; charset=utf-8</content-type>
+					<filepath>Resource/Common/PROPFIND/count.xml</filepath>
+				</data>
+				<verify>
+					<callback>propfindItems</callback>
+					<arg>
+						<name>count</name>
+						<value>2</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='6'>
+			<description>Check for attachment - owner</description>
+			<request user="$userid2:" pswd="$pswd2:">
+				<method>GET</method>
+				<ruri>$location:</ruri>
+				<verify>
+					<callback>dataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CalDAV/managedattachments/simple/2.txt</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='7'>
+			<description>Check for attachment - attendee</description>
+			<request>
+				<method>GET</method>
+				<ruri>$location:</ruri>
+				<verify>
+					<callback>dataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CalDAV/managedattachments/simple/2.txt</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='-1' ignore='no'>
+			<description>Clean-up</description>
+			<request user="$userid2:" pswd="$pswd2:">
+				<method>DELETEALL</method>
+				<ruri>$calendarhome2:/newcalendar/</ruri>
+				<ruri>$inboxpath2:/</ruri>
+			</request>
+			<request user="$userid2:" pswd="$pswd2:">
+				<method>DELETE</method>
+				<ruri>$calendarhome2:/newcalendar/</ruri>
+			</request>
+			<request>
+				<method>WAITDELETEALL 1</method>
+				<ruri>$inboxpath1:/</ruri>
+			</request>
+			<request>
+				<method>DELETEALL</method>
+				<ruri>$calendarpath1:/</ruri>
+			</request>
+		</test>
+	</test-suite>
+
 	<end>
 		<request user="$useradmin:" pswd="$pswdadmin:">
 			<method>DELETEALL</method>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20151013/956b3f9a/attachment-0001.html>


More information about the calendarserver-changes mailing list