diff --git a/.drone.star b/.drone.star index 6d8e3fcc586..47e64ce0ce2 100644 --- a/.drone.star +++ b/.drone.star @@ -119,7 +119,6 @@ config = { "webUITextEditor", ], "oCISSharingInternal1": [ - "webUISharingInternalGroups", "webUISharingInternalGroupsEdgeCases", ], "oCISSharingInternal2": [ @@ -128,14 +127,10 @@ config = { "oCISSharingInternal3": [ "webUISharingInternalGroupsSharingIndicator", "webUISharingInternalUsersSharingIndicator", - "webUISharingInternalUsersShareWithPage", ], "oCISSharingAutocompletionResharing": [ "webUISharingAutocompletion", ], - "oCISSharingPerm1": [ - "webUISharingPermissionsUsers", - ], "oCISSharingPublic1": [ "webUISharingPublicBasic", ], @@ -185,13 +180,10 @@ basicTestSuites = [ "webUIRenameFolders", "webUISharingAcceptShares", "webUISharingAutocompletion", - "webUISharingInternalGroups", "webUISharingInternalGroupsEdgeCases", "webUISharingInternalGroupsSharingIndicator", "webUISharingInternalUsers", - "webUISharingInternalUsersShareWithPage", "webUISharingInternalUsersSharingIndicator", - "webUISharingPermissionsUsers", "webUISharingPublicBasic", "webUISharingPublicDifferentRoles", "webUISharingPublicManagement", diff --git a/tests/acceptance/features/webUISharingInternalGroups/shareWithGroups.feature b/tests/acceptance/features/webUISharingInternalGroups/shareWithGroups.feature deleted file mode 100644 index 193f789b851..00000000000 --- a/tests/acceptance/features/webUISharingInternalGroups/shareWithGroups.feature +++ /dev/null @@ -1,68 +0,0 @@ -Feature: Sharing files and folders with internal groups - As a user - I want to share files and folders with groups - So that those groups can access the files and folders - - Background: - Given the administrator has set the default folder for received shares to "Shares" in the server - And these users have been created with default attributes and without skeleton files in the server: - | username | - | Alice | - | Brian | - | Carol | - And group "grp1" has been created in the server - And user "Alice" has been added to group "grp1" in the server - And user "Brian" has been added to group "grp1" in the server - - - Scenario: share a folder with multiple collaborators and check collaborator list order - Given group "grp11" has been created in the server - And user "Carol" has created folder "simple-folder" in the server - And user "Carol" has logged in using the webUI - When the user shares folder "simple-folder" with group "grp11" as "Viewer" using the webUI - And the user shares folder "simple-folder" with user "Brian Murphy" as "Viewer" using the webUI - And the user shares folder "simple-folder" with group "grp1" as "Viewer" using the webUI - And the user shares folder "simple-folder" with user "Alice Hansen" as "Viewer" using the webUI - Then the current collaborators list should have order "Alice Hansen,Brian Murphy,grp1,grp11" - - - Scenario: user shares the file/folder with a group and delete the share with group - Given user "Alice" has created file "lorem.txt" in the server - And user "Alice" has logged in using the webUI - And user "Alice" has shared file "lorem.txt" with group "grp1" in the server - When the user opens the share dialog for file "lorem.txt" using the webUI - Then group "grp1" should be listed as "Can edit" in the collaborators list on the webUI - When the user deletes "grp1" as collaborator for the current file using the webUI - Then group "grp1" should not be listed in the collaborators list on the webUI - And file "lorem.txt" should not be listed in shared-with-others page on the webUI - And as "Brian" file "/Shares/lorem.txt" should not exist in the server - And as "Brian" file "lorem (2).txt" should not exist in the server - - - Scenario: user shares the file/folder with multiple internal users and delete the share with one user - Given group "grp2" has been created in the server - And user "Alice" has created file "lorem.txt" in the server - And user "Carol" has been added to group "grp2" in the server - And user "Alice" has logged in using the webUI - And user "Alice" has shared file "lorem.txt" with group "grp1" in the server - And user "Alice" has shared file "lorem.txt" with group "grp2" in the server - When the user opens the share dialog for file "lorem.txt" using the webUI - Then group "grp1" should be listed as "Can edit" in the collaborators list on the webUI - And group "grp2" should be listed as "Can edit" in the collaborators list on the webUI - When the user deletes "grp1" as collaborator for the current file using the webUI - Then group "grp1" should not be listed in the collaborators list on the webUI - And group "grp2" should be listed as "Can edit" in the collaborators list on the webUI - And file "lorem.txt" should be listed in shared-with-others page on the webUI - And as "Brian" file "/Shares/lorem.txt" should not exist in the server - But as "Carol" file "/Shares/lorem.txt" should exist in the server - - - Scenario: share a folder with other group and then it should be listed on Shared with Others page - Given user "Alice" has created folder "simple-folder" in the server - And user "Alice" has logged in using the webUI - And user "Alice" has shared folder "simple-folder" with user "Brian" in the server - And user "Alice" has shared folder "simple-folder" with group "grp1" in the server - When the user browses to the shared-with-others page - Then the following resources should have the following collaborators - | fileName | expectedCollaborators | - | simple-folder | Brian Murphy, grp1 | diff --git a/tests/acceptance/features/webUISharingInternalUsers/shareWithUsers.feature b/tests/acceptance/features/webUISharingInternalUsers/shareWithUsers.feature index 50ae6c89d43..a110c14e5df 100644 --- a/tests/acceptance/features/webUISharingInternalUsers/shareWithUsers.feature +++ b/tests/acceptance/features/webUISharingInternalUsers/shareWithUsers.feature @@ -11,49 +11,6 @@ Feature: Sharing files and folders with internal users | Brian | And user "Brian" has created folder "simple-folder" in the server - @issue-ocis-2260 @disablePreviews - Scenario: user shares the file/folder with multiple internal users and delete the share with one user - Given user "Carol" has been created with default attributes and without skeleton files in the server - And user "Alice" has created file "lorem.txt" in the server - And user "Alice" has logged in using the webUI - And user "Alice" has shared file "lorem.txt" with user "Brian" in the server - And user "Alice" has shared file "lorem.txt" with user "Carol" in the server - When the user opens the share dialog for file "lorem.txt" using the webUI - Then user "Brian Murphy" should be listed as "Can edit" in the collaborators list on the webUI - And user "Carol King" should be listed as "Can edit" in the collaborators list on the webUI - And as "Brian" file "Shares/lorem.txt" should exist in the server - And as "Carol" file "Shares/lorem.txt" should exist in the server - When the user deletes "Brian Murphy" as collaborator for the current file using the webUI - Then user "Brian Murphy" should not be listed in the collaborators list on the webUI - And user "Carol King" should be listed as "Can edit" in the collaborators list on the webUI - And file "lorem.txt" should be listed in shared-with-others page on the webUI - And as "Brian" file "Shares/lorem.txt" should not exist in the server - But as "Carol" file "Shares/lorem.txt" should exist in the server - - @disablePreviews - Scenario: Try to share file and folder that used to exist but does not anymore - Given user "Alice" has created folder "simple-folder" in the server - And user "Alice" has created file "lorem.txt" in the server - And user "Alice" has logged in using the webUI - And the following files have been deleted by user "Alice" in the server - | name | - | lorem.txt | - | simple-folder | - When the user shares file "lorem.txt" with user "Brian Murphy" as "Editor" using the webUI - Then the "error" message with header 'Failed to add share for "Brian Murphy"' should be displayed on the webUI - And the user clears all error message from the webUI - And user "Brian Murphy" should not be listed in the collaborators list on the webUI - When the user clears all error message from the webUI - And the user shares folder "simple-folder" with user "Brian Murphy" as "Editor" using the webUI - Then the "error" message with header 'Failed to add share for "Brian Murphy"' should be displayed on the webUI - And the user clears all error message from the webUI - And user "Brian Murphy" should not be listed in the collaborators list on the webUI - When the user reloads the current page of the webUI - Then file "lorem.txt" should not be listed on the webUI - And folder "simple-folder" should not be listed on the webUI - And as "Alice" file "lorem.txt" should not exist in the server - And as "Alice" folder "simple-folder" should not exist in the server - @issue-2897 @issue-ocis-2260 @disablePreviews Scenario: sharing details of items inside a shared folder ("via" info) Given user "Alice" has created folder "simple-folder" in the server @@ -68,24 +25,3 @@ Feature: Sharing files and folders with internal users When the user opens the details dialog for file "lorem.txt" using the webUI Then the shared-via path in the details dialog should be "/simple-folder" - @issue-4192 @disablePreviews - Scenario: sharing file after renaming it is possible - Given user "Alice" has created file "lorem.txt" in the server - And user "Alice" has logged in using the webUI - And user "Alice" has uploaded file with content "test" to "lorem.txt" in the server - And the user has renamed file "lorem.txt" to "new-lorem.txt" - When the user shares resource "new-lorem.txt" with user "Brian Murphy" using the quick action on the webUI - Then user "Brian Murphy" should be listed as "Can view" in the collaborators list for file "new-lorem.txt" on the webUI - - - Scenario: user shares the file/folder with another internal user and delete the share with user - Given user "Alice" has created file "lorem.txt" in the server - And user "Alice" has logged in using the webUI - And user "Alice" has shared file "lorem.txt" with user "Brian" in the server - When the user opens the share dialog for file "lorem.txt" using the webUI - Then user "Brian Murphy" should be listed as "Can edit" in the collaborators list on the webUI - And as "Brian" file "Shares/lorem.txt" should exist in the server - When the user deletes "Brian Murphy" as collaborator for the current file using the webUI - Then user "Brian Murphy" should not be listed in the collaborators list on the webUI - And file "lorem.txt" should not be listed in shared-with-others page on the webUI - And as "Brian" file "Shares/lorem.txt" should not exist in the server diff --git a/tests/acceptance/features/webUISharingInternalUsersShareWithPage/shareWithUsers.feature b/tests/acceptance/features/webUISharingInternalUsersShareWithPage/shareWithUsers.feature deleted file mode 100644 index 64285f07d5e..00000000000 --- a/tests/acceptance/features/webUISharingInternalUsersShareWithPage/shareWithUsers.feature +++ /dev/null @@ -1,117 +0,0 @@ -Feature: Shares in share-with pages - As a user - I want to check share-with pages - So that I can know what is shared with me and by me - - Background: - Given the administrator has set the default folder for received shares to "Shares" in the server - And these users have been created with default attributes and without skeleton files in the server: - | username | - | Alice | - | Brian | - And user "Brian" has created folder "simple-folder" in the server - - @issue-4192 - Scenario: share a folder with other user and then it should be listed on Shared with You for other user - Given user "Brian" has created file "lorem.txt" in the server - And user "Brian" has renamed folder "simple-folder" to "new-simple-folder" in the server - And user "Brian" has renamed file "lorem.txt" to "ipsum.txt" in the server - And user "Brian" has shared file "ipsum.txt" with user "Alice" in the server - And user "Brian" has shared folder "new-simple-folder" with user "Alice" in the server - And user "Alice" has logged in using the webUI - When the user browses to the shared-with-me page - Then file "ipsum.txt" should be listed on the webUI - And folder "new-simple-folder" should be listed on the webUI - - - Scenario: share a folder with other user and then it should be listed on Shared with Others page - Given user "Carol" 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 logged in using the webUI - And user "Brian" has shared file "lorem.txt" with user "Alice" in the server - And user "Brian" has shared folder "simple-folder" with user "Alice" in the server - And user "Brian" has shared folder "simple-folder" with user "Carol" in the server - When the user browses to the shared-with-others page - Then the following resources should have the following collaborators - | fileName | expectedCollaborators | - | lorem.txt | Alice Hansen | - | simple-folder | Alice Hansen, Carol King | - - @issue-2480 - Scenario: check file with same name but different paths are displayed correctly in shared with others page - Given user "Brian" has created file "lorem.txt" in the server - And user "Brian" has created file "simple-folder/lorem.txt" in the server - And user "Brian" has shared file "lorem.txt" with user "Alice" in the server - And user "Brian" has shared file "simple-folder/lorem.txt" with user "Alice" in the server - And user "Brian" has logged in using the webUI - When the user browses to the shared-with-others page - Then file "lorem.txt" should be listed on the webUI - - - Scenario: send share shows up on shared-with-others page - Given user "Alice" has created folder "simple-folder" in the server - And user "Alice" has created file "data.zip" in the server - And user "Alice" has shared folder "simple-folder" with user "Brian" in the server - And user "Alice" has logged in using the webUI - When the user browses to the shared-with-others page using the webUI - Then folder "simple-folder" should be listed on the webUI - But file "data.zip" should not be listed on the webUI - - - Scenario: received share shows up on shared-with-me page - Given user "Alice" has created folder "simple-folder" in the server - And user "Alice" has created file "data.zip" in the server - And user "Alice" has shared folder "simple-folder" with user "Brian" in the server - And user "Brian" has logged in using the webUI - When the user browses to the shared-with-me page - Then folder "simple-folder" should be listed on the webUI - But file "data.zip" should not be listed on the webUI - - @issue-4170 - Scenario: clicking a folder on shared-with-me page jumps to the main file list inside the folder - Given user "Alice" has created folder "simple-folder" in the server - And user "Alice" has shared folder "simple-folder" with user "Brian" in the server - And user "Alice" has created file "simple-folder/collaborate-on-this.txt" in the server - And user "Brian" has logged in using the webUI - When the user browses to the shared-with-me page - And the user opens folder "simple-folder" using the webUI - Then file "collaborate-on-this.txt" should be listed on the webUI - - @skipOnOC10 - Scenario: unsharing an entry on the shared-with-me page unshares from self - Given user "Alice" has created folder "simple-folder" in the server - And user "Alice" has shared folder "simple-folder" with user "Brian" in the server - And user "Brian" has logged in using the webUI - When the user browses to the shared-with-me page - And the user unshares folder "simple-folder" using the webUI - And the user browses to the files page - Then folder "Shares" should not be listed on the webUI - - @issue-4582 @issue-ocis-2266 - Scenario: unsharing multiple entries on the shared-with-me page - Given user "Alice" has created folder "simple-folder" in the server - And user "Alice" has created file "lorem.txt" in the server - And user "Alice" has shared folder "simple-folder" with user "Brian" in the server - And user "Alice" has shared file "lorem.txt" with user "Brian" in the server - And user "Brian" has logged in using the webUI - And the user browses to the shared-with-me page in accepted shares view - When the user batch unshares these files using the webUI - | name | - | simple-folder | - | lorem.txt | - And the user browses to the shared-with-me page in declined shares view - Then the unshared elements should be in declined state on the webUI - - - Scenario: share a file with another internal user via collaborators quick action - Given user "Alice" has created folder "simple-folder" in the server - And user "Alice" has logged in using the webUI - When the user shares resource "simple-folder" with user "Brian Murphy" using the quick action on the webUI - Then user "Brian Murphy" should be listed as "Can view" in the collaborators list for folder "simple-folder" on the webUI - And user "Brian" should have received a share with these details in the server: - | field | value | - | uid_owner | Alice | - | share_with | Brian | - | file_target | /Shares/simple-folder | - | item_type | folder | - | permissions | read,share | diff --git a/tests/acceptance/features/webUISharingPermissionsUsers/sharePermissionsUsers.feature b/tests/acceptance/features/webUISharingPermissionsUsers/sharePermissionsUsers.feature deleted file mode 100644 index 9126111f77a..00000000000 --- a/tests/acceptance/features/webUISharingPermissionsUsers/sharePermissionsUsers.feature +++ /dev/null @@ -1,173 +0,0 @@ -Feature: Sharing files and folders with internal users with different permissions - As a user - I want to set different permissions on shared files and folders with other users - So that I can control the access on those files/folders by other collaborators - - Background: - Given the administrator has set the default folder for received shares to "Shares" in the server - And these users have been created with default attributes and without skeleton files in the server: - | username | - | Alice | - | Brian | - And user "Brian" has created folder "simple-folder" in the server - And user "Brian" has created folder "simple-empty-folder" in the server - And user "Brian" has created folder "simple-folder/simple-empty-folder" in the server - And user "Brian" has uploaded file "data.zip" to "data.zip" in the server - And user "Brian" has uploaded file "lorem.txt" to "lorem.txt" in the server - And user "Brian" has uploaded file "lorem.txt" to "simple-folder/lorem.txt" in the server - - @issue-ocis-2260 - Scenario: Change permissions of the previously shared folder to read, share - Given user "Brian" has shared folder "simple-folder" with user "Alice" with "read" permissions in the server - And user "Brian" has logged in using the webUI - Then no custom permissions should be set for collaborator "Alice Hansen" for folder "simple-folder" on the webUI - When the user sets custom permission for current role of collaborator "Alice Hansen" for folder "simple-folder" to "share" using the webUI - Then user "Alice" should have received a share with these details in the server: - | field | value | - | uid_owner | Brian | - | share_with | Alice | - | file_target | /Shares/simple-folder | - | item_type | folder | - | permissions | read, share | - - @issue-1853 @issue-ocis-2260 - Scenario: Change permissions of the previously shared folder to all permissions - Given user "Brian" has shared folder "simple-folder" with user "Alice" with "read, share, create, delete" permissions in the server - And user "Brian" has logged in using the webUI - Then custom permissions "share, create, delete" should be set for user "Alice Hansen" for folder "simple-folder" on the webUI - When the user sets custom permission for current role of collaborator "Alice Hansen" for folder "simple-folder" to "create, delete, share" using the webUI - Then custom permission "share, create, delete" should be set for user "Alice Hansen" for folder "simple-folder" on the webUI - And user "Alice" should have received a share with these details in the server: - | field | value | - | uid_owner | Brian | - | share_with | Alice | - | file_target | /Shares/simple-folder | - | item_type | folder | - | permissions | read, share, create, delete | - - @issue-1853 @issue-ocis-2260 - Scenario: Change permissions of the previously shared folder to update, delete - Given user "Brian" has shared folder "simple-folder" with user "Alice" with "read, share, create" permissions in the server - And user "Brian" has logged in using the webUI - Then custom permissions "share, create" should be set for user "Alice Hansen" for folder "simple-folder" on the webUI - When the user sets custom permission for current role of collaborator "Alice Hansen" for folder "simple-folder" to "delete, update" using the webUI - Then custom permission "delete, update" should be set for user "Alice Hansen" for folder "simple-folder" on the webUI - And user "Alice" should have received a share with these details in the server: - | field | value | - | uid_owner | Brian | - | share_with | Alice | - | file_target | /Shares/simple-folder | - | item_type | folder | - | permissions | read, update, delete | - - @issue-ocis-2260 - Scenario: Change permissions of the previously shared folder to read, create, share - Given user "Brian" has shared folder "simple-folder" with user "Alice" with "read, delete" permissions in the server - And user "Brian" has logged in using the webUI - Then custom permissions "delete" should be set for user "Alice Hansen" for folder "simple-folder" on the webUI - When the user sets custom permission for current role of collaborator "Alice Hansen" for folder "simple-folder" to "create, share" using the webUI - Then custom permission "create, share" should be set for user "Alice Hansen" for folder "simple-folder" on the webUI - And user "Alice" should have received a share with these details in the server: - | field | value | - | uid_owner | Brian | - | share_with | Alice | - | file_target | /Shares/simple-folder | - | item_type | folder | - | permissions | read, create, share | - - @issue-ocis-2260 - Scenario Outline: share a folder with another internal user assigning a role and the permissions - Given user "Brian" has logged in using the webUI - When the user shares folder "simple-folder" with user "Alice Hansen" as "" with permissions "" using the webUI - Then user "Alice Hansen" should be listed as "" in the collaborators list for folder "simple-folder" on the webUI - And custom permissions "" should be set for user "Alice Hansen" for folder "simple-folder" on the webUI - And user "Alice" should have received a share with these details in the server: - | field | value | - | uid_owner | Brian | - | share_with | Alice | - | file_target | /Shares/simple-folder | - | item_type | folder | - | permissions | | - Examples: - | role | displayed-role | extra-permissions | displayed-permissions | permissions | - | Viewer | Can view | , | share | read, share | - | Editor | Can edit | , | delete, share, create, update | all | - | Custom permissions | Custom permissions | share, create | share, create | read, share, create | - | Custom permissions | Custom permissions | update, share | share, update | read, update, share | - | Custom permissions | Can edit | delete, share, create, update | delete, share, create, update | read, share, delete, update, create | - - @issue-ocis-2260 - Scenario Outline: Change permissions of the previously shared file - Given user "Brian" has shared file "lorem.txt" with user "Alice" with "" permissions in the server - And user "Brian" has logged in using the webUI - Then custom permission "" should be set for user "Alice Hansen" for file "lorem.txt" on the webUI - When the user sets custom permission for current role of collaborator "Alice Hansen" for file "lorem.txt" to "share" using the webUI - Then custom permission "" should be set for user "Alice Hansen" for file "lorem.txt" on the webUI - And user "Alice" should have received a share with these details in the server: - | field | value | - | uid_owner | Brian | - | share_with | Alice | - | file_target | /Shares/lorem.txt | - | item_type | file | - | permissions | | - Examples: - | initial-permissions | permissions | displayed-permissions | - | read, update | read, share | update | - | read | read, share | , | - - - Scenario: Delete all custom permissions of the previously shared folder - Given user "Brian" has shared folder "simple-folder" with user "Alice" with "read, update" permissions in the server - And user "Brian" has logged in using the webUI - When the user disables all the custom permissions of collaborator "Alice Hansen" for folder "simple-folder" using the webUI - Then no custom permissions should be set for collaborator "Alice Hansen" for folder "simple-folder" on the webUI - And user "Alice" should have received a share with these details in the server: - | field | value | - | uid_owner | Brian | - | share_with | Alice | - | file_target | /Shares/simple-folder | - | item_type | folder | - | permissions | read | - - @issue-ocis-2260 - Scenario Outline: share a file with another internal user assigning a role and the permissions - Given user "Brian" has logged in using the webUI - When the user shares file "lorem.txt" with user "Alice Hansen" as "" with permissions "" using the webUI - Then user "Alice Hansen" should be listed as "" in the collaborators list for file "lorem.txt" on the webUI - And custom permissions "" should be set for user "Alice Hansen" for file "lorem.txt" on the webUI - And user "Alice" should have received a share with these details in the server: - | field | value | - | uid_owner | Brian | - | share_with | Alice | - | file_target | /Shares/lorem.txt | - | item_type | file | - | permissions | | - Examples: - | role | displayed-role | collaborators-permissions | displayed-permissions | permissions | - | Viewer | Can view | , | share | read, share | - | Editor | Can edit | , | share, update | read, share, update | - | Custom permissions | Can edit | share, update | share, update | read, share, update | - - @issue-ocis-2260 - Scenario: Share a folder without share permissions using API and check if it is listed on the collaborators list for original owner - Given user "Brian" has shared folder "simple-folder" with user "Alice" with "read" permissions in the server - And user "Brian" has logged in using the webUI - When the user opens the share dialog for folder "simple-folder" using the webUI - Then user "Alice Hansen" should be listed as "Custom permissions" in the collaborators list for folder "simple-folder" on the webUI - And no custom permissions should be set for collaborator "Alice Hansen" for folder "simple-folder" on the webUI - - - Scenario: Resource owner upgrades share permissions of a re-share - Given user "Carol" has been created with default attributes and without skeleton files in the server - And user "Brian" has shared folder "simple-folder" with user "Alice" with "read, share, delete" permissions in the server - And user "Alice" has shared folder "/Shares/simple-folder" with user "Carol" with "read, delete" permissions in the server - And user "Brian" has logged in using the webUI - When the user sets custom permission for current role of collaborator "Carol King" for folder "simple-folder" to "delete, update" using the webUI - Then custom permissions "delete, update" should be set for user "Carol King" for folder "simple-folder" on the webUI - And user "Carol" should have received a share with these details in the server: - | field | value | - | uid_owner | Alice | - | share_with | Carol | - | file_target | /Shares/simple-folder | - | item_type | folder | - | permissions | delete, read, update | diff --git a/tests/e2e/cucumber/features/journeys/kindergarten.feature b/tests/e2e/cucumber/features/journeys/kindergarten.feature index 47a365b5c3e..a663e6097da 100644 --- a/tests/e2e/cucumber/features/journeys/kindergarten.feature +++ b/tests/e2e/cucumber/features/journeys/kindergarten.feature @@ -44,9 +44,9 @@ Feature: Kindergarten can use web to organize a day | resource | recipient | type | role | resourceType | | groups/Pre-Schools Pirates/meal plan | Brian | user | Can edit | folder | | groups/Pre-Schools Pirates/meal plan | Carol | user | Can edit | folder | - | groups/Pre-Schools Pirates/meal plan/lorem-big.txt | Brian | user | Can view | file | + | groups/Pre-Schools Pirates/meal plan/lorem-big.txt | sales | group | Can view | file | | groups/Pre-Schools Pirates/meal plan/lorem-big.txt | Carol | user | Can view | file | - | groups/Kindergarten Koalas/meal plan | sales | group | custom_permissions:read,update,delete | folder | + | groups/Kindergarten Koalas/meal plan | sales | group | custom_permissions:read | folder | | groups/Kindergarten Koalas/meal plan | security | group | custom_permissions:read,update,delete | folder | | groups/Kindergarten Koalas/meal plan/lorem.txt | sales | group | custom_permissions:read | file | | groups/Kindergarten Koalas/meal plan/lorem.txt | security | group | custom_permissions:read | file | @@ -54,6 +54,13 @@ Feature: Kindergarten can use web to organize a day | groups/Teddy Bear Daycare/meal plan | Carol | user | custom_permissions:read,update,create | folder | | groups/Teddy Bear Daycare/meal plan/data.zip | Brian | user | custom_permissions:read,update | file | | groups/Teddy Bear Daycare/meal plan/data.zip | Carol | user | custom_permissions:read,update | file | + # update share + And "Alice" updates following sharee role + | resource | recipient | type | role | resourceType | + | groups/Pre-Schools Pirates/meal plan | Carol | user | Can view | folder | + | groups/Pre-Schools Pirates/meal plan/lorem-big.txt | sales | group | Can edit | file | + | groups/Kindergarten Koalas/meal plan | sales | group | custom_permissions:read,update,delete | folder | + | groups/Teddy Bear Daycare/meal plan/data.zip | Carol | user | custom_permissions:read,update | file | # Then what do we check for to be confident that the above things done by Alice have worked? When "Brian" logs in And "Brian" opens the "files" app diff --git a/tests/e2e/cucumber/features/smoke/copyMove.feature b/tests/e2e/cucumber/features/smoke/copyMove.feature index 8f80bf8090b..30742f2a212 100644 --- a/tests/e2e/cucumber/features/smoke/copyMove.feature +++ b/tests/e2e/cucumber/features/smoke/copyMove.feature @@ -175,13 +175,11 @@ Feature: Copy When "Alice" copies the following resource using sidebar-panel | resource | to | option | | example1.txt | folder1 | keep both | - # issue https://github.com/owncloud/web/issues/10515 - # | example1.txt | folder1 | replace | + | example1.txt | folder1 | replace | And "Alice" moves the following resource using sidebar-panel - | resource | to | option | - | example1.txt | sub/folder1 | keep both | - # issue https://github.com/owncloud/web/issues/10515 - # | folder1/example1.txt | sub/folder1 | replace | + | resource | to | option | + | example1.txt | sub/folder1 | keep both | + | folder1/example1.txt | sub/folder1 | replace | # copy and move folder And "Alice" copies the following resource using sidebar-panel @@ -195,4 +193,3 @@ Feature: Copy # issue https://github.com/owncloud/web/issues/10515 # | sub1/folder1 | sub | replace | And "Alice" logs out - \ No newline at end of file diff --git a/tests/e2e/cucumber/features/smoke/shares/denyShareAccess.feature b/tests/e2e/cucumber/features/smoke/shares/denyShareAccess.feature index e0861f07e51..7c526848040 100644 --- a/tests/e2e/cucumber/features/smoke/shares/denyShareAccess.feature +++ b/tests/e2e/cucumber/features/smoke/shares/denyShareAccess.feature @@ -12,7 +12,7 @@ Feature: deny share access | folder_to_shared/folder | | folder_to_shared/folder_to_deny | And "Alice" opens the "files" app - And "Alice" shares the following resource using the sidebar panel + And "Alice" shares the following resource using the quick action | resource | recipient | type | role | resourceType | | folder_to_shared | Brian | user | Can view | folder | And "Alice" opens folder "folder_to_shared" diff --git a/tests/e2e/cucumber/features/smoke/shares/share.feature b/tests/e2e/cucumber/features/smoke/shares/share.feature index 423188c1e17..7c5ab8bace4 100644 --- a/tests/e2e/cucumber/features/smoke/shares/share.feature +++ b/tests/e2e/cucumber/features/smoke/shares/share.feature @@ -152,8 +152,12 @@ Feature: share | Type | User | And "Alice" sets the expiration date of share "myfolder" of group "sales" to "+3 days" And "Alice" checks the following access details of share "myfolder" for group "sales" - | Name | sales department | - | Type | Group | + | Name | sales department | + | Type | Group | + # remove share with group + When "Alice" removes following sharee + | resource | recipient | type | + | myfolder | sales | group | And "Alice" logs out And "Brian" navigates to the shared with me page @@ -173,9 +177,9 @@ Feature: share | testfile.txt | example text | And "Alice" opens the "files" app And "Alice" shares the following resource using the sidebar panel - | resource | recipient | type | role | - | testfile.txt | Brian | user | Can view | - | test-folder | Brian | user | Can view | + | resource | recipient | type | role | + | testfile.txt | Brian | user | Can view | + | test-folder | Brian | user | Can view | And "Alice" logs out And "Carol" logs in And "Carol" creates the following folder in personal space using API @@ -199,3 +203,28 @@ Feature: share # | testfile (1).txt | # | test-folder (1) | And "Brian" logs out + + + Scenario: check file with same name but different paths are displayed correctly in shared with others page + Given "Admin" creates following users using API + | id | + | Carol | + And "Alice" logs in + And "Alice" creates the following folder in personal space using API + | name | + | test-folder | + And "Alice" creates the following files into personal space using API + | pathToFile | content | + | testfile.txt | example text | + | test-folder/testfile.txt | some text | + And "Alice" opens the "files" app + And "Alice" shares the following resource using API + | resource | recipient | type | role | + | testfile.txt | Brian | user | Can edit | + | test-folder/testfile.txt | Brian | user | Can edit | + And "Alice" navigates to the shared with others page + Then following resources should be displayed in the files list for user "Alice" + | resource | + | testfile.txt | + | test-folder/testfile.txt | + And "Alice" logs out diff --git a/tests/e2e/support/objects/app-files/resource/actions.ts b/tests/e2e/support/objects/app-files/resource/actions.ts index 6460256bb05..073346ae5ba 100644 --- a/tests/e2e/support/objects/app-files/resource/actions.ts +++ b/tests/e2e/support/objects/app-files/resource/actions.ts @@ -738,7 +738,7 @@ export const pasteResource = async (args: moveOrCopyResourceArgs): Promise page.waitForResponse( (resp) => resp.url().endsWith(resource) && - resp.status() === 201 && + resp.ok && resp.request().method() === action.toUpperCase() ), option === 'replace'