diff --git a/tests/acceptance/expected-failures-with-ocis-server-owncloud-storage.md b/tests/acceptance/expected-failures-with-ocis-server-owncloud-storage.md index c3dce97cad5..3b052194ab1 100644 --- a/tests/acceptance/expected-failures-with-ocis-server-owncloud-storage.md +++ b/tests/acceptance/expected-failures-with-ocis-server-owncloud-storage.md @@ -308,12 +308,6 @@ Other free text and markdown formatting can be used elsewhere in the document if - [webUISharingFilePermissionMultipleUsers/shareFileWithMultipleUsers.feature:62](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingFilePermissionMultipleUsers/shareFileWithMultipleUsers.feature#L62) - [webUISharingFilePermissionMultipleUsers/shareFileWithMultipleUsers.feature:63](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingFilePermissionMultipleUsers/shareFileWithMultipleUsers.feature#L63) - [webUISharingFilePermissionMultipleUsers/shareFileWithMultipleUsers.feature:64](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingFilePermissionMultipleUsers/shareFileWithMultipleUsers.feature#L64) -- [webUISharingFolderAdvancedPermissionMultipleUsers/sharedFolderWithMultipleUsersAdvancedPermissions.feature:111](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingFolderAdvancedPermissionMultipleUsers/sharedFolderWithMultipleUsersAdvancedPermissions.feature#L111) -- [webUISharingFolderAdvancedPermissionMultipleUsers/sharedFolderWithMultipleUsersAdvancedPermissions.feature:112](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingFolderAdvancedPermissionMultipleUsers/sharedFolderWithMultipleUsersAdvancedPermissions.feature#L112) -- [webUISharingFolderAdvancedPermissionMultipleUsers/sharedFolderWithMultipleUsersAdvancedPermissions.feature:113](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingFolderAdvancedPermissionMultipleUsers/sharedFolderWithMultipleUsersAdvancedPermissions.feature#L113) -- [webUISharingFolderAdvancedPermissionMultipleUsers/sharedFolderWithMultipleUsersAdvancedPermissions.feature:115](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingFolderAdvancedPermissionMultipleUsers/sharedFolderWithMultipleUsersAdvancedPermissions.feature#L115) -- [webUISharingFolderAdvancedPermissionMultipleUsers/sharedFolderWithMultipleUsersAdvancedPermissions.feature:116](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingFolderAdvancedPermissionMultipleUsers/sharedFolderWithMultipleUsersAdvancedPermissions.feature#L116) -- [webUISharingFolderAdvancedPermissionMultipleUsers/sharedFolderWithMultipleUsersAdvancedPermissions.feature:117](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingFolderAdvancedPermissionMultipleUsers/sharedFolderWithMultipleUsersAdvancedPermissions.feature#L117) - [webUISharingFolderPermissionMultipleUsers/shareFolderWithMultipleUsers.feature:60](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingFolderPermissionMultipleUsers/shareFolderWithMultipleUsers.feature#L60) - [webUISharingFolderPermissionMultipleUsers/shareFolderWithMultipleUsers.feature:61](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingFolderPermissionMultipleUsers/shareFolderWithMultipleUsers.feature#L61) - [webUISharingFolderPermissionMultipleUsers/shareFolderWithMultipleUsers.feature:62](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingFolderPermissionMultipleUsers/shareFolderWithMultipleUsers.feature#L62) @@ -417,8 +411,6 @@ Other free text and markdown formatting can be used elsewhere in the document if - [webUITrashbinRestore/trashbinRestore.feature:240](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUITrashbinRestore/trashbinRestore.feature#L240) ### [Adjust web UI test scenarios that demonstrate fixed bugs](https://github.com/owncloud/web/issues/4601) -- [webUISharingFolderAdvancedPermissionMultipleUsers/sharedFolderWithMultipleUsersAdvancedPermissions.feature:165](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingFolderAdvancedPermissionMultipleUsers/sharedFolderWithMultipleUsersAdvancedPermissions.feature#L165) -- [webUISharingFolderAdvancedPermissionMultipleUsers/sharedFolderWithMultipleUsersAdvancedPermissions.feature:166](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingFolderAdvancedPermissionMultipleUsers/sharedFolderWithMultipleUsersAdvancedPermissions.feature#L166) - [webUISharingPermissionsUsers/sharePermissionsUsers.feature:32](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingPermissionsUsers/sharePermissionsUsers.feature#L32) - [webUISharingPermissionsUsers/sharePermissionsUsers.feature:136](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingPermissionsUsers/sharePermissionsUsers.feature#L136) - [webUISharingPublic/shareByPublicLink.feature:791](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingPublic/shareByPublicLink.feature#L791) @@ -438,3 +430,10 @@ Other free text and markdown formatting can be used elsewhere in the document if ### [Moving files in a shared folder causes errors but succeeds](https://github.com/owncloud/ocis/issues/873) - [webUIMoveFilesFolders/moveFiles.feature:122](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIMoveFilesFolders/moveFiles.feature:122#L122) + +### [enable re-sharing is not possible](https://github.com/owncloud/ocis/issues/1743) +- [webUISharingFolderAdvancedPermissionMultipleUsers/sharedFolderWithMultipleUsersAdvancedPermissions.feature:111](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingFolderAdvancedPermissionMultipleUsers/sharedFolderWithMultipleUsersAdvancedPermissions.feature#L111) +- [webUISharingFolderAdvancedPermissionMultipleUsers/sharedFolderWithMultipleUsersAdvancedPermissions.feature:112](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingFolderAdvancedPermissionMultipleUsers/sharedFolderWithMultipleUsersAdvancedPermissions.feature#L112) +- [webUISharingFolderAdvancedPermissionMultipleUsers/sharedFolderWithMultipleUsersAdvancedPermissions.feature:113](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingFolderAdvancedPermissionMultipleUsers/sharedFolderWithMultipleUsersAdvancedPermissions.feature#L113) +- [webUISharingFolderAdvancedPermissionMultipleUsers/sharedFolderWithMultipleUsersAdvancedPermissions.feature:115](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingFolderAdvancedPermissionMultipleUsers/sharedFolderWithMultipleUsersAdvancedPermissions.feature#L115) +- [webUISharingFolderAdvancedPermissionMultipleUsers/sharedFolderWithMultipleUsersAdvancedPermissions.feature:116](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingFolderAdvancedPermissionMultipleUsers/sharedFolderWithMultipleUsersAdvancedPermissions.feature#L116) diff --git a/tests/acceptance/features/webUISharingFolderAdvancedPermissionMultipleUsers/sharedFolderWithMultipleUsersAdvancedPermissions.feature b/tests/acceptance/features/webUISharingFolderAdvancedPermissionMultipleUsers/sharedFolderWithMultipleUsersAdvancedPermissions.feature index 8d304bf619c..5b9b9732643 100644 --- a/tests/acceptance/features/webUISharingFolderAdvancedPermissionMultipleUsers/sharedFolderWithMultipleUsersAdvancedPermissions.feature +++ b/tests/acceptance/features/webUISharingFolderAdvancedPermissionMultipleUsers/sharedFolderWithMultipleUsersAdvancedPermissions.feature @@ -24,9 +24,9 @@ Feature: Sharing folders with multiple internal users using advanced permissions And the user selects the following collaborators for the share as "" with "" permissions: | collaborator | type | | Regular User | user | - | Brian Murphy | user | + | Brian Murphy | user | | Carol King | user | - | David Lopez | user | + | David Lopez | user | And the user removes "David Lopez" as a collaborator from the share And the user removes "Regular User" as a collaborator from the share And the user shares with the selected collaborators @@ -60,9 +60,10 @@ Feature: Sharing folders with multiple internal users using advanced permissions | Advanced permissions | Advanced permissions | update | update | read, update | | Advanced permissions | Advanced permissions | delete, update | delete, update | read, delete, update | | Advanced permissions | Advanced permissions | update, create | update, create | read, update, create | + | Advanced permissions | Advanced permissions | create | create | read, create | + | Advanced permissions | Advanced permissions | delete, create | delete, create | read, delete, create | + - @issue-ocis-717 - #after fixing the issue merge this scenario into the one above Scenario Outline: share a folder with multiple users using role as advanced permissions role and different extra permissions Given these users have been created with default attributes: | username | @@ -75,9 +76,9 @@ Feature: Sharing folders with multiple internal users using advanced permissions And the user selects the following collaborators for the share as "" with "" permissions: | collaborator | type | | Regular User | user | - | Brian Murphy | user | + | Brian Murphy | user | | Carol King | user | - | David Lopez | user | + | David Lopez | user | And the user removes "David Lopez" as a collaborator from the share And the user removes "Regular User" as a collaborator from the share And the user shares with the selected collaborators @@ -107,60 +108,9 @@ Feature: Sharing folders with multiple internal users using advanced permissions And as "David" folder "/Shares/simple-folder" should not exist Examples: | role | displayed-role | extra-permissions | displayed-permissions | actual-permissions | - | Advanced permissions | Advanced permissions | create | create | read, create | | Advanced permissions | Advanced permissions | share, delete | share, delete | read, share, delete | | Advanced permissions | Advanced permissions | share, update | share, update | read, update, share | | Advanced permissions | Advanced permissions | share, create | share, create | read, share, create | - | Advanced permissions | Advanced permissions | delete, create | delete, create | read, delete, create | | Advanced permissions | Advanced permissions | share, delete, update | share, delete, update | read, share, delete, update | | Advanced permissions | Advanced permissions | share, create, delete | share, create, delete | read, share, delete, create | | Advanced permissions | Advanced permissions | share, update, create | share, update, create | read, share, update, create | - - @skipOnOC10 @issue-ocis-717 - #after fixing the issue delete this scenario and use the one(s) above by moving the Examples entries that have been fixed - Scenario Outline: share a folder with multiple users using role as advanced permissions role and different extra permissions - Given these users have been created with default attributes: - | username | - | user0 | - | Carol | - | David | - And user "Alice" has logged in using the webUI - When the user opens the share dialog for folder "simple-folder" using the webUI - And the user opens the share creation dialog in the webUI - And the user selects the following collaborators for the share as "" with "" permissions: - | collaborator | type | - | Regular User | user | - | Brian Murphy | user | - | Carol King | user | - | David Lopez | user | - And the user removes "David Lopez" as a collaborator from the share - And the user removes "Regular User" as a collaborator from the share - And the user shares with the selected collaborators - And user "Brian" accepts the share "simple-folder" offered by user "Alice" using the sharing API - And user "Carol" accepts the share "simple-folder" offered by user "Alice" using the sharing API - Then custom permissions "" should be set for user "Brian Murphy" for folder "simple-folder" on the webUI - And custom permissions "" should be set for user "Carol King" for folder "simple-folder" on the webUI - And user "Brian Murphy" should be listed as "" in the collaborators list for folder "simple-folder" on the webUI - And user "Carol King" should be listed as "" in the collaborators list for folder "simple-folder" on the webUI - And user "Brian" should have received a share with these details: - | field | value | - | uid_owner | Alice | - | share_with | Brian | - | file_target | /Shares/simple-folder | - | item_type | folder | - | permissions | | - And user "Carol" should have received a share with these details: - | field | value | - | uid_owner | Alice | - | share_with | Carol | - | file_target | /Shares/simple-folder | - | item_type | folder | - | permissions | | - But user "Regular User" should not be listed in the collaborators list on the webUI - And as "user0" folder "/Shares/simple-folder" should not exist - And user "David Lopez" should not be listed in the collaborators list on the webUI - And as "David" folder "/Shares/simple-folder" should not exist - Examples: - | role | displayed-role | extra-permissions | displayed-permissions | actual-permissions | - | Advanced permissions | Advanced permissions | create | create, update | read, create, update | - | Advanced permissions | Editor | delete, create | , | read, delete, create, update |