nikdoof/rustical
1
1
Fork 0
mirror of https://github.com/lennart-k/rustical.git synced 2026-01-30 18:58:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

small changes to regression tests and xml namespaces

Browse Source
This commit is contained in:
Lennart
2025-12-31 01:43:03 +01:00
parent 9fc099f6f4
commit cf31a51965
16 changed files with 337 additions and 344 deletions
Download Patch File Download Diff File Expand all files Collapse all files

199
crates/caldav/src/calendar/snapshots/rustical_caldav__calendar__tests__propfind-2.snap Normal file
View File

@@ -0,0 +1,199 @@
---
source: crates/caldav/src/calendar/tests.rs
expression: output
---
<?xml version="1.0" encoding="utf-8"?>
<response xmlns="DAV:">
<href>/caldav/principal/user/calendar/</href>
<propstat>
<prop xmlns="DAV:">
<calendar-timezone xmlns="urn:ietf:params:xml:ns:caldav">BEGIN:VCALENDAR
PRODID:-//github.com/lennart-k/vzic-rs//RustiCal Calendar server//EN
VERSION:2.0
BEGIN:VTIMEZONE
TZID:Europe/Berlin
LAST-MODIFIED:20250723T190331Z
X-LIC-LOCATION:Europe/Berlin
X-PROLEPTIC-TZNAME:LMT
BEGIN:STANDARD
TZNAME:CET
TZOFFSETFROM:+005328
TZOFFSETTO:+0100
DTSTART:18930401T000000
END:STANDARD
BEGIN:DAYLIGHT
TZNAME:CEST
TZOFFSETFROM:+0100
TZOFFSETTO:+0200
DTSTART:19160430T230000
RDATE:19400401T020000
RDATE:19430329T020000
RDATE:19460414T020000
RDATE:19470406T030000
RDATE:19480418T020000
RDATE:19490410T020000
RDATE:19800406T020000
END:DAYLIGHT
BEGIN:STANDARD
TZNAME:CET
TZOFFSETFROM:+0200
TZOFFSETTO:+0100
DTSTART:19161001T010000
RDATE:19421102T030000
RDATE:19431004T030000
RDATE:19441002T030000
RDATE:19451118T030000
RDATE:19461007T030000
END:STANDARD
BEGIN:DAYLIGHT
TZNAME:CEST
TZOFFSETFROM:+0100
TZOFFSETTO:+0200
DTSTART:19170416T020000
RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=3MO;UNTIL=19180415T010000Z
END:DAYLIGHT
BEGIN:STANDARD
TZNAME:CET
TZOFFSETFROM:+0200
TZOFFSETTO:+0100
DTSTART:19170917T030000
RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=3MO;UNTIL=19180916T010000Z
END:STANDARD
BEGIN:DAYLIGHT
TZNAME:CEST
TZOFFSETFROM:+0100
TZOFFSETTO:+0200
DTSTART:19440403T020000
RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1MO;UNTIL=19450402T010000Z
END:DAYLIGHT
BEGIN:DAYLIGHT
TZNAME:CEMT
TZOFFSETFROM:+0200
TZOFFSETTO:+0300
DTSTART:19450524T020000
RDATE:19470511T030000
END:DAYLIGHT
BEGIN:DAYLIGHT
TZNAME:CEST
TZOFFSETFROM:+0300
TZOFFSETTO:+0200
DTSTART:19450924T030000
RDATE:19470629T030000
END:DAYLIGHT
BEGIN:STANDARD
TZNAME:CET
TZOFFSETFROM:+0100
TZOFFSETTO:+0100
DTSTART:19460101T000000
RDATE:19800101T000000
END:STANDARD
BEGIN:STANDARD
TZNAME:CET
TZOFFSETFROM:+0200
TZOFFSETTO:+0100
DTSTART:19471005T030000
RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=19491002T010000Z
END:STANDARD
BEGIN:STANDARD
TZNAME:CET
TZOFFSETFROM:+0200
TZOFFSETTO:+0100
DTSTART:19800928T030000
RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950924T010000Z
END:STANDARD
BEGIN:DAYLIGHT
TZNAME:CEST
TZOFFSETFROM:+0100
TZOFFSETTO:+0200
DTSTART:19810329T020000
RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
END:DAYLIGHT
BEGIN:STANDARD
TZNAME:CET
TZOFFSETFROM:+0200
TZOFFSETTO:+0100
DTSTART:19961027T030000
RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
END:STANDARD
END:VTIMEZONE
END:VCALENDAR
</calendar-timezone>
<timezone-service-set xmlns="urn:ietf:params:xml:ns:caldav">
<href xmlns="DAV:">https://www.iana.org/time-zones</href>
</timezone-service-set>
<calendar-timezone-id xmlns="urn:ietf:params:xml:ns:caldav">Europe/Berlin</calendar-timezone-id>
<calendar-order xmlns="http://apple.com/ns/ical/">0</calendar-order>
<supported-calendar-component-set xmlns="urn:ietf:params:xml:ns:caldav">
<comp xmlns="urn:ietf:params:xml:ns:caldav" name="VEVENT"/>
<comp xmlns="urn:ietf:params:xml:ns:caldav" name="VTODO"/>
</supported-calendar-component-set>
<supported-calendar-data xmlns="urn:ietf:params:xml:ns:caldav">
<calendar-data xmlns="urn:ietf:params:xml:ns:caldav" content-type="text/calendar" version="2.0"/>
</supported-calendar-data>
<supported-collation-set xmlns="urn:ietf:params:xml:ns:caldav">
<supported-collation xmlns="urn:ietf:params:xml:ns:caldav">i;ascii-casemap</supported-collation>
<supported-collation xmlns="urn:ietf:params:xml:ns:caldav">i;octet</supported-collation>
</supported-collation-set>
<max-resource-size xmlns="DAV:">10000000</max-resource-size>
<supported-report-set xmlns="DAV:">
<supported-report xmlns="DAV:">
<report xmlns="DAV:">
<calendar-query xmlns="urn:ietf:params:xml:ns:caldav"/>
</report>
</supported-report>
<supported-report xmlns="DAV:">
<report xmlns="DAV:">
<calendar-multiget xmlns="urn:ietf:params:xml:ns:caldav"/>
</report>
</supported-report>
<supported-report xmlns="DAV:">
<report xmlns="DAV:">
<sync-collection xmlns="DAV:"/>
</report>
</supported-report>
</supported-report-set>
<min-date-time xmlns="urn:ietf:params:xml:ns:caldav">-2621430101T000000Z</min-date-time>
<max-date-time xmlns="urn:ietf:params:xml:ns:caldav">+2621421231T235959Z</max-date-time>
<sync-token xmlns="DAV:">github.com/lennart-k/rustical/ns/12</sync-token>
<getctag xmlns="http://calendarserver.org/ns/">github.com/lennart-k/rustical/ns/12</getctag>
<transports xmlns="https://bitfire.at/webdav-push">
<web-push xmlns="https://bitfire.at/webdav-push"/>
</transports>
<topic xmlns="https://bitfire.at/webdav-push">b28b41e9-8801-4fc5-ae29-8efb5fadeb36</topic>
<supported-triggers xmlns="https://bitfire.at/webdav-push">
<content-update xmlns="https://bitfire.at/webdav-push">
<depth xmlns="DAV:">1</depth>
</content-update>
<property-update xmlns="https://bitfire.at/webdav-push">
<depth xmlns="DAV:">1</depth>
</property-update>
</supported-triggers>
<resourcetype xmlns="DAV:">
<collection xmlns="DAV:"/>
<calendar xmlns="urn:ietf:params:xml:ns:caldav"/>
</resourcetype>
<displayname xmlns="DAV:">Calendar</displayname>
<current-user-principal xmlns="DAV:">
<href xmlns="DAV:">/caldav/principal/user/</href>
</current-user-principal>
<current-user-privilege-set xmlns="DAV:">
<privilege>
<read/>
</privilege>
<privilege>
<write-properties/>
</privilege>
<privilege>
<read-acl/>
</privilege>
<privilege>
<read-current-user-privilege-set/>
</privilege>
</current-user-privilege-set>
<owner xmlns="DAV:">
<href xmlns="DAV:">/caldav/principal/user/</href>
</owner>
</prop>
<status xmlns="DAV:">HTTP/1.1 200 OK</status>
</propstat>
</response>

37
crates/caldav/src/calendar/snapshots/rustical_caldav__calendar__tests__propfind.snap Normal file
View File

@@ -0,0 +1,37 @@
---
source: crates/caldav/src/calendar/tests.rs
expression: output
---
<?xml version="1.0" encoding="utf-8"?>
<response xmlns="DAV:">
<href>/caldav/principal/user/calendar/</href>
<propstat>
<prop xmlns="DAV:">
<calendar-color xmlns="http://apple.com/ns/ical/"/>
<calendar-description xmlns="urn:ietf:params:xml:ns:caldav"/>
<calendar-timezone xmlns="urn:ietf:params:xml:ns:caldav"/>
<timezone-service-set xmlns="urn:ietf:params:xml:ns:caldav"/>
<calendar-timezone-id xmlns="urn:ietf:params:xml:ns:caldav"/>
<calendar-order xmlns="http://apple.com/ns/ical/"/>
<supported-calendar-component-set xmlns="urn:ietf:params:xml:ns:caldav"/>
<supported-calendar-data xmlns="urn:ietf:params:xml:ns:caldav"/>
<supported-collation-set xmlns="urn:ietf:params:xml:ns:caldav"/>
<max-resource-size xmlns="DAV:"/>
<supported-report-set xmlns="DAV:"/>
<source xmlns="http://calendarserver.org/ns/"/>
<min-date-time xmlns="urn:ietf:params:xml:ns:caldav"/>
<max-date-time xmlns="urn:ietf:params:xml:ns:caldav"/>
<sync-token xmlns="DAV:"/>
<getctag xmlns="http://calendarserver.org/ns/"/>
<transports xmlns="https://bitfire.at/webdav-push"/>
<topic xmlns="https://bitfire.at/webdav-push"/>
<supported-triggers xmlns="https://bitfire.at/webdav-push"/>
<resourcetype xmlns="DAV:"/>
<displayname xmlns="DAV:"/>
<current-user-principal xmlns="DAV:"/>
<current-user-privilege-set xmlns="DAV:"/>
<owner xmlns="DAV:"/>
</prop>
<status xmlns="DAV:">HTTP/1.1 200 OK</status>
</propstat>
</response>

230
crates/caldav/src/calendar/test_files/propfind.outputs
View File

@@ -1,230 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<response xmlns="DAV:" xmlns:CAL="urn:ietf:params:xml:ns:caldav" xmlns:CARD="urn:ietf:params:xml:ns:carddav" xmlns:CS="http://calendarserver.org/ns/" xmlns:PUSH="https://bitfire.at/webdav-push">
<href>/caldav/principal/user/calendar/</href>
<propstat>
<prop>
<calendar-color xmlns="http://apple.com/ns/ical/"/>
<calendar-description xmlns="urn:ietf:params:xml:ns:caldav"/>
<calendar-timezone xmlns="urn:ietf:params:xml:ns:caldav"/>
<timezone-service-set xmlns="urn:ietf:params:xml:ns:caldav"/>
<calendar-timezone-id xmlns="urn:ietf:params:xml:ns:caldav"/>
<calendar-order xmlns="http://apple.com/ns/ical/"/>
<supported-calendar-component-set xmlns="urn:ietf:params:xml:ns:caldav"/>
<supported-calendar-data xmlns="urn:ietf:params:xml:ns:caldav"/>
<supported-collation-set xmlns="urn:ietf:params:xml:ns:caldav"/>
<max-resource-size xmlns="DAV:"/>
<supported-report-set xmlns="DAV:"/>
<source xmlns="http://calendarserver.org/ns/"/>
<min-date-time xmlns="urn:ietf:params:xml:ns:caldav"/>
<max-date-time xmlns="urn:ietf:params:xml:ns:caldav"/>
<sync-token xmlns="DAV:"/>
<getctag xmlns="http://calendarserver.org/ns/"/>
<transports xmlns="https://bitfire.at/webdav-push"/>
<topic xmlns="https://bitfire.at/webdav-push"/>
<supported-triggers xmlns="https://bitfire.at/webdav-push"/>
<resourcetype xmlns="DAV:"/>
<displayname xmlns="DAV:"/>
<current-user-principal xmlns="DAV:"/>
<current-user-privilege-set xmlns="DAV:"/>
<owner xmlns="DAV:"/>
</prop>
<status>HTTP/1.1 200 OK</status>
</propstat>
</response>
<?xml version="1.0" encoding="utf-8"?>
<response xmlns="DAV:" xmlns:CAL="urn:ietf:params:xml:ns:caldav" xmlns:CARD="urn:ietf:params:xml:ns:carddav" xmlns:CS="http://calendarserver.org/ns/" xmlns:PUSH="https://bitfire.at/webdav-push">
<href>/caldav/principal/user/calendar/</href>
<propstat>
<prop>
<CAL:calendar-timezone>BEGIN:VCALENDAR
PRODID:-//github.com/lennart-k/vzic-rs//RustiCal Calendar server//EN
VERSION:2.0
BEGIN:VTIMEZONE
TZID:Europe/Berlin
LAST-MODIFIED:20250723T190331Z
X-LIC-LOCATION:Europe/Berlin
X-PROLEPTIC-TZNAME:LMT
BEGIN:STANDARD
TZNAME:CET
TZOFFSETFROM:+005328
TZOFFSETTO:+0100
DTSTART:18930401T000000
END:STANDARD
BEGIN:DAYLIGHT
TZNAME:CEST
TZOFFSETFROM:+0100
TZOFFSETTO:+0200
DTSTART:19160430T230000
RDATE:19400401T020000
RDATE:19430329T020000
RDATE:19460414T020000
RDATE:19470406T030000
RDATE:19480418T020000
RDATE:19490410T020000
RDATE:19800406T020000
END:DAYLIGHT
BEGIN:STANDARD
TZNAME:CET
TZOFFSETFROM:+0200
TZOFFSETTO:+0100
DTSTART:19161001T010000
RDATE:19421102T030000
RDATE:19431004T030000
RDATE:19441002T030000
RDATE:19451118T030000
RDATE:19461007T030000
END:STANDARD
BEGIN:DAYLIGHT
TZNAME:CEST
TZOFFSETFROM:+0100
TZOFFSETTO:+0200
DTSTART:19170416T020000
RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=3MO;UNTIL=19180415T010000Z
END:DAYLIGHT
BEGIN:STANDARD
TZNAME:CET
TZOFFSETFROM:+0200
TZOFFSETTO:+0100
DTSTART:19170917T030000
RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=3MO;UNTIL=19180916T010000Z
END:STANDARD
BEGIN:DAYLIGHT
TZNAME:CEST
TZOFFSETFROM:+0100
TZOFFSETTO:+0200
DTSTART:19440403T020000
RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1MO;UNTIL=19450402T010000Z
END:DAYLIGHT
BEGIN:DAYLIGHT
TZNAME:CEMT
TZOFFSETFROM:+0200
TZOFFSETTO:+0300
DTSTART:19450524T020000
RDATE:19470511T030000
END:DAYLIGHT
BEGIN:DAYLIGHT
TZNAME:CEST
TZOFFSETFROM:+0300
TZOFFSETTO:+0200
DTSTART:19450924T030000
RDATE:19470629T030000
END:DAYLIGHT
BEGIN:STANDARD
TZNAME:CET
TZOFFSETFROM:+0100
TZOFFSETTO:+0100
DTSTART:19460101T000000
RDATE:19800101T000000
END:STANDARD
BEGIN:STANDARD
TZNAME:CET
TZOFFSETFROM:+0200
TZOFFSETTO:+0100
DTSTART:19471005T030000
RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=19491002T010000Z
END:STANDARD
BEGIN:STANDARD
TZNAME:CET
TZOFFSETFROM:+0200
TZOFFSETTO:+0100
DTSTART:19800928T030000
RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950924T010000Z
END:STANDARD
BEGIN:DAYLIGHT
TZNAME:CEST
TZOFFSETFROM:+0100
TZOFFSETTO:+0200
DTSTART:19810329T020000
RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
END:DAYLIGHT
BEGIN:STANDARD
TZNAME:CET
TZOFFSETFROM:+0200
TZOFFSETTO:+0100
DTSTART:19961027T030000
RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
END:STANDARD
END:VTIMEZONE
END:VCALENDAR
</CAL:calendar-timezone>
<CAL:timezone-service-set>
<href>https://www.iana.org/time-zones</href>
</CAL:timezone-service-set>
<CAL:calendar-timezone-id>Europe/Berlin</CAL:calendar-timezone-id>
<calendar-order xmlns="http://apple.com/ns/ical/">0</calendar-order>
<CAL:supported-calendar-component-set>
<CAL:comp name="VEVENT"/>
<CAL:comp name="VTODO"/>
</CAL:supported-calendar-component-set>
<CAL:supported-calendar-data>
<CAL:calendar-data content-type="text/calendar" version="2.0"/>
</CAL:supported-calendar-data>
<CAL:supported-collation-set>
<CAL:supported-collation>i;ascii-casemap</CAL:supported-collation>
<CAL:supported-collation>i;octet</CAL:supported-collation>
</CAL:supported-collation-set>
<max-resource-size>10000000</max-resource-size>
<supported-report-set>
<supported-report>
<report>
<CAL:calendar-query/>
</report>
</supported-report>
<supported-report>
<report>
<CAL:calendar-multiget/>
</report>
</supported-report>
<supported-report>
<report>
<sync-collection/>
</report>
</supported-report>
</supported-report-set>
<CAL:min-date-time>-2621430101T000000Z</CAL:min-date-time>
<CAL:max-date-time>+2621421231T235959Z</CAL:max-date-time>
<sync-token>github.com/lennart-k/rustical/ns/12</sync-token>
<CS:getctag>github.com/lennart-k/rustical/ns/12</CS:getctag>
<PUSH:transports>
<PUSH:web-push/>
</PUSH:transports>
<PUSH:topic>b28b41e9-8801-4fc5-ae29-8efb5fadeb36</PUSH:topic>
<PUSH:supported-triggers>
<PUSH:content-update>
<depth>1</depth>
</PUSH:content-update>
<PUSH:property-update>
<depth>1</depth>
</PUSH:property-update>
</PUSH:supported-triggers>
<resourcetype>
<collection/>
<CAL:calendar/>
</resourcetype>
<displayname>Calendar</displayname>
<current-user-principal>
<href>/caldav/principal/user/</href>
</current-user-principal>
<current-user-privilege-set>
<privilege>
<read/>
</privilege>
<privilege>
<write-properties/>
</privilege>
<privilege>
<read-acl/>
</privilege>
<privilege>
<read-current-user-privilege-set/>
</privilege>
</current-user-privilege-set>
<owner>
<href>/caldav/principal/user/</href>
</owner>
</prop>
<status>HTTP/1.1 200 OK</status>
</propstat>
</response>

10
crates/caldav/src/calendar/tests.rs
View File

@@ -14,14 +14,9 @@ async fn test_propfind() {
from_str(include_str!("./test_files/propfind.principals.json")).unwrap(); from_str(include_str!("./test_files/propfind.principals.json")).unwrap();
let resources: Vec<CalendarResource> = let resources: Vec<CalendarResource> =
from_str(include_str!("./test_files/propfind.resources.json")).unwrap(); from_str(include_str!("./test_files/propfind.resources.json")).unwrap();
let outputs: Vec<_> = include_str!("./test_files/propfind.outputs")
.trim()
.split("\n\n")
.collect();
for principal in principals { for principal in principals {
for ((request, resource), &expected_output) in requests.iter().zip(&resources).zip(&outputs) for (request, resource) in requests.iter().zip(&resources) {
{
let propfind = CalendarResource::parse_propfind(request).unwrap(); let propfind = CalendarResource::parse_propfind(request).unwrap();
let response = resource let response = resource
@@ -33,13 +28,12 @@ async fn test_propfind() {
&principal, &principal,
) )
.unwrap(); .unwrap();
let expected_output = expected_output.trim();
let output = response let output = response
.serialize_to_string() .serialize_to_string()
.unwrap() .unwrap()
.trim() .trim()
.replace("\r\n", "\n"); .replace("\r\n", "\n");
similar_asserts::assert_eq!(expected_output, output); insta::assert_snapshot!(output);
} }
} }
} }

60
crates/caldav/src/principal/snapshots/rustical_caldav__principal__tests__propfind-3.snap
View File

@@ -3,51 +3,51 @@ source: crates/caldav/src/principal/tests.rs
expression: response.serialize_to_string().unwrap() expression: response.serialize_to_string().unwrap()
--- ---
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<response xmlns="DAV:" xmlns:CAL="urn:ietf:params:xml:ns:caldav" xmlns:CARD="urn:ietf:params:xml:ns:carddav" xmlns:CS="http://calendarserver.org/ns/" xmlns:PUSH="https://bitfire.at/webdav-push"> <response xmlns="DAV:">
<href>/caldav/principal/user/</href> <href>/caldav/principal/user/</href>
<propstat> <propstat>
<prop> <prop xmlns="DAV:">
<CAL:calendar-user-type>INDIVIDUAL</CAL:calendar-user-type> <calendar-user-type xmlns="urn:ietf:params:xml:ns:caldav">INDIVIDUAL</calendar-user-type>
<CAL:calendar-user-address-set> <calendar-user-address-set xmlns="urn:ietf:params:xml:ns:caldav">
<href>/caldav/principal/user/</href> <href xmlns="DAV:">/caldav/principal/user/</href>
</CAL:calendar-user-address-set> </calendar-user-address-set>
<principal-URL> <principal-URL xmlns="DAV:">
<href>/caldav/principal/user/</href> <href xmlns="DAV:">/caldav/principal/user/</href>
</principal-URL> </principal-URL>
<group-membership> <group-membership xmlns="DAV:">
<href>/caldav/principal/group/</href> <href xmlns="DAV:">/caldav/principal/group/</href>
</group-membership> </group-membership>
<group-member-set> <group-member-set xmlns="DAV:">
</group-member-set> </group-member-set>
<alternate-URI-set/> <alternate-URI-set xmlns="DAV:"/>
<supported-report-set> <supported-report-set xmlns="DAV:">
<supported-report> <supported-report xmlns="DAV:">
<report> <report xmlns="DAV:">
<principal-match/> <principal-match xmlns="DAV:"/>
</report> </report>
</supported-report> </supported-report>
</supported-report-set> </supported-report-set>
<CAL:calendar-home-set> <calendar-home-set xmlns="urn:ietf:params:xml:ns:caldav">
<href>/caldav/principal/group/</href> <href xmlns="DAV:">/caldav/principal/group/</href>
<href>/caldav/principal/user/</href> <href xmlns="DAV:">/caldav/principal/user/</href>
</CAL:calendar-home-set> </calendar-home-set>
<resourcetype> <resourcetype xmlns="DAV:">
<collection/> <collection xmlns="DAV:"/>
<principal/> <principal xmlns="DAV:"/>
</resourcetype> </resourcetype>
<displayname>user</displayname> <displayname xmlns="DAV:">user</displayname>
<current-user-principal> <current-user-principal xmlns="DAV:">
<href>/caldav/principal/user/</href> <href xmlns="DAV:">/caldav/principal/user/</href>
</current-user-principal> </current-user-principal>
<current-user-privilege-set> <current-user-privilege-set xmlns="DAV:">
<privilege> <privilege>
<all/> <all/>
</privilege> </privilege>
</current-user-privilege-set> </current-user-privilege-set>
<owner> <owner xmlns="DAV:">
<href>/caldav/principal/user/</href> <href xmlns="DAV:">/caldav/principal/user/</href>
</owner> </owner>
</prop> </prop>
<status>HTTP/1.1 200 OK</status> <status xmlns="DAV:">HTTP/1.1 200 OK</status>
</propstat> </propstat>
</response> </response>

74
crates/carddav/src/addressbook/snapshots/rustical_carddav__addressbook__tests__propfind-3.snap
View File

@@ -3,57 +3,57 @@ source: crates/carddav/src/addressbook/tests.rs
expression: response.serialize_to_string().unwrap() expression: response.serialize_to_string().unwrap()
--- ---
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<response xmlns="DAV:" xmlns:CAL="urn:ietf:params:xml:ns:caldav" xmlns:CARD="urn:ietf:params:xml:ns:carddav" xmlns:CS="http://calendarserver.org/ns/" xmlns:PUSH="https://bitfire.at/webdav-push"> <response xmlns="DAV:">
<href>/carddav/principal/user/yeet/</href> <href>/carddav/principal/user/yeet/</href>
<propstat> <propstat>
<prop> <prop xmlns="DAV:">
<CARD:supported-address-data> <supported-address-data xmlns="urn:ietf:params:xml:ns:carddav">
<CARD:address-data-type content-type="text/vcard" version="3.0"/> <address-data-type xmlns="urn:ietf:params:xml:ns:carddav" content-type="text/vcard" version="3.0"/>
<CARD:address-data-type content-type="text/vcard" version="4.0"/> <address-data-type xmlns="urn:ietf:params:xml:ns:carddav" content-type="text/vcard" version="4.0"/>
</CARD:supported-address-data> </supported-address-data>
<supported-report-set> <supported-report-set xmlns="DAV:">
<supported-report> <supported-report xmlns="DAV:">
<report> <report xmlns="DAV:">
<CARD:addressbook-multiget/> <addressbook-multiget xmlns="urn:ietf:params:xml:ns:carddav"/>
</report> </report>
</supported-report> </supported-report>
<supported-report> <supported-report xmlns="DAV:">
<report> <report xmlns="DAV:">
<sync-collection/> <sync-collection xmlns="DAV:"/>
</report> </report>
</supported-report> </supported-report>
</supported-report-set> </supported-report-set>
<max-resource-size>10000000</max-resource-size> <max-resource-size xmlns="DAV:">10000000</max-resource-size>
<sync-token>github.com/lennart-k/rustical/ns/0</sync-token> <sync-token xmlns="DAV:">github.com/lennart-k/rustical/ns/0</sync-token>
<CS:getctag>github.com/lennart-k/rustical/ns/0</CS:getctag> <getctag xmlns="http://calendarserver.org/ns/">github.com/lennart-k/rustical/ns/0</getctag>
<PUSH:transports> <transports xmlns="https://bitfire.at/webdav-push">
<PUSH:web-push/> <web-push xmlns="https://bitfire.at/webdav-push"/>
</PUSH:transports> </transports>
<PUSH:topic>asdasd</PUSH:topic> <topic xmlns="https://bitfire.at/webdav-push">asdasd</topic>
<PUSH:supported-triggers> <supported-triggers xmlns="https://bitfire.at/webdav-push">
<PUSH:content-update> <content-update xmlns="https://bitfire.at/webdav-push">
<depth>1</depth> <depth xmlns="DAV:">1</depth>
</PUSH:content-update> </content-update>
<PUSH:property-update> <property-update xmlns="https://bitfire.at/webdav-push">
<depth>1</depth> <depth xmlns="DAV:">1</depth>
</PUSH:property-update> </property-update>
</PUSH:supported-triggers> </supported-triggers>
<resourcetype> <resourcetype xmlns="DAV:">
<collection/> <collection xmlns="DAV:"/>
<CARD:addressbook/> <addressbook xmlns="urn:ietf:params:xml:ns:carddav"/>
</resourcetype> </resourcetype>
<current-user-principal> <current-user-principal xmlns="DAV:">
<href>/carddav/principal/user/</href> <href xmlns="DAV:">/carddav/principal/user/</href>
</current-user-principal> </current-user-principal>
<current-user-privilege-set> <current-user-privilege-set xmlns="DAV:">
<privilege> <privilege>
<all/> <all/>
</privilege> </privilege>
</current-user-privilege-set> </current-user-privilege-set>
<owner> <owner xmlns="DAV:">
<href>/carddav/principal/user/</href> <href xmlns="DAV:">/carddav/principal/user/</href>
</owner> </owner>
</prop> </prop>
<status>HTTP/1.1 200 OK</status> <status xmlns="DAV:">HTTP/1.1 200 OK</status>
</propstat> </propstat>
</response> </response>

48
crates/carddav/src/principal/snapshots/rustical_carddav__principal__tests__propfind-3.snap
View File

@@ -3,43 +3,43 @@ source: crates/carddav/src/principal/tests.rs
expression: response.serialize_to_string().unwrap() expression: response.serialize_to_string().unwrap()
--- ---
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<response xmlns="DAV:" xmlns:CAL="urn:ietf:params:xml:ns:caldav" xmlns:CARD="urn:ietf:params:xml:ns:carddav" xmlns:CS="http://calendarserver.org/ns/" xmlns:PUSH="https://bitfire.at/webdav-push"> <response xmlns="DAV:">
<href>/carddav/principal/user/</href> <href>/carddav/principal/user/</href>
<propstat> <propstat>
<prop> <prop xmlns="DAV:">
<principal-URL> <principal-URL xmlns="DAV:">
<href>/carddav/principal/user/</href> <href xmlns="DAV:">/carddav/principal/user/</href>
</principal-URL> </principal-URL>
<group-membership> <group-membership xmlns="DAV:">
<href>/carddav/principal/group/</href> <href xmlns="DAV:">/carddav/principal/group/</href>
</group-membership> </group-membership>
<group-member-set> <group-member-set xmlns="DAV:">
</group-member-set> </group-member-set>
<alternate-URI-set/> <alternate-URI-set xmlns="DAV:"/>
<principal-collection-set> <principal-collection-set xmlns="DAV:">
<href>/carddav/principal/</href> <href xmlns="DAV:">/carddav/principal/</href>
</principal-collection-set> </principal-collection-set>
<CARD:addressbook-home-set> <addressbook-home-set xmlns="urn:ietf:params:xml:ns:carddav">
<href>/carddav/principal/group/</href> <href xmlns="DAV:">/carddav/principal/group/</href>
<href>/carddav/principal/user/</href> <href xmlns="DAV:">/carddav/principal/user/</href>
</CARD:addressbook-home-set> </addressbook-home-set>
<resourcetype> <resourcetype xmlns="DAV:">
<collection/> <collection xmlns="DAV:"/>
<principal/> <principal xmlns="DAV:"/>
</resourcetype> </resourcetype>
<displayname>user</displayname> <displayname xmlns="DAV:">user</displayname>
<current-user-principal> <current-user-principal xmlns="DAV:">
<href>/carddav/principal/user/</href> <href xmlns="DAV:">/carddav/principal/user/</href>
</current-user-principal> </current-user-principal>
<current-user-privilege-set> <current-user-privilege-set xmlns="DAV:">
<privilege> <privilege>
<all/> <all/>
</privilege> </privilege>
</current-user-privilege-set> </current-user-privilege-set>
<owner> <owner xmlns="DAV:">
<href>/carddav/principal/user/</href> <href xmlns="DAV:">/carddav/principal/user/</href>
</owner> </owner>
</prop> </prop>
<status>HTTP/1.1 200 OK</status> <status xmlns="DAV:">HTTP/1.1 200 OK</status>
</propstat> </propstat>
</response> </response>

7
crates/dav/src/xml/multistatus.rs
View File

@@ -42,13 +42,6 @@ pub enum PropstatWrapper<T: XmlSerialize> {
// responsedescription?) > // responsedescription?) >
#[derive(XmlSerialize, XmlRootTag, Debug)] #[derive(XmlSerialize, XmlRootTag, Debug)]
#[xml(ns = "crate::namespace::NS_DAV", root = "response")] #[xml(ns = "crate::namespace::NS_DAV", root = "response")]
#[xml(ns_prefix(
crate::namespace::NS_DAV = "",
crate::namespace::NS_CARDDAV = "CARD",
crate::namespace::NS_CALDAV = "CAL",
crate::namespace::NS_CALENDARSERVER = "CS",
crate::namespace::NS_DAVPUSH = "PUSH"
))]
pub struct ResponseElement<PropstatType: XmlSerialize> { pub struct ResponseElement<PropstatType: XmlSerialize> {
pub href: String, pub href: String,
#[xml(serialize_with = "xml_serialize_optional_status")] #[xml(serialize_with = "xml_serialize_optional_status")]

2
src/integration_tests/caldav/snapshots/rustical__integration_tests__caldav__calendar__propfind_body.snap
View File

@@ -4,7 +4,7 @@ expression: body
--- ---
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<multistatus xmlns="DAV:" xmlns:CAL="urn:ietf:params:xml:ns:caldav" xmlns:CARD="urn:ietf:params:xml:ns:carddav" xmlns:CS="http://calendarserver.org/ns/" xmlns:PUSH="https://bitfire.at/webdav-push"> <multistatus xmlns="DAV:" xmlns:CAL="urn:ietf:params:xml:ns:caldav" xmlns:CARD="urn:ietf:params:xml:ns:carddav" xmlns:CS="http://calendarserver.org/ns/" xmlns:PUSH="https://bitfire.at/webdav-push">
<response xmlns="DAV:" xmlns:CAL="urn:ietf:params:xml:ns:caldav" xmlns:CARD="urn:ietf:params:xml:ns:carddav" xmlns:CS="http://calendarserver.org/ns/" xmlns:PUSH="https://bitfire.at/webdav-push"> <response>
<href>/caldav/principal/user/calendar/</href> <href>/caldav/principal/user/calendar/</href>
<propstat> <propstat>
<prop> <prop>

2
src/integration_tests/caldav/snapshots/rustical__integration_tests__caldav__calendar__proppatch_body.snap
View File

@@ -4,7 +4,7 @@ expression: body
--- ---
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<multistatus xmlns="DAV:" xmlns:CAL="urn:ietf:params:xml:ns:caldav" xmlns:CARD="urn:ietf:params:xml:ns:carddav" xmlns:CS="http://calendarserver.org/ns/" xmlns:PUSH="https://bitfire.at/webdav-push"> <multistatus xmlns="DAV:" xmlns:CAL="urn:ietf:params:xml:ns:caldav" xmlns:CARD="urn:ietf:params:xml:ns:carddav" xmlns:CS="http://calendarserver.org/ns/" xmlns:PUSH="https://bitfire.at/webdav-push">
<response xmlns="DAV:" xmlns:CAL="urn:ietf:params:xml:ns:caldav" xmlns:CARD="urn:ietf:params:xml:ns:carddav" xmlns:CS="http://calendarserver.org/ns/" xmlns:PUSH="https://bitfire.at/webdav-push"> <response>
<href>/caldav/principal/user/calendar</href> <href>/caldav/principal/user/calendar</href>
<propstat> <propstat>
<prop> <prop>

2
src/integration_tests/caldav/snapshots/rustical__integration_tests__caldav__propfind_body.snap
View File

@@ -4,7 +4,7 @@ expression: body
--- ---
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<multistatus xmlns="DAV:" xmlns:CAL="urn:ietf:params:xml:ns:caldav" xmlns:CARD="urn:ietf:params:xml:ns:carddav" xmlns:CS="http://calendarserver.org/ns/" xmlns:PUSH="https://bitfire.at/webdav-push"> <multistatus xmlns="DAV:" xmlns:CAL="urn:ietf:params:xml:ns:caldav" xmlns:CARD="urn:ietf:params:xml:ns:carddav" xmlns:CS="http://calendarserver.org/ns/" xmlns:PUSH="https://bitfire.at/webdav-push">
<response xmlns="DAV:" xmlns:CAL="urn:ietf:params:xml:ns:caldav" xmlns:CARD="urn:ietf:params:xml:ns:carddav" xmlns:CS="http://calendarserver.org/ns/" xmlns:PUSH="https://bitfire.at/webdav-push"> <response>
<href>/caldav/</href> <href>/caldav/</href>
<propstat> <propstat>
<prop> <prop>

2
src/integration_tests/caldav/snapshots/rustical__integration_tests__caldav__propfind_depth_0.snap
View File

@@ -4,7 +4,7 @@ expression: body
--- ---
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<multistatus xmlns="DAV:" xmlns:CAL="urn:ietf:params:xml:ns:caldav" xmlns:CARD="urn:ietf:params:xml:ns:carddav" xmlns:CS="http://calendarserver.org/ns/" xmlns:PUSH="https://bitfire.at/webdav-push"> <multistatus xmlns="DAV:" xmlns:CAL="urn:ietf:params:xml:ns:caldav" xmlns:CARD="urn:ietf:params:xml:ns:carddav" xmlns:CS="http://calendarserver.org/ns/" xmlns:PUSH="https://bitfire.at/webdav-push">
<response xmlns="DAV:" xmlns:CAL="urn:ietf:params:xml:ns:caldav" xmlns:CARD="urn:ietf:params:xml:ns:carddav" xmlns:CS="http://calendarserver.org/ns/" xmlns:PUSH="https://bitfire.at/webdav-push"> <response>
<href>/caldav/principal/user/</href> <href>/caldav/principal/user/</href>
<propstat> <propstat>
<prop> <prop>

2
src/integration_tests/caldav/snapshots/rustical__integration_tests__caldav__propfind_depth_1.snap
View File

@@ -4,7 +4,7 @@ expression: body
--- ---
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<multistatus xmlns="DAV:" xmlns:CAL="urn:ietf:params:xml:ns:caldav" xmlns:CARD="urn:ietf:params:xml:ns:carddav" xmlns:CS="http://calendarserver.org/ns/" xmlns:PUSH="https://bitfire.at/webdav-push"> <multistatus xmlns="DAV:" xmlns:CAL="urn:ietf:params:xml:ns:caldav" xmlns:CARD="urn:ietf:params:xml:ns:carddav" xmlns:CS="http://calendarserver.org/ns/" xmlns:PUSH="https://bitfire.at/webdav-push">
<response xmlns="DAV:" xmlns:CAL="urn:ietf:params:xml:ns:caldav" xmlns:CARD="urn:ietf:params:xml:ns:carddav" xmlns:CS="http://calendarserver.org/ns/" xmlns:PUSH="https://bitfire.at/webdav-push"> <response>
<href>/caldav/principal/user/</href> <href>/caldav/principal/user/</href>
<propstat> <propstat>
<prop> <prop>

2
src/integration_tests/carddav/snapshots/rustical__integration_tests__carddav__addressbook__propfind_body.snap
View File

@@ -4,7 +4,7 @@ expression: body
--- ---
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<multistatus xmlns="DAV:" xmlns:CAL="urn:ietf:params:xml:ns:caldav" xmlns:CARD="urn:ietf:params:xml:ns:carddav" xmlns:CS="http://calendarserver.org/ns/" xmlns:PUSH="https://bitfire.at/webdav-push"> <multistatus xmlns="DAV:" xmlns:CAL="urn:ietf:params:xml:ns:caldav" xmlns:CARD="urn:ietf:params:xml:ns:carddav" xmlns:CS="http://calendarserver.org/ns/" xmlns:PUSH="https://bitfire.at/webdav-push">
<response xmlns="DAV:" xmlns:CAL="urn:ietf:params:xml:ns:caldav" xmlns:CARD="urn:ietf:params:xml:ns:carddav" xmlns:CS="http://calendarserver.org/ns/" xmlns:PUSH="https://bitfire.at/webdav-push"> <response>
<href>/carddav/principal/user/contacts/</href> <href>/carddav/principal/user/contacts/</href>
<propstat> <propstat>
<prop> <prop>

2
src/integration_tests/carddav/snapshots/rustical__integration_tests__carddav__addressbook__proppatch_body.snap
View File

@@ -4,7 +4,7 @@ expression: body
--- ---
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<multistatus xmlns="DAV:" xmlns:CAL="urn:ietf:params:xml:ns:caldav" xmlns:CARD="urn:ietf:params:xml:ns:carddav" xmlns:CS="http://calendarserver.org/ns/" xmlns:PUSH="https://bitfire.at/webdav-push"> <multistatus xmlns="DAV:" xmlns:CAL="urn:ietf:params:xml:ns:caldav" xmlns:CARD="urn:ietf:params:xml:ns:carddav" xmlns:CS="http://calendarserver.org/ns/" xmlns:PUSH="https://bitfire.at/webdav-push">
<response xmlns="DAV:" xmlns:CAL="urn:ietf:params:xml:ns:caldav" xmlns:CARD="urn:ietf:params:xml:ns:carddav" xmlns:CS="http://calendarserver.org/ns/" xmlns:PUSH="https://bitfire.at/webdav-push"> <response>
<href>/carddav/principal/user/contacts</href> <href>/carddav/principal/user/contacts</href>
<propstat> <propstat>
<prop> <prop>

2
src/integration_tests/carddav/snapshots/rustical__integration_tests__carddav__carddav_root-3.snap
View File

@@ -4,7 +4,7 @@ expression: body
--- ---
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<multistatus xmlns="DAV:" xmlns:CAL="urn:ietf:params:xml:ns:caldav" xmlns:CARD="urn:ietf:params:xml:ns:carddav" xmlns:CS="http://calendarserver.org/ns/" xmlns:PUSH="https://bitfire.at/webdav-push"> <multistatus xmlns="DAV:" xmlns:CAL="urn:ietf:params:xml:ns:caldav" xmlns:CARD="urn:ietf:params:xml:ns:carddav" xmlns:CS="http://calendarserver.org/ns/" xmlns:PUSH="https://bitfire.at/webdav-push">
<response xmlns="DAV:" xmlns:CAL="urn:ietf:params:xml:ns:caldav" xmlns:CARD="urn:ietf:params:xml:ns:carddav" xmlns:CS="http://calendarserver.org/ns/" xmlns:PUSH="https://bitfire.at/webdav-push"> <response>
<href>/carddav/</href> <href>/carddav/</href>
<propstat> <propstat>
<prop> <prop>