mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

User was incorrect 

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
This commit is contained in:
Sergio Bertolin 2016-09-21 08:18:10 +00:00 committed by Roeland Jago Douma
parent d81f4ea53c
commit 09a90b4000
No known key found for this signature in database
GPG Key ID: 1E152838F164D13B
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
build/integration/features/bootstrap/WebDav.php
View File

@ -53,9 +53,9 @@ trait WebDav {
/**
* @return string
*/
public function getFilesPath() {
if ($this->davPath === 'remote.php/dav') {
$basePath = '/files/' . $this->currentUser . '/';
public function getFilesPath($user) {
if ($this->davPath === "remote.php/dav") {
$basePath = '/files/' . $user . '/';
} else {
$basePath = '/';
}
@ -262,12 +262,13 @@ trait WebDav {
/**
* @Then /^as "([^"]*)" the (file|folder|entry) "([^"]*)" does not exist$/
* @param string $user
* @param string $entry
* @param string $path
* @param \Behat\Gherkin\Node\TableNode|null $propertiesTable
*/
public function asTheFileOrFolderDoesNotExist($user, $entry, $path) {
$client = $this->getSabreClient($user);
$response = $client->request('HEAD', $this->makeSabrePath($path));
$response = $client->request('HEAD', $this->makeSabrePath($user, $path));
if ($response['statusCode'] !== 404) {
throw new \Exception($entry . ' "' . $path . '" expected to not exist (status code ' . $response['statusCode'] . ', expected 404)');
}
@ -278,8 +279,8 @@ trait WebDav {
/**
* @Then /^as "([^"]*)" the (file|folder|entry) "([^"]*)" exists$/
* @param string $user
* @param string $entry
* @param string $path
* @param \Behat\Gherkin\Node\TableNode|null $propertiesTable
*/
public function asTheFileOrFolderExists($user, $entry, $path) {
$this->response = $this->listFolder($user, $path, 0);
@ -362,13 +363,13 @@ trait WebDav {
];
}
$response = $client->propfind($this->makeSabrePath($path), $properties, $folderDepth);
$response = $client->propfind($this->makeSabrePath($user, $path), $properties, $folderDepth);
return $response;
}
public function makeSabrePath($path) {
return $this->encodePath($this->davPath . $this->getFilesPath() . ltrim($path, '/'));
public function makeSabrePath($user, $path) {
return $this->encodePath($this->davPath . $this->getFilesPath($user) . ltrim($path, '/'));
}
public function getSabreClient($user) {
@ -474,7 +475,7 @@ trait WebDav {
*/
public function userCreatedAFolder($user, $destination) {
try {
$this->response = $this->makeDavRequest($user, "MKCOL", $this->getFilesPath() . ltrim($destination, $this->getFilesPath()), []);
$this->response = $this->makeDavRequest($user, "MKCOL", $this->getFilesPath($user) . ltrim($destination, $this->getFilesPath($user)), []);
} catch (\GuzzleHttp\Exception\ServerException $e) {
// 4xx and 5xx responses cause an exception
$this->response = $e->getResponse();
@ -584,7 +585,7 @@ trait WebDav {
];
}
$response = $client->proppatch($this->davPath . $this->getFilesPath() . ltrim($path, '/'), $properties, $folderDepth);
$response = $client->proppatch($this->davPath . $this->getFilesPath($user) . ltrim($path, '/'), $properties, $folderDepth);
return $response;
}