Fix tests

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

diff --git a/apps/dav/tests/unit/CardDAV/BirthdayServiceTest.php b/apps/dav/tests/unit/CardDAV/BirthdayServiceTest.php
index 739b81ddf01729e1d928d124eaa72064e1ec512c..651fbf5eaf8b4a0f2acd2eb330b1b38129b6e5d8 100644 (file)
--- a/apps/dav/tests/unit/CardDAV/BirthdayServiceTest.php
+++ b/apps/dav/tests/unit/CardDAV/BirthdayServiceTest.php
@@ -231,9 +231,9 @@ class BirthdayServiceTest extends TestCase {
                if ($expectedOp === 'create') {
                        $service->expects($this->exactly(3))->method('buildDateFromContact')->willReturn(new VCalendar());
                        $this->calDav->expects($this->exactly(3))->method('createCalendarObject')->withConsecutive(
-                               [1234, 'default-gump.vcf.ics', "BEGIN:VCALENDAR\r\nVERSION:2.0\r\nPRODID:-//Sabre//Sabre VObject 4.1.2//EN\r\nCALSCALE:GREGORIAN\r\nEND:VCALENDAR\r\n"],
-                               [1234, 'default-gump.vcf-death.ics', "BEGIN:VCALENDAR\r\nVERSION:2.0\r\nPRODID:-//Sabre//Sabre VObject 4.1.2//EN\r\nCALSCALE:GREGORIAN\r\nEND:VCALENDAR\r\n"],
-                               [1234, 'default-gump.vcf-anniversary.ics', "BEGIN:VCALENDAR\r\nVERSION:2.0\r\nPRODID:-//Sabre//Sabre VObject 4.1.2//EN\r\nCALSCALE:GREGORIAN\r\nEND:VCALENDAR\r\n"]
+                               [1234, 'default-gump.vcf.ics', "BEGIN:VCALENDAR\r\nVERSION:2.0\r\nPRODID:-//Sabre//Sabre VObject 4.1.6//EN\r\nCALSCALE:GREGORIAN\r\nEND:VCALENDAR\r\n"],
+                               [1234, 'default-gump.vcf-death.ics', "BEGIN:VCALENDAR\r\nVERSION:2.0\r\nPRODID:-//Sabre//Sabre VObject 4.1.6//EN\r\nCALSCALE:GREGORIAN\r\nEND:VCALENDAR\r\n"],
+                               [1234, 'default-gump.vcf-anniversary.ics', "BEGIN:VCALENDAR\r\nVERSION:2.0\r\nPRODID:-//Sabre//Sabre VObject 4.1.6//EN\r\nCALSCALE:GREGORIAN\r\nEND:VCALENDAR\r\n"]
                                );
                }
                if ($expectedOp === 'update') {
@@ -241,9 +241,9 @@ class BirthdayServiceTest extends TestCase {
                        $service->expects($this->exactly(3))->method('birthdayEvenChanged')->willReturn(true);
                        $this->calDav->expects($this->exactly(3))->method('getCalendarObject')->willReturn(['calendardata' => '']);
                        $this->calDav->expects($this->exactly(3))->method('updateCalendarObject')->withConsecutive(
-                               [1234, 'default-gump.vcf.ics', "BEGIN:VCALENDAR\r\nVERSION:2.0\r\nPRODID:-//Sabre//Sabre VObject 4.1.2//EN\r\nCALSCALE:GREGORIAN\r\nEND:VCALENDAR\r\n"],
-                               [1234, 'default-gump.vcf-death.ics', "BEGIN:VCALENDAR\r\nVERSION:2.0\r\nPRODID:-//Sabre//Sabre VObject 4.1.2//EN\r\nCALSCALE:GREGORIAN\r\nEND:VCALENDAR\r\n"],
-                               [1234, 'default-gump.vcf-anniversary.ics', "BEGIN:VCALENDAR\r\nVERSION:2.0\r\nPRODID:-//Sabre//Sabre VObject 4.1.2//EN\r\nCALSCALE:GREGORIAN\r\nEND:VCALENDAR\r\n"]
+                               [1234, 'default-gump.vcf.ics', "BEGIN:VCALENDAR\r\nVERSION:2.0\r\nPRODID:-//Sabre//Sabre VObject 4.1.6//EN\r\nCALSCALE:GREGORIAN\r\nEND:VCALENDAR\r\n"],
+                               [1234, 'default-gump.vcf-death.ics', "BEGIN:VCALENDAR\r\nVERSION:2.0\r\nPRODID:-//Sabre//Sabre VObject 4.1.6//EN\r\nCALSCALE:GREGORIAN\r\nEND:VCALENDAR\r\n"],
+                               [1234, 'default-gump.vcf-anniversary.ics', "BEGIN:VCALENDAR\r\nVERSION:2.0\r\nPRODID:-//Sabre//Sabre VObject 4.1.6//EN\r\nCALSCALE:GREGORIAN\r\nEND:VCALENDAR\r\n"]
                                );
                }
 

diff --git a/build/integration/features/webdav-related.feature b/build/integration/features/webdav-related.feature
index 77fe811fadab6a47658d139627d4dad015f32756..a5fd8140518ea95eace3973eab6ac78b878b5599 100644 (file)
--- a/build/integration/features/webdav-related.feature
+++ b/build/integration/features/webdav-related.feature
@@ -8,7 +8,7 @@ Feature: webdav-related
                Then the HTTP status code should be "401"
                And there are no duplicate headers
                And The following headers should be set
-                       |WWW-Authenticate|Basic realm="Nextcloud"|
+                       |WWW-Authenticate|Basic realm="Nextcloud", charset="UTF-8"|
 
        Scenario: Unauthenticated call new dav path
                Given using new dav path
@@ -16,7 +16,7 @@ Feature: webdav-related
                Then the HTTP status code should be "401"
                And there are no duplicate headers
                And The following headers should be set
-                       |WWW-Authenticate|Basic realm="Nextcloud"|
+                       |WWW-Authenticate|Basic realm="Nextcloud", charset="UTF-8"|
 
        Scenario: Moving a file
                Given using old dav path