# HG changeset patch # User Paul Boddie # Date 1442156972 -7200 # Node ID 604e911427a422bd76287654fd0919107135a6ab # Parent 12f55f31c92ea13fdbe691d9b2932577c19a7728 Renamed a template file to conform to the naming scheme. diff -r 12f55f31c92e -r 604e911427a4 tests/templates/event-add-person-recurring.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/templates/event-add-person-recurring.txt Sun Sep 13 17:09:32 2015 +0200 @@ -0,0 +1,35 @@ +Content-Type: multipart/alternative; boundary="===============0047278175==" +MIME-Version: 1.0 +From: paul.boddie@example.com +To: vincent.vole@example.com +Subject: Invitation! + +--===============0047278175== +Content-Type: text/plain; charset="us-ascii" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit + +This message contains an event. + +--===============0047278175== +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Content-Type: text/calendar; charset="us-ascii"; method="ADD" + +BEGIN:VCALENDAR +PRODID:-//imip-agent/test//EN +METHOD:ADD +VERSION:2.0 +BEGIN:VEVENT +ORGANIZER:mailto:paul.boddie@example.com +ATTENDEE;RSVP=TRUE:mailto:vincent.vole@example.com +ATTENDEE;RSVP=TRUE:mailto:paul.boddie@example.com +DTSTAMP:20141009T182400Z +DTSTART;TZID=Europe/Oslo:20150109T100000 +DTEND;TZID=Europe/Oslo:20150109T110000 +SUMMARY:Another event occurrence +UID:event8@example.com +END:VEVENT +END:VCALENDAR + +--===============0047278175==-- diff -r 12f55f31c92e -r 604e911427a4 tests/templates/event-request-person-recurring-add.txt --- a/tests/templates/event-request-person-recurring-add.txt Sun Sep 13 02:58:48 2015 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,35 +0,0 @@ -Content-Type: multipart/alternative; boundary="===============0047278175==" -MIME-Version: 1.0 -From: paul.boddie@example.com -To: vincent.vole@example.com -Subject: Invitation! - ---===============0047278175== -Content-Type: text/plain; charset="us-ascii" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit - -This message contains an event. - ---===============0047278175== -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -Content-Type: text/calendar; charset="us-ascii"; method="ADD" - -BEGIN:VCALENDAR -PRODID:-//imip-agent/test//EN -METHOD:ADD -VERSION:2.0 -BEGIN:VEVENT -ORGANIZER:mailto:paul.boddie@example.com -ATTENDEE;RSVP=TRUE:mailto:vincent.vole@example.com -ATTENDEE;RSVP=TRUE:mailto:paul.boddie@example.com -DTSTAMP:20141009T182400Z -DTSTART;TZID=Europe/Oslo:20150109T100000 -DTEND;TZID=Europe/Oslo:20150109T110000 -SUMMARY:Another event occurrence -UID:event8@example.com -END:VEVENT -END:VCALENDAR - ---===============0047278175==-- diff -r 12f55f31c92e -r 604e911427a4 tests/test_person_invitation_add.sh --- a/tests/test_person_invitation_add.sh Sun Sep 13 02:58:48 2015 +0200 +++ b/tests/test_person_invitation_add.sh Sun Sep 13 17:09:32 2015 +0200 @@ -97,7 +97,7 @@ # Attempt to add an occurrence to the event. -"$OUTGOING_SCRIPT" $ARGS < "$TEMPLATES/event-request-person-recurring-add.txt" 2>> $ERROR +"$OUTGOING_SCRIPT" $ARGS < "$TEMPLATES/event-add-person-recurring.txt" 2>> $ERROR grep -q "^20141212T090000Z${TAB}20141212T100000Z" "$FBSENDERFILE" \ && grep -q "^20150109T090000Z${TAB}20150109T100000Z" "$FBSENDERFILE" \ @@ -106,7 +106,7 @@ # Present the request to the recipient. - "$PERSON_SCRIPT" $ARGS < "$TEMPLATES/event-request-person-recurring-add.txt" 2>> $ERROR \ + "$PERSON_SCRIPT" $ARGS < "$TEMPLATES/event-add-person-recurring.txt" 2>> $ERROR \ | "$SHOWMAIL" \ > out5.tmp