Skip to content

Commit

Permalink
[full-ci] [test-only] enable auto-accepting in e2e and UI test (#9775)
Browse files Browse the repository at this point in the history
* enable autoaccepting in e2e test

* delete accepting share steps from acceptance UI tests

* cange line of expected failures file

* bump ocis

* fix tests

* fix after review
  • Loading branch information
ScharfViktor authored Oct 13, 2023
1 parent c04395d commit 8a05291
Show file tree
Hide file tree
Showing 51 changed files with 88 additions and 602 deletions.
1 change: 1 addition & 0 deletions .drone.star
Original file line number Diff line number Diff line change
Expand Up @@ -1256,6 +1256,7 @@ def ocisService(type, tika_enabled = False):
"WEB_ASSET_PATH": "%s/dist" % dir["web"],
"FRONTEND_SEARCH_MIN_LENGTH": "2",
"FRONTEND_OCS_ENABLE_DENIALS": True,
"FRONTEND_AUTO_ACCEPT_SHARES": True,
}
if type == "app-provider":
environment["GATEWAY_GRPC_ADDR"] = "0.0.0.0:9142"
Expand Down
1 change: 1 addition & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ services:
FRONTEND_OCS_ENABLE_DENIALS: "true"
FRONTEND_FULL_TEXT_SEARCH_ENABLED: "true"
FRONTEND_PASSWORD_POLICY_BANNED_PASSWORDS_LIST: '/etc/ocis/password-policy-banned-passwords.txt'
FRONTEND_AUTO_ACCEPT_SHARES: "true"

# IDM
IDM_CREATE_DEMO_USERS: "${DEMO_USERS:-true}"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,28 +29,28 @@ Other free text and markdown formatting can be used elsewhere in the document if
- [webUIFavorites/unfavoriteFile.feature:70](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFavorites/unfavoriteFile.feature#L70)
- [webUIFavorites/unfavoriteFile.feature:86](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFavorites/unfavoriteFile.feature#L86)
- [webUIFavorites/unfavoriteFile.feature:101](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFavorites/unfavoriteFile.feature#L101)
- [webUIResharing1/reshareUsers.feature:177](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIResharing1/reshareUsers.feature#L177)
- [webUIResharing1/reshareUsers.feature:68](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIResharing1/reshareUsers.feature#L68)

### [when sharer renames the shared resource, sharee get the updated name](https://github.com/owncloud/ocis/issues/2256)
- [webUIRenameFiles/renameFiles.feature:227](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIRenameFiles/renameFiles.feature#L227)

### [Cannot create users with special characters](https://github.com/owncloud/ocis/issues/1417)
- [webUISharingAutocompletion/shareAutocompletionSpecialChars.feature:37](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingAutocompletion/shareAutocompletionSpecialChars.feature#L37)
- [webUISharingAutocompletion/shareAutocompletionSpecialChars.feature:38](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingAutocompletion/shareAutocompletionSpecialChars.feature#L38)
- [webUISharingAutocompletion/shareAutocompletionSpecialChars.feature:39](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingAutocompletion/shareAutocompletionSpecialChars.feature#L39)
- [webUISharingAutocompletion/shareAutocompletionSpecialChars.feature:35](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingAutocompletion/shareAutocompletionSpecialChars.feature#L35)
- [webUISharingAutocompletion/shareAutocompletionSpecialChars.feature:36](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingAutocompletion/shareAutocompletionSpecialChars.feature#L36)


### [Share additional info](https://github.com/owncloud/ocis/issues/1253)
- [webUISharingInternalUsersShareWithPage/shareWithUsers.feature:138](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingInternalUsersShareWithPage/shareWithUsers.feature#L138)
- [webUISharingInternalUsersShareWithPage/shareWithUsers.feature:126](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingInternalUsersShareWithPage/shareWithUsers.feature#L126)

### [Expiration date set is not implemented in user share](https://github.com/owncloud/ocis/issues/1250)
- [webUISharingInternalGroups/shareWithGroups.feature:244](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingInternalGroups/shareWithGroups.feature#L244)
- [webUISharingInternalGroups/shareWithGroups.feature:228](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingInternalGroups/shareWithGroups.feature#L228)

### [Different path for shares inside folder](https://github.com/owncloud/ocis/issues/1231)

### [Implement expiration date for shares](https://github.com/owncloud/ocis/issues/1250)
- [webUISharingInternalGroups/shareWithGroups.feature:222](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingInternalGroups/shareWithGroups.feature#L222)
- [webUISharingInternalGroups/shareWithGroups.feature:208](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingInternalGroups/shareWithGroups.feature#L208)
- [webUISharingExpirationDate/shareWithExpirationDate.feature:21](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingExpirationDate/shareWithExpirationDate.feature#L21)

### [Listing shares via ocs API does not show path for parent folders](https://github.com/owncloud/ocis/issues/1231)
Expand Down Expand Up @@ -108,4 +108,4 @@ Other free text and markdown formatting can be used elsewhere in the document if
- [webUIRenameFiles/renameFiles.feature:250](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIRenameFiles/renameFiles.feature#L250)

### [PROPFIND to sub-folder of a shared resources with same name gives 404](https://github.com/owncloud/ocis/issues/3859)
- [webUISharingAcceptShares/acceptShares.feature:240](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingAcceptShares/acceptShares.feature#L240)
- [webUISharingAcceptShares/acceptShares.feature:163](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingAcceptShares/acceptShares.feature#L163)
Original file line number Diff line number Diff line change
Expand Up @@ -206,16 +206,13 @@ Feature: deleting files and folders

@issue-5435
Scenario: Delete a file and folder from shared with me page
Given the setting "shareapi_auto_accept_share" of app "core" has been set to "no" in the server
And user "Brian" has been created with default attributes and without skeleton files in the server
Given user "Brian" has been created with default attributes and without skeleton files in the server
And user "Brian" has created folder "simple-folder" in the server
And user "Brian" has created file "lorem.txt" in the server
And user "Brian" has shared folder "simple-folder" with user "Alice" in the server
And user "Brian" has shared file "lorem.txt" with user "Alice" in the server
And user "Alice" has logged in using the webUI
And the user has browsed to the shared-with-me page
When the user accepts share "simple-folder" offered by user "Brian Murphy" using the webUI
When the user accepts share "lorem.txt" offered by user "Brian Murphy" using the webUI
When the user unshares folder "simple-folder" using the webUI
And the user unshares file "lorem.txt" using the webUI
Then as "Alice" folder "simple-folder" should not exist in the server
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,13 +72,11 @@ Feature: Versions of a file

@issue-ocis-2319 @skipOnOCIS
Scenario: change the file content of a received shared file
Given the setting "shareapi_auto_accept_share" of app "core" has been set to "no" in the server
And the administrator has set the default folder for received shares to "Shares" in the server
Given the administrator has set the default folder for received shares to "Shares" in the server
And user "Brian" has been created with default attributes and without skeleton files in the server
And user "Brian" has created folder "simple-folder" in the server
And user "Brian" has uploaded file with content "a text file" to "simple-folder/lorem.txt" in the server
And user "Brian" has shared folder "simple-folder" with user "Alice" with "all" permissions in the server
And user "Alice" has accepted the share "simple-folder" offered by user "Brian" in the server
And user "Alice" has logged in using the webUI
And the user has opened folder "Shares"
And the user has opened folder "simple-folder"
Expand Down
5 changes: 1 addition & 4 deletions tests/acceptance/features/webUIFilesCopy/copy.feature
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ Feature: copy files and folders
So that I can work safely on a copy without changing the original

Background:
Given the setting "shareapi_auto_accept_share" of app "core" has been set to "no" in the server
And the administrator has set the default folder for received shares to "Shares" in the server
Given the administrator has set the default folder for received shares to "Shares" in the server
And user "Alice" has been created with default attributes and without skeleton files in the server

@smokeTest @ocisSmokeTest @skipOnIphoneResolution
Expand Down Expand Up @@ -91,7 +90,6 @@ Feature: copy files and folders
And user "Brian" has been created with default attributes and without skeleton files in the server
And user "Brian" has created folder "simple-folder" in the server
And user "Brian" has shared folder "simple-folder" with user "Alice" with "read" permissions in the server
And user "Alice" has accepted the share "Shares/simple-folder" offered by user "Brian" in the server
And user "Alice" has logged in using the webUI
When the user tries to copy file "lorem.txt" into folder "Shares/simple-folder" using the webUI
Then as "Alice" file "Shares/simple-folder/lorem.txt" should not exist in the server
Expand All @@ -103,7 +101,6 @@ Feature: copy files and folders
And user "Brian" has been created with default attributes and without skeleton files in the server
And user "Brian" has created folder "simple-folder" in the server
And user "Brian" has shared folder "simple-folder" with user "Alice" with "read" permissions in the server
And user "Alice" has accepted the share "Shares/simple-folder" offered by user "Brian" in the server
And user "Alice" has logged in using the webUI
When the user tries to copy folder "simple-empty-folder" into folder "Shares/simple-folder" using the webUI
Then as "Alice" file "Shares/simple-folder/simple-empty-folder" should not exist in the server
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,12 +104,10 @@ Feature: move files

@issue-ocis-873 @issue-6896 @skipOnOCIS
Scenario: sharee moves a file shared by sharer into another folder
Given the setting "shareapi_auto_accept_share" of app "core" has been set to "no" in the server
And the administrator has set the default folder for received shares to "Shares" in the server
Given the administrator has set the default folder for received shares to "Shares" in the server
And user "Brian" has been created with default attributes and without skeleton files in the server
And user "Alice" has uploaded file with content "test content" to "simple-folder/testFile.txt" in the server
And user "Alice" has shared folder "/simple-folder" with user "Brian" in the server
And user "Brian" has accepted the share "Shares/simple-folder" offered by user "Alice" in the server
And user "Brian" has logged in using the webUI
And user "Brian" has created folder "/Shares/testFolder" in the server
And the user has opened folder "Shares"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ Feature: Upload into a folder Shares
The folder "Shares" in ownCloud10 is a folder in which you can download or save files

Background:
Given the setting "shareapi_auto_accept_share" of app "core" has been set to "no" in the server
And the administrator has set the default folder for received shares to "Shares" in the server
Given the administrator has set the default folder for received shares to "Shares" in the server
And user "Alice" has been created with default attributes and without skeleton files in the server
And user "Brian" has been created with default attributes and without skeleton files in the server

Expand All @@ -21,15 +20,13 @@ Feature: Upload into a folder Shares
Scenario: the Shares folder exists after accepting the first shared file
Given user "Brian" has created file "lorem.txt" in the server
And user "Brian" has shared file "lorem.txt" with user "Alice" with "all" permissions in the server
And user "Alice" has accepted the share "Shares/lorem.txt" offered by user "Brian" in the server
When user "Alice" logs in using the webUI
Then folder "Shares" should be listed on the webUI

@issue-ocis-2322 @notToImplementOnOCIS
Scenario: upload of a file into a folder Shares in oc10
Given user "Brian" has created file "lorem.txt" in the server
And user "Brian" has shared file "lorem.txt" with user "Alice" with "all" permissions in the server
And user "Alice" has accepted the share "Shares/lorem.txt" offered by user "Brian" in the server
And user "Alice" has logged in using the webUI
And the user has opened folder "Shares"
When the user uploads file "new-lorem.txt" using the webUI
Expand All @@ -39,7 +36,6 @@ Feature: Upload into a folder Shares
Scenario: upload of a folder into a folder Shares in oc 10
Given user "Brian" has created file "lorem.txt" in the server
And user "Brian" has shared file "lorem.txt" with user "Alice" with "all" permissions in the server
And user "Alice" has accepted the share "Shares/lorem.txt" offered by user "Brian" in the server
And user "Alice" has logged in using the webUI
And the user has opened folder "Shares"
When the user uploads folder "PARENT" using the webUI
Expand All @@ -51,7 +47,6 @@ Feature: Upload into a folder Shares
Given user "Brian" has been created with default attributes and without skeleton files in the server
And user "Brian" has created file "lorem.txt" in the server
And user "Brian" has shared file "lorem.txt" with user "Alice" with "all" permissions in the server
And user "Alice" has accepted the share "Shares/lorem.txt" offered by user "Brian" in the server
And user "Alice" has logged in using the webUI
And the user has opened folder "Shares"
When the user creates a folder with the name "New folder" using the webUI
Expand All @@ -61,7 +56,6 @@ Feature: Upload into a folder Shares
Scenario: move a file or a folder into a folder Shares in oc10
Given user "Brian" has created file "lorem.txt" in the server
And user "Brian" has shared file "lorem.txt" with user "Alice" with "read" permissions in the server
And user "Alice" has accepted the share "Shares/lorem.txt" offered by user "Brian" in the server
And user "Alice" has created folder "NewFolder" in the server
And user "Alice" has logged in using the webUI
When the user moves folder "NewFolder" into folder "Shares" using the webUI
Expand All @@ -71,7 +65,6 @@ Feature: Upload into a folder Shares
Scenario: the user can delete files that they wrote into the folder Shares
Given user "Brian" has created file "lorem.txt" in the server
And user "Brian" has shared file "lorem.txt" with user "Alice" with "all" permissions in the server
And user "Alice" has accepted the share "Shares/lorem.txt" offered by user "Brian" in the server
And user "Alice" has logged in using the webUI
And user "Alice" has created folder "Shares/NewFolder" in the server
And user "Alice" has uploaded file with content "some data" to "Shares/textfile.txt" in the server
Expand Down
4 changes: 1 addition & 3 deletions tests/acceptance/features/webUIPreview/mediaPreview.feature
Original file line number Diff line number Diff line change
Expand Up @@ -151,11 +151,9 @@ Feature: display image in preview app on the webUI


Scenario: Open jpeg file with preview app in shared-with-me page
Given the setting "shareapi_auto_accept_share" of app "core" has been set to "no" in the server
And user "Brian" has been created with default attributes and without skeleton files in the server
Given user "Brian" has been created with default attributes and without skeleton files in the server
And user "Brian" has uploaded file "testavatar.jpeg" to "testavatar.jpeg" in the server
And user "Brian" has shared file "testavatar.jpeg" with user "Alice" with "all" permissions in the server
And user "Alice" has accepted the share "testavatar.jpeg" offered by user "Brian" in the server
And user "Alice" has logged in using the webUI
And the user browses to the shared-with-me page
When the user views the file "testavatar.jpeg" in the preview app by clicking on the file name using the webUI
Expand Down
Loading

0 comments on commit 8a05291

Please sign in to comment.