Skip to content
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

Jump to bottom

[tests-only] extend trashbin restore API tests #9126

Merged
merged 2 commits into from
May 13, 2024
Merged

[tests-only] extend trashbin restore API tests #9126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ce6e753
test: add more edge-case tests on trashbin restore
saw-jan May 10, 2024
afbd13a
test: add more edge-case tests on trashbin restore
saw-jan May 10, 2024
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
2 changes: 1 addition & 1 deletion tests/acceptance/features/bootstrap/TrashbinContext.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -850,7 +850,7 @@ private function restoreElement(string $user, string $originalPath, ?string $des
}

/**
* @When user :user restores the folder with original path :originalPath without specifying the destination using the trashbin API
* @When user :user restores the folder/file with original path :originalPath without specifying the destination using the trashbin API
*
* @param $user string
* @param $originalPath string
Expand Down
55 changes: 46 additions & 9 deletions tests/acceptance/features/coreApiTrashbinRestore/trashbinRestore.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,10 +187,10 @@ Feature: restore deleted files/folders
And the content of file "<file-name>" for user "Alice" should be "file original content"
Examples:
| dav-path-version | file-name |
| old | 😛 😜 🐱 🐭 ⌚️ ♀️ 🚴‍♂️ |
| new | 😛 😜 🐱 🐭 ⌚️ ♀️ 🚴‍♂️ |
| old | strängé नेपाली file |
| new | strängé नेपाली file |
| old | 😛 😜 🐱 🐭 ⌚️ ♀️ 🚴‍♂️ |
| new | 😛 😜 🐱 🐭 ⌚️ ♀️ 🚴‍♂️ |
| old | strängé नेपाली file |
| new | strängé नेपाली file |
| old | sample,1.txt |
| new | sample,1.txt |

Expand Down Expand Up @@ -352,31 +352,36 @@ Feature: restore deleted files/folders
| !@tester$^ |
| %file *?2 |
| # %ab ab?=ed |
| Folder,Comma |
And user "Alice" has deleted the following folders
| path |
| qa&dev |
| !@tester$^ |
| %file *?2 |
| # %ab ab?=ed |
| Folder,Comma |
When user "Alice" restores the following folders with original path
| path |
| qa&dev |
| !@tester$^ |
| %file *?2 |
| # %ab ab?=ed |
| Folder,Comma |
Then the HTTP status code of responses on all endpoints should be "201"
And as "Alice" the folders with following original paths should not exist in the trashbin
| path |
| qa&dev |
| !@tester$^ |
| %file *?2 |
| # %ab ab?=ed |
| Folder,Comma |
But as "Alice" the following folders should exist
| path |
| qa&dev |
| !@tester$^ |
| %file *?2 |
| # %ab ab?=ed |
| Folder,Comma |
Examples:
| dav-path-version |
| old |
Expand All @@ -389,7 +394,7 @@ Feature: restore deleted files/folders
And user "Alice" has created folder "/parent_folder/sub"
And user "Alice" has uploaded file with content "parent text" to "/parent_folder/sub/parent.txt"
And user "Alice" has deleted folder "parent_folder"
When user "Alice" restores the folder with original path "/parent_folder/sub/parent.txt" to "parent.txt" using the trashbin API
When user "Alice" restores the file with original path "/parent_folder/sub/parent.txt" to "parent.txt" using the trashbin API
Then the HTTP status code should be "201"
And the following headers should match these regular expressions for user "Alice"
| ETag | /^"[a-f0-9:\.]{1,32}"$/ |
Expand All @@ -407,7 +412,7 @@ Feature: restore deleted files/folders
And user "Alice" has created folder "/parent_folder/sub"
And user "Alice" has uploaded file with content "parent text" to "/parent_folder/sub/parent.txt"
And user "Alice" has deleted folder "parent_folder"
When user "Alice" restores the folder with original path "/parent_folder/sub/parent.txt" to "/parent_folder/sub/parent.txt" using the trashbin API
When user "Alice" restores the file with original path "/parent_folder/sub/parent.txt" to "/parent_folder/sub/parent.txt" using the trashbin API
Then the HTTP status code should be "409"
And as "Alice" the file with original path "/parent_folder/sub/parent.txt" should exist in the trashbin
And user "Alice" should not see the following elements
Expand All @@ -428,7 +433,7 @@ Feature: restore deleted files/folders
And user "Alice" has deleted folder "parent_folder"
And user "Alice" has created folder "/parent_folder"
And user "Alice" has created folder "/parent_folder/sub"
When user "Alice" restores the folder with original path "/parent_folder/sub/parent.txt" using the trashbin API
When user "Alice" restores the file with original path "/parent_folder/sub/parent.txt" using the trashbin API
Then the HTTP status code should be "201"
And the following headers should match these regular expressions for user "Alice"
| ETag | /^"[a-f0-9:\.]{1,32}"$/ |
Expand All @@ -450,7 +455,7 @@ Feature: restore deleted files/folders
And user "Alice" has created folder "/parent_folder/sub"
And user "Alice" has uploaded file with content "parent text" to "/parent_folder/sub/parent.txt"
And user "Alice" has deleted folder "parent_folder"
When user "Alice" restores the folder with original path "/parent_folder/sub/parent.txt" without specifying the destination using the trashbin API
When user "Alice" restores the file with original path "/parent_folder/sub/parent.txt" without specifying the destination using the trashbin API
Then the HTTP status code should be "400"
And as "Alice" the file with original path "/parent_folder/sub/parent.txt" should exist in the trashbin
And user "Alice" should not see the following elements
Expand All @@ -467,7 +472,7 @@ Feature: restore deleted files/folders
Given using <dav-path-version> DAV path
And user "Alice" has uploaded file with content "parent text" to "/parent.txt"
And user "Alice" has deleted file "parent.txt"
When user "Alice" restores the folder with original path "parent.txt" without specifying the destination using the trashbin API
When user "Alice" restores the file with original path "parent.txt" without specifying the destination using the trashbin API
Then the HTTP status code should be "400"
And as "Alice" the file with original path "parent.txt" should exist in the trashbin
And user "Alice" should not see the following elements
Expand Down Expand Up @@ -530,3 +535,35 @@ Feature: restore deleted files/folders
| dav-path-version |
| old |
| new |


Scenario Outline: restore deleted file when folder with same name exists
Given using <dav-path-version> DAV path
And user "Alice" has uploaded file with content "lorem epsum" to "same-name.txt"
And user "Alice" has deleted file "same-name.txt"
And user "Alice" has created folder "same-name.txt"
When user "Alice" restores the file with original path "same-name.txt" using the trashbin API
Then the HTTP status code should be "204"
And the content of file "same-name.txt" for user "Alice" should be "lorem epsum"
And as "Alice" folder "same-name.txt" should not exist
And as "Alice" the folder with original path "same-name.txt" should exist in the trashbin
Examples:
| dav-path-version |
| old |
| new |


Scenario Outline: restore deleted folder when file with same name exists
Given using <dav-path-version> DAV path
And user "Alice" has created folder "same-name.txt"
And user "Alice" has deleted folder "same-name.txt"
And user "Alice" has uploaded file with content "lorem epsum" to "same-name.txt"
When user "Alice" restores the folder with original path "same-name.txt" using the trashbin API
Then the HTTP status code should be "204"
And as "Alice" folder "same-name.txt" should exist
And as "Alice" file "same-name.txt" should not exist
And as "Alice" the file with original path "same-name.txt" should exist in the trashbin
Examples:
| dav-path-version |
| old |
| new |