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][full-ci] add batch restore e2e test and remove acceptance counterparts #10890

Merged
merged 1 commit into from
May 13, 2024
Merged

[tests-only][full-ci] add batch restore e2e test and remove acceptance counterparts #10890

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
8 changes: 0 additions & 8 deletions .drone.star
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,9 +102,6 @@ config = {
"oCISFiles1": [
"webUICreateFilesFolders",
],
"oCISFiles5": [
"webUITextEditor",
],
"oCISSharingPublic1": [
"webUISharingPublicBasic",
],
Expand All @@ -114,9 +111,6 @@ config = {
"oCISSharingPublic3": [
"webUISharingPublicDifferentRoles",
],
"oCISTrashbinJourney": [
"webUITrashbinRestore",
],
},
"extraEnvironment": {
"NODE_TLS_REJECT_UNAUTHORIZED": "0",
Expand All @@ -140,8 +134,6 @@ basicTestSuites = [
"webUISharingPublicBasic",
"webUISharingPublicDifferentRoles",
"webUISharingPublicManagement",
"webUITextEditor",
"webUITrashbinRestore",
]

# minio mc environment variables
Expand Down
61 changes: 0 additions & 61 deletions tests/acceptance/features/webUITextEditor/textFile.feature
View file
Open in desktop

This file was deleted.

210 changes: 0 additions & 210 deletions tests/acceptance/features/webUITrashbinRestore/trashbinRestore.feature
View file
Open in desktop

This file was deleted.

26 changes: 18 additions & 8 deletions tests/e2e/cucumber/features/smoke/trashbinDelete.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,14 @@ Feature: Trashbin delete


Scenario: delete and restore a file inside a received shared folder
Given "Alice" creates the following resources
| resource | type |
| folderToShare | folder |
And "Alice" uploads the following resource
| resource | to |
| lorem.txt | folderToShare |
Given "Alice" creates the following folders in personal space using API
| name |
| folderToShare |
| empty-folder |
And "Alice" creates the following files into personal space using API
| pathToFile | content |
| folderToShare/lorem.txt | lorem ipsum |
| sample.txt | sample |
And "Alice" shares the following resource using the sidebar panel
| resource | recipient | type | role | resourceType |
| folderToShare | Brian | user | Can edit | folder |
Expand All @@ -62,13 +64,21 @@ Feature: Trashbin delete
Then following resources should not be displayed in the trashbin for user "Brian"
| resource |
| folderToShare/lorem.txt |
When "Alice" deletes the following resources using the sidebar panel
| resource |
| sample.txt |
| empty-folder |
And "Alice" navigates to the trashbin
And following resources should be displayed in the trashbin for user "Alice"
Then following resources should be displayed in the trashbin for user "Alice"
| resource |
| folderToShare/lorem.txt |
And "Alice" restores the following resource from trashbin
And "Alice" restores the following resources from trashbin
| resource |
| folderToShare/lorem.txt |
And "Alice" restores the following resources from trashbin using the batch action
| resource |
| sample.txt |
| empty-folder |
And "Alice" opens the "files" app
And "Alice" opens folder "folderToShare"
And following resources should be displayed in the files list for user "Alice"
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/cucumber/features/smoke/urlJourneys.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ Feature: web can be navigated through urls
| name | content |
| spaceTextfile.txt | This is test file. Cheers |
When "Alice" navigates to "versions" details panel of file "lorem.txt" of space "personal" through the URL
Then "Alice" restores following resources
Then "Alice" restores following resources version
| resource | to | version | openDetailsPanel |
| lorem.txt | / | 1 | false |
When "Alice" navigates to "sharing" details panel of file "lorem.txt" of space "personal" through the URL
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/cucumber/features/spaces/project.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ Feature: spaces.personal
And "Brian" downloads old version of the following resource
| resource | to |
| textfile.txt | parent |
And "Brian" restores following resources
And "Brian" restores following resources version
| resource | to | version | openDetailsPanel |
| textfile.txt | parent | 1 | true |
And "Brian" logs out
Loading