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

Fixing the tests

This commit is contained in:
Sergio Bertolín 2016-06-14 16:20:40 +00:00 committed by Thomas Müller
parent 39a56c7bc1
commit 4232458652
No known key found for this signature in database
GPG Key ID: A943788A3BBEC44C
2 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -435,20 +435,11 @@ trait WebDav {
}
}
/*
* @When user "([^"]*)" favorites folder "([^"]*)"
* @param string $user
* @param string $path
* @param \Behat\Gherkin\Node\TableNode|null $propertiesTable
/**
* @When user :user favorites element :path
*/
public function userFavoritesFolder($user, $path, $propertiesTable) {
$properties = null;
if ($propertiesTable instanceof \Behat\Gherkin\Node\TableNode) {
foreach ($propertiesTable->getRows() as $row) {
$properties[] = $row[0];
}
}
$this->response = $this->favFolder($user, $path, 0, $properties);
public function userFavoritesFolder($user, $path){
$this->response = $this->favFolder($user, $path, 0, null);
}
/*Set the elements of a proppatch, $folderDepth requires 1 to see elements without children*/
@ -466,11 +457,21 @@ trait WebDav {
$client = new SClient($settings);
if (!$properties) {
$properties = [
'{http://owncloud.org/ns}favorite'
'{http://owncloud.org/ns}favorite' => 1
];
}
echo $properties,
$response = $client->proppatch($this->davPath . '/' . ltrim($path, '/'), $properties, $folderDepth);
return $response;
}
/**
* @Then /^as "([^"]*)" gets properties of file "([^"]*)" with$/
* @param string $user
* @param string $path
* @param \Behat\Gherkin\Node\TableNode|null $propertiesTable
*/
public function asGetsPropertiesOfFileWith($user, $path, $propertiesTable) {
$this->asGetsPropertiesOfFolderWith($user, $path, $propertiesTable);
}
}

10
build/integration/features/favorites.feature
View File

@ -6,9 +6,8 @@ Feature: favorite
Given using dav path "remote.php/webdav"
And As an "admin"
And user "user0" exists
When user "user0" favorites folder "/"
|{http://owncloud.org/ns}favorite|
Then As "user0" gets properties of folder "/" with
When user "user0" favorites element "/FOLDER"
Then as "user0" gets properties of folder "/FOLDER" with
|{http://owncloud.org/ns}favorite|
And the single response should contain a property "{http://owncloud.org/ns}favorite" with value "1"
@ -16,8 +15,7 @@ Feature: favorite
Given using dav path "remote.php/webdav"
And As an "admin"
And user "user0" exists
When user "user0" favorites folder "/textfile0.txt"
|{http://owncloud.org/ns}favorite|
Then As "user0" gets properties of folder "/textfile0.txt" with
When user "user0" favorites element "/textfile0.txt"
Then as "user0" gets properties of file "/textfile0.txt" with
|{http://owncloud.org/ns}favorite|
And the single response should contain a property "{http://owncloud.org/ns}favorite" with value "1"