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

Merge pull request #3954 from nextcloud/downstream-27392 

Added logic and tests to remove everything inside a folder
This commit is contained in:
Morris Jobke 2017-03-20 03:18:20 -06:00 committed by GitHub
parent 373bfea427 493b4c2f5c
commit ea6b3a95ca
2 changed files with 57 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -729,4 +729,23 @@ trait WebDav {
}
}
/**
* @When /^User "([^"]*)" deletes everything from folder "([^"]*)"$/
* @param string $user
* @param string $folder
*/
public function userDeletesEverythingInFolder($user, $folder) {
$elementList = $this->listFolder($user, $folder, 1);
$elementListKeys = array_keys($elementList);
array_shift($elementListKeys);
$davPrefix = "/" . $this->getDavFilesPath($user);
foreach($elementListKeys as $element) {
if (substr($element, 0, strlen($davPrefix)) == $davPrefix) {
$element = substr($element, strlen($davPrefix));
}
$this->userDeletesFile($user, "element", $element);
}
}
}

38
build/integration/features/webdav-related.feature
View File

@ -479,3 +479,41 @@ Feature: webdav-related
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"
Scenario: Removing everything of a folder
Given using old dav path
And As an "admin"
And user "user0" exists
And As an "user0"
And User "user0" moves file "/welcome.txt" to "/FOLDER/welcome.txt"
And user "user0" created a folder "/FOLDER/SUBFOLDER"
And User "user0" copies file "/textfile0.txt" to "/FOLDER/SUBFOLDER/testfile0.txt"
When User "user0" deletes everything from folder "/FOLDER/"
Then user "user0" should see following elements
| /FOLDER/ |
| /PARENT/ |
| /PARENT/parent.txt |
| /textfile0.txt |
| /textfile1.txt |
| /textfile2.txt |
| /textfile3.txt |
| /textfile4.txt |
Scenario: Removing everything of a folder using new dav path
Given using new dav path
And As an "admin"
And user "user0" exists
And As an "user0"
And User "user0" moves file "/welcome.txt" to "/FOLDER/welcome.txt"
And user "user0" created a folder "/FOLDER/SUBFOLDER"
And User "user0" copies file "/textfile0.txt" to "/FOLDER/SUBFOLDER/testfile0.txt"
When User "user0" deletes everything from folder "/FOLDER/"
Then user "user0" should see following elements
| /FOLDER/ |
| /PARENT/ |
| /PARENT/parent.txt |
| /textfile0.txt |
| /textfile1.txt |
| /textfile2.txt |
| /textfile3.txt |
| /textfile4.txt |