Skip to content

[tests-only] [full-ci] Add trashbin API tests for deleting files shared with a group #39336

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
phil-davis merged 1 commit into from
Oct 19, 2021
Merged

[tests-only] [full-ci] Add trashbin API tests for deleting files shared with a group #39336

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions tests/acceptance/features/apiTrashbin/trashbinFilesFolders.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,9 +268,9 @@ Feature: files and folders exist in the trashbin after being deleted
Given using <dav-path> DAV path
And user "Alice" has created folder "/new-folder"
And user "Alice" has uploaded file "filesForUpload/textfile.txt" to "/new-folder/new-file.txt"
When user "Alice" deletes folder "/new-folder/" using the WebDAV API
When user "Alice" deletes folder "/new-folder" using the WebDAV API
Then as "Alice" the file with original path "/new-folder/new-file.txt" should exist in the trashbin
And as "Alice" the folder with original path "/new-folder/" should exist in the trashbin
And as "Alice" the folder with original path "/new-folder" should exist in the trashbin
And as "Alice" file "/new-folder/new-file.txt" should exist in the trashbin
But as "Alice" file "/new-folder/new-file.txt" should not exist
Examples:
Expand Down
85 changes: 84 additions & 1 deletion tests/acceptance/features/apiTrashbin/trashbinSharingToRoot.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Feature: using trashbin together with sharing
| new |


Scenario Outline: deleting a file in a received folder moves it to trashbin
Scenario Outline: deleting a file in a received folder moves it to the trashbin of both users
Given using <dav-path> DAV path
And user "Brian" has been created with default attributes and without skeleton files
And user "Alice" has created folder "/shared"
Expand All @@ -30,6 +30,89 @@ Feature: using trashbin together with sharing
And user "Brian" has moved file "/shared" to "/renamed_shared"
When user "Brian" deletes file "/renamed_shared/shared_file.txt" using the WebDAV API
Then as "Brian" the file with original path "/renamed_shared/shared_file.txt" should exist in the trashbin
And as "Alice" the file with original path "/shared/shared_file.txt" should exist in the trashbin
Examples:
| dav-path |
| old |
| new |


Scenario Outline: sharee deleting a file in a group-shared folder moves it to the trashbin of sharee and sharer only
Given using <dav-path> DAV path
And user "Brian" has been created with default attributes and without skeleton files
And user "Carol" has been created with default attributes and without skeleton files
And group "grp1" has been created
And user "Brian" has been added to group "grp1"
And user "Carol" has been added to group "grp1"
And user "Alice" has created folder "/shared"
And user "Alice" has moved file "/textfile0.txt" to "/shared/shared_file.txt"
And user "Alice" has shared folder "/shared" with group "grp1"
When user "Brian" deletes file "/shared/shared_file.txt" using the WebDAV API
Then as "Brian" the file with original path "/shared/shared_file.txt" should exist in the trashbin
And as "Alice" the file with original path "/shared/shared_file.txt" should exist in the trashbin
And as "Carol" the file with original path "/shared/shared_file.txt" should not exist in the trashbin
Examples:
| dav-path |
| old |
| new |


Scenario Outline: sharer deleting a file in a group-shared folder moves it to the trashbin of sharer only
Given using <dav-path> DAV path
And user "Brian" has been created with default attributes and without skeleton files
And user "Carol" has been created with default attributes and without skeleton files
And group "grp1" has been created
And user "Brian" has been added to group "grp1"
And user "Carol" has been added to group "grp1"
And user "Alice" has created folder "/shared"
And user "Alice" has moved file "/textfile0.txt" to "/shared/shared_file.txt"
And user "Alice" has shared folder "/shared" with group "grp1"
When user "Alice" deletes file "/shared/shared_file.txt" using the WebDAV API
Then as "Alice" the file with original path "/shared/shared_file.txt" should exist in the trashbin
And as "Brian" the file with original path "/shared/shared_file.txt" should not exist in the trashbin
And as "Carol" the file with original path "/shared/shared_file.txt" should not exist in the trashbin
Examples:
| dav-path |
| old |
| new |


Scenario Outline: sharee deleting a folder in a group-shared folder moves it to the trashbin of sharee and sharer only
Given using <dav-path> DAV path
And user "Brian" has been created with default attributes and without skeleton files
And user "Carol" has been created with default attributes and without skeleton files
And group "grp1" has been created
And user "Brian" has been added to group "grp1"
And user "Carol" has been added to group "grp1"
And user "Alice" has created folder "/shared"
And user "Alice" has created folder "/shared/sub"
And user "Alice" has moved file "/textfile0.txt" to "/shared/sub/shared_file.txt"
And user "Alice" has shared folder "/shared" with group "grp1"
When user "Brian" deletes folder "/shared/sub" using the WebDAV API
Then as "Brian" the file with original path "/shared/sub/shared_file.txt" should exist in the trashbin
And as "Alice" the file with original path "/shared/sub/shared_file.txt" should exist in the trashbin
And as "Carol" the file with original path "/shared/sub/shared_file.txt" should not exist in the trashbin
Examples:
| dav-path |
| old |
| new |


Scenario Outline: sharer deleting a folder in a group-shared folder moves it to the trashbin of sharer only
Given using <dav-path> DAV path
And user "Brian" has been created with default attributes and without skeleton files
And user "Carol" has been created with default attributes and without skeleton files
And group "grp1" has been created
And user "Brian" has been added to group "grp1"
And user "Carol" has been added to group "grp1"
And user "Alice" has created folder "/shared"
And user "Alice" has created folder "/shared/sub"
And user "Alice" has moved file "/textfile0.txt" to "/shared/sub/shared_file.txt"
And user "Alice" has shared folder "/shared" with group "grp1"
When user "Alice" deletes folder "/shared/sub" using the WebDAV API
Then as "Alice" the file with original path "/shared/sub/shared_file.txt" should exist in the trashbin
And as "Brian" the file with original path "/shared/sub/shared_file.txt" should not exist in the trashbin
And as "Carol" the file with original path "/shared/sub/shared_file.txt" should not exist in the trashbin
Examples:
| dav-path |
| old |
Expand Down
93 changes: 92 additions & 1 deletion tests/acceptance/features/apiTrashbin/trashbinSharingToShares.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Feature: using trashbin together with sharing
| new |


Scenario Outline: deleting a file in a received folder moves it to trashbin
Scenario Outline: deleting a file in a received folder moves it to trashbin of both users
Given using <dav-path> DAV path
And user "Brian" has been created with default attributes and without skeleton files
And user "Alice" has created folder "/shared"
Expand All @@ -34,6 +34,97 @@ Feature: using trashbin together with sharing
And user "Brian" has moved file "/Shares/shared" to "/Shares/renamed_shared"
When user "Brian" deletes file "/Shares/renamed_shared/shared_file.txt" using the WebDAV API
Then as "Brian" the file with original path "/Shares/renamed_shared/shared_file.txt" should exist in the trashbin
And as "Alice" the file with original path "/shared/shared_file.txt" should exist in the trashbin
Examples:
| dav-path |
| old |
| new |


Scenario Outline: sharee deleting a file in a group-shared folder moves it to the trashbin of sharee and sharer only
Given using <dav-path> DAV path
And user "Brian" has been created with default attributes and without skeleton files
And user "Carol" has been created with default attributes and without skeleton files
And group "grp1" has been created
And user "Brian" has been added to group "grp1"
And user "Carol" has been added to group "grp1"
And user "Alice" has created folder "/shared"
And user "Alice" has moved file "/textfile0.txt" to "/shared/shared_file.txt"
And user "Alice" has shared folder "/shared" with group "grp1"
And user "Brian" has accepted share "/Shares/shared" offered by user "Alice"
And user "Carol" has accepted share "/Shares/shared" offered by user "Alice"
When user "Brian" deletes file "/Shares/shared/shared_file.txt" using the WebDAV API
Then as "Brian" the file with original path "/Shares/shared/shared_file.txt" should exist in the trashbin
And as "Alice" the file with original path "/shared/shared_file.txt" should exist in the trashbin
And as "Carol" the file with original path "/Shares/shared/shared_file.txt" should not exist in the trashbin
Examples:
| dav-path |
| old |
| new |


Scenario Outline: sharer deleting a file in a group-shared folder moves it to the trashbin of sharer only
Given using <dav-path> DAV path
And user "Brian" has been created with default attributes and without skeleton files
And user "Carol" has been created with default attributes and without skeleton files
And group "grp1" has been created
And user "Brian" has been added to group "grp1"
And user "Carol" has been added to group "grp1"
And user "Alice" has created folder "/shared"
And user "Alice" has moved file "/textfile0.txt" to "/shared/shared_file.txt"
And user "Alice" has shared folder "/shared" with group "grp1"
And user "Brian" has accepted share "/Shares/shared" offered by user "Alice"
And user "Carol" has accepted share "/Shares/shared" offered by user "Alice"
When user "Alice" deletes file "/shared/shared_file.txt" using the WebDAV API
Then as "Alice" the file with original path "/shared/shared_file.txt" should exist in the trashbin
And as "Brian" the file with original path "/Shares/shared/shared_file.txt" should not exist in the trashbin
And as "Carol" the file with original path "/Shares/shared/shared_file.txt" should not exist in the trashbin
Examples:
| dav-path |
| old |
| new |


Scenario Outline: sharee deleting a folder in a group-shared folder moves it to the trashbin of sharee and sharer only
Given using <dav-path> DAV path
And user "Brian" has been created with default attributes and without skeleton files
And user "Carol" has been created with default attributes and without skeleton files
And group "grp1" has been created
And user "Brian" has been added to group "grp1"
And user "Carol" has been added to group "grp1"
And user "Alice" has created folder "/shared"
And user "Alice" has created folder "/shared/sub"
And user "Alice" has moved file "/textfile0.txt" to "/shared/sub/shared_file.txt"
And user "Alice" has shared folder "/shared" with group "grp1"
And user "Brian" has accepted share "/Shares/shared" offered by user "Alice"
And user "Carol" has accepted share "/Shares/shared" offered by user "Alice"
When user "Brian" deletes file "/Shares/shared/sub/shared_file.txt" using the WebDAV API
Then as "Brian" the file with original path "/Shares/shared/sub/shared_file.txt" should exist in the trashbin
And as "Alice" the file with original path "/shared/sub/shared_file.txt" should exist in the trashbin
And as "Carol" the file with original path "/Shares/sub/shared/shared_file.txt" should not exist in the trashbin
Examples:
| dav-path |
| old |
| new |


Scenario Outline: sharer deleting a folder in a group-shared folder moves it to the trashbin of sharer only
Given using <dav-path> DAV path
And user "Brian" has been created with default attributes and without skeleton files
And user "Carol" has been created with default attributes and without skeleton files
And group "grp1" has been created
And user "Brian" has been added to group "grp1"
And user "Carol" has been added to group "grp1"
And user "Alice" has created folder "/shared"
And user "Alice" has created folder "/shared/sub"
And user "Alice" has moved file "/textfile0.txt" to "/shared/sub/shared_file.txt"
And user "Alice" has shared folder "/shared" with group "grp1"
And user "Brian" has accepted share "/Shares/shared" offered by user "Alice"
And user "Carol" has accepted share "/Shares/shared" offered by user "Alice"
When user "Alice" deletes file "/shared/sub/shared_file.txt" using the WebDAV API
Then as "Alice" the file with original path "/shared/sub/shared_file.txt" should exist in the trashbin
And as "Brian" the file with original path "/Shares/shared/sub/shared_file.txt" should not exist in the trashbin
And as "Carol" the file with original path "/Shares/shared/sub/shared_file.txt" should not exist in the trashbin
Examples:
| dav-path |
| old |
Expand Down
10 changes: 5 additions & 5 deletions tests/acceptance/features/apiTrashbinRestore/trashbinRestore.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,17 +293,17 @@ Feature: Restore deleted files/folders
Scenario Outline: A subfolder from a deleted multi level folder can be restored including the content
Given using <dav-path> DAV path
And user "Alice" has created folder "/new-folder"
And user "Alice" has created folder "/new-folder/folder1/"
And user "Alice" has created folder "/new-folder/folder1/folder2/"
And user "Alice" has created folder "/new-folder/folder1"
And user "Alice" has created folder "/new-folder/folder1/folder2"
And user "Alice" has moved file "/textfile0.txt" to "/new-folder/folder1/folder2/new-file.txt"
And user "Alice" has deleted folder "/new-folder/"
And user "Alice" has deleted folder "/new-folder"
When user "Alice" restores the folder with original path "/new-folder/folder1" to "/folder1" using the trashbin API
Then the HTTP status code should be "201"
And as "Alice" the file with original path "/new-folder/folder1/folder2/new-file.txt" should not exist in the trashbin
And as "Alice" the folder with original path "/new-folder/folder1/" should not exist in the trashbin
And as "Alice" the folder with original path "/new-folder/folder1" should not exist in the trashbin
And as "Alice" file "/folder1/folder2/new-file.txt" should exist
And the content of file "/folder1/folder2/new-file.txt" for user "Alice" should be "file to delete"
But as "Alice" the folder with original path "/new-folder/" should exist in the trashbin
But as "Alice" the folder with original path "/new-folder" should exist in the trashbin
Examples:
| dav-path |
| old |
Expand Down
10 changes: 6 additions & 4 deletions tests/acceptance/features/bootstrap/TrashbinContext.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -641,10 +641,12 @@ private function isInTrash(string $user, string $originalPath):bool {
if ($techPreviewHadToBeEnabled) {
$this->occContext->disableDAVTechPreview();
}
$originalPath = \trim($originalPath, '/');

// we don't care if the test step writes a leading "/" or not
$originalPath = \ltrim($originalPath, '/');

foreach ($listing as $entry) {
if ($entry['original-location'] === $originalPath) {
if (\ltrim($entry['original-location'], '/') === $originalPath) {
return true;
}
}
Expand Down Expand Up @@ -896,7 +898,7 @@ public function elementIsInTrashCheckingOriginalPath(
$user = $this->featureContext->getActualUsername($user);
Assert::assertTrue(
$this->isInTrash($user, $originalPath),
"File previously located at $originalPath wasn't found in the trashbin"
"File previously located at $originalPath wasn't found in the trashbin of user $user"
);
}

Expand All @@ -916,7 +918,7 @@ public function elementIsNotInTrashCheckingOriginalPath(
$user = $this->featureContext->getActualUsername($user);
Assert::assertFalse(
$this->isInTrash($user, $originalPath),
"File previously located at $originalPath was found in the trashbin"
"File previously located at $originalPath was found in the trashbin of user $user"
);
}

Expand Down