wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #2727 from nextcloud/fix-colon-issue

Browse source 
[downstream] Fix colon issue
This commit is contained in:
Roeland Jago Douma 2016-12-19 10:19:15 +01:00 committed by GitHub
commit 9b71ee27ff
3 changed files with 26 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
3rdparty

@ -1 +1 @@
Subproject commit f2974c2e72b2ad5ab7ae745936c4d866405d2b61 Subproject commit 32f3284a5ca0e372baaf458dc22aed89e257178a

9
build/integration/features/bootstrap/WebDav.php
View file

@ -31,6 +31,7 @@
use GuzzleHttp\Client as GClient; use GuzzleHttp\Client as GClient;
use GuzzleHttp\Message\ResponseInterface; use GuzzleHttp\Message\ResponseInterface;
use Sabre\DAV\Client as SClient; use Sabre\DAV\Client as SClient;
use Sabre\DAV\Xml\Property\ResourceType;
require __DIR__ . '/../../vendor/autoload.php'; require __DIR__ . '/../../vendor/autoload.php';
@ -328,6 +329,14 @@ trait WebDav {
} }
$value = $keys[$key]; $value = $keys[$key];
if ($value instanceof ResourceType) {
$value = $value->getValue();
if (empty($value)) {
$value = '';
} else {
$value = $value[0];
}
}
if ($value != $expectedValue) { if ($value != $expectedValue) {
throw new \Exception("Property \"$key\" found with value \"$value\", expected \"$expectedValue\""); throw new \Exception("Property \"$key\" found with value \"$value\", expected \"$expectedValue\"");
} }

16
build/integration/features/webdav-related.feature
View file

@ -447,3 +447,19 @@ Feature: webdav-related
And As an "user1" And As an "user1"
When User "user1" deletes file "/testfolder/asdf.txt" When User "user1" deletes file "/testfolder/asdf.txt"
Then the HTTP status code should be "204" Then the HTTP status code should be "204"
Scenario: Creating a folder
Given using old dav path
And user "user0" exists
And user "user0" created a folder "/test_folder"
When as "user0" gets properties of folder "/test_folder" with
|{DAV:}resourcetype|
Then the single response should contain a property "{DAV:}resourcetype" with value "{DAV:}collection"
Scenario: Creating a folder with special chars
Given using old dav path
And user "user0" exists
And user "user0" created a folder "/test_folder:5"
When as "user0" gets properties of folder "/test_folder:5" with
|{DAV:}resourcetype|
Then the single response should contain a property "{DAV:}resourcetype" with value "{DAV:}collection"