diff --git a/tests/acceptance/expected-failures-with-ocis-server-ocis-storage.md b/tests/acceptance/expected-failures-with-ocis-server-ocis-storage.md index 5862a485fe5..57cf21a4396 100644 --- a/tests/acceptance/expected-failures-with-ocis-server-ocis-storage.md +++ b/tests/acceptance/expected-failures-with-ocis-server-ocis-storage.md @@ -43,7 +43,6 @@ Other free text and markdown formatting can be used elsewhere in the document if - [webUISharingInternalUsers/shareWithUsers.feature:275](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingInternalUsers/shareWithUsers.feature#L275) - [webUISharingInternalUsers/shareWithUsers.feature:276](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingInternalUsers/shareWithUsers.feature#L276) - [webUISharingInternalUsers/shareWithUsers.feature:277](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingInternalUsers/shareWithUsers.feature#L277) -- [webUISharingInternalUsersShareWithPage/shareWithUsers.feature:140](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingInternalUsersShareWithPage/shareWithUsers.feature#L140) - [webUISharingPermissionsUsers/sharePermissionsUsers.feature:214](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingPermissionsUsers/sharePermissionsUsers.feature#L223) - [webUIResharing2/reshareUsers.feature:41](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIResharing2/reshareUsers.feature#L41) - [webUIResharing2/reshareUsers.feature:69](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIResharing2/reshareUsers.feature#L69) @@ -153,22 +152,7 @@ Other free text and markdown formatting can be used elsewhere in the document if - [webUIMoveFilesFolders/moveFiles.feature:97](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIMoveFilesFolders/moveFiles.feature#L97) - [webUIMoveFilesFolders/moveFolders.feature:72](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIMoveFilesFolders/moveFolders.feature#L72) - [webUIFilesActionMenu/versions.feature:93](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesActionMenu/versions.feature#L93) - - -### [Share not created with default permissions](https://github.com/owncloud/ocis/issues/1277) -- [webUISharingInternalGroups/shareWithGroups.feature:74](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingInternalGroups/shareWithGroups.feature#L74) -- [webUISharingInternalGroups/shareWithGroups.feature:72](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingInternalGroups/shareWithGroups.feature#L72) -- [webUISharingInternalGroups/shareWithGroups.feature:73](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingInternalGroups/shareWithGroups.feature#L73) -- [webUIResharing2/reshareUsers.feature:97](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIResharing2/reshareUsers.feature#L97) -- [webUIResharing2/reshareUsers.feature:98](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIResharing2/reshareUsers.feature#L98) -- [webUIResharing2/reshareUsers.feature:99](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIResharing2/reshareUsers.feature#L99) -- [webUIResharing2/reshareUsers.feature:132](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIResharing2/reshareUsers.feature#L132) -- [webUIResharing2/reshareUsers.feature:133](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIResharing2/reshareUsers.feature#L133) -- [webUIResharing2/reshareUsers.feature:134](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIResharing2/reshareUsers.feature#L134) -- [webUIResharing2/reshareUsers.feature:29](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIResharing2/reshareUsers.feature#L29) -- [webUIResharing2/reshareUsers.feature:71](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIResharing2/reshareUsers.feature#L71) -- [webUIResharing2/reshareUsers.feature:72](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIResharing2/reshareUsers.feature#L72) -- [webUIResharing2/reshareUsers.feature:73](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIResharing2/reshareUsers.feature#L73) +- [webUISharingInternalUsersShareWithPage/shareWithUsers.feature:140](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingInternalUsersShareWithPage/shareWithUsers.feature#L140) ### [No occ command in ocis](https://github.com/owncloud/ocis/issues/1317) ### [Expiration date set is not implemented in user share](https://github.com/owncloud/ocis/issues/1250) diff --git a/tests/acceptance/features/webUIResharing1/reshareUsers.feature b/tests/acceptance/features/webUIResharing1/reshareUsers.feature index d204af12c7d..2a196016f4e 100644 --- a/tests/acceptance/features/webUIResharing1/reshareUsers.feature +++ b/tests/acceptance/features/webUIResharing1/reshareUsers.feature @@ -14,7 +14,9 @@ Feature: Resharing shared files with different permissions | Carol | And user "Brian" has created folder "simple-folder" in the server - @issue-ocis-2260 + # this scenario is skipped on ocis because it opens share folder which in not possible in OCIS + # but it works for OC10 see issue https://github.com/owncloud/web/issues/6896 for more detail + @skipOnOCIS Scenario: share a folder with another user with share permissions and reshare without share permissions to different user, and check if user is displayed for original sharer Given user "Brian" has shared folder "simple-folder" with user "Alice" with "read, share" permissions in the server And user "Alice" has accepted the share "Shares/simple-folder" offered by user "Brian" in the server @@ -41,36 +43,9 @@ Feature: Resharing shared files with different permissions | item_type | folder | | permissions | read | - @skipOnOC10 @issue-ocis-2260 - #after fixing the issue delete this scenario and use the one above by deleting the @skipOnOCIS tag there - Scenario: share a folder with another user with share permissions and reshare without share permissions to different user, and check if user is displayed for original sharer (ocis bug demonstration) - Given user "Brian" has shared folder "simple-folder" with user "Alice" with "read, share" 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 opens folder "Shares" using the webUI - When the user shares folder "simple-folder" with user "Carol King" as "Viewer" with permissions "," using the webUI - And user "Carol" accepts the share "simple-folder" offered by user "Alice" using the sharing API in the server - And the user re-logs in as "Brian" using the webUI - Then user "Carol King" should be listed as "Viewer" in the collaborators list for folder "simple-folder" on the webUI - And no custom permissions should be set for collaborator "Carol King" for folder "simple-folder" on the webUI - And user "Alice Hansen" should be listed as "Viewer" in the collaborators list for folder "simple-folder" on the webUI - And custom permissions "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, share | - 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 | read | - - @issue-2260 + # this scenario is skipped on ocis because it opens share folder which in not possible in OCIS + # but it works for OC10 see issue https://github.com/owncloud/web/issues/6896 for more detail + @skipOnOCIS Scenario: share a folder with another user with share permissions and reshare without share permissions to different user, and check if user is displayed for the receiver Given user "Brian" has shared folder "simple-folder" with user "Alice" with "read, share" permissions in the server And user "Alice" has accepted the share "Shares/simple-folder" offered by user "Brian" in the server diff --git a/tests/acceptance/features/webUIResharing2/reshareUsers.feature b/tests/acceptance/features/webUIResharing2/reshareUsers.feature index 6381941fd64..33961edfeb0 100644 --- a/tests/acceptance/features/webUIResharing2/reshareUsers.feature +++ b/tests/acceptance/features/webUIResharing2/reshareUsers.feature @@ -25,7 +25,9 @@ Feature: Resharing shared files with different permissions Then user "Carol King" 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 "Carol King" for folder "simple-folder" on the webUI - @issue-ocis-1922 + # this scenario is skipped on ocis because it opens share folder which in not possible in OCIS + # but it works for OC10 see issue https://github.com/owncloud/web/issues/6896 for more detail + @skipOnOCIS Scenario: Reshare a folder without share permissions using API and check if it is listed on the collaborators list for resharer Given user "Brian" has shared folder "simple-folder" with user "Alice" with "read, share" permissions in the server And user "Alice" has accepted the share "Shares/simple-folder" offered by user "Brian" in the server @@ -37,7 +39,9 @@ Feature: Resharing shared files with different permissions Then user "Carol King" 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 "Carol King" for folder "simple-folder" on the webUI - + # this scenario is skipped on ocis because it opens share folder which in not possible in OCIS + # but it works for OC10 see issue https://github.com/owncloud/web/issues/6896 for more detail + @skipOnOCIS Scenario: Reshare a folder without share permissions using API and check if the receiver can reshare Given user "Brian" has shared folder "simple-folder" with user "Alice" with "read, share" permissions in the server And user "Alice" has accepted the share "Shares/simple-folder" offered by user "Brian" in the server @@ -47,7 +51,9 @@ Feature: Resharing shared files with different permissions And the user opens folder "Shares" using the webUI Then the user should not be able to share folder "simple-folder" using the webUI - @issue-ocis-2260 @issue-ocis-1922 + # this scenario is skipped on ocis because it opens share folder which in not possible in OCIS + # but it works for OC10 see issue https://github.com/owncloud/web/issues/6896 for more detail + @skipOnOCIS Scenario Outline: share a received folder with another user with same permissions(including share permissions) and check if the user is displayed in collaborators list for resharer Given user "Brian" has shared folder "simple-folder" with user "Alice" with "" permissions in the server And user "Alice" has accepted the share "Shares/simple-folder" offered by user "Brian" in the server @@ -72,33 +78,9 @@ Feature: Resharing shared files with different permissions | Custom permissions | Custom permissions | update, share | share, update | read, update, share | | Custom permissions | Editor | delete, share, create, update | share, delete, update, create | read, share, delete, update, create | - @skipOnOC10 @issue-ocis-2260 @issue-ocis-1922 - #after fixing the issue delete this scenario and use the one above by deleting the @skipOnOCIS tag there - Scenario Outline: share a received folder with another user with same permissions(including share permissions) and check if the user is displayed in collaborators list for resharer (ocis bug demonstration) - Given user "Brian" has shared folder "simple-folder" with user "Alice" with "" 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 opens folder "Shares" using the webUI - When the user shares folder "simple-folder" with user "Carol King" as "" with permissions "" using the webUI - And user "Carol" accepts the share "Shares/simple-folder" offered by user "Alice" using the sharing API in the server - Then user "Carol King" should be listed as "" in the collaborators list 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 "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 | | - Examples: - | role | displayed-role | collaborators-permissions | displayed-permissions | permissions | - | Viewer | Viewer | , | , | read | - | Editor | Editor | , | , | all | - | Custom permissions | Custom permissions | create | create | read, create | - | Custom permissions | Custom permissions | update | update | read, update | - | Custom permissions | Editor | delete, create, update | | read, delete, update, create | - - @issue-ocis-1743 + # this scenario is skipped on ocis because it opens share folder which in not possible in OCIS + # but it works for OC10 see issue https://github.com/owncloud/web/issues/6896 for more detail + @skipOnOCIS Scenario Outline: share a received folder with another user with same permissions(including share permissions) and check if the user is displayed in collaborators list for original owner Given user "Brian" has shared folder "simple-folder" with user "Alice" with "" permissions in the server And user "Alice" has accepted the share "Shares/simple-folder" offered by user "Brian" in the server diff --git a/tests/acceptance/features/webUISharingInternalGroups/shareWithGroups.feature b/tests/acceptance/features/webUISharingInternalGroups/shareWithGroups.feature index 027743ceabd..2c9def14489 100644 --- a/tests/acceptance/features/webUISharingInternalGroups/shareWithGroups.feature +++ b/tests/acceptance/features/webUISharingInternalGroups/shareWithGroups.feature @@ -26,7 +26,9 @@ Feature: Sharing files and folders with internal groups 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" - @issue-ocis-1922 + # this scenario is skipped on ocis because it opens share folder which in not possible in OCIS + # but it works for OC10 see issue https://github.com/owncloud/web/issues/6896 for more detail + @skipOnOCIS Scenario Outline: share a file & folder with another internal user Given user "Carol" has created folder "simple-folder" in the server And user "Carol" has created file "simple-folder/lorem.txt" in the server diff --git a/tests/acceptance/features/webUISharingInternalUsers/shareWithUsers.feature b/tests/acceptance/features/webUISharingInternalUsers/shareWithUsers.feature index 6bb08ba8005..4450b51cc1a 100644 --- a/tests/acceptance/features/webUISharingInternalUsers/shareWithUsers.feature +++ b/tests/acceptance/features/webUISharingInternalUsers/shareWithUsers.feature @@ -12,7 +12,9 @@ Feature: Sharing files and folders with internal users | Brian | And user "Brian" has created folder "simple-folder" in the server - @smokeTest @issue-ocis-2260 @ocisSmokeTest @disablePreviews + # this scenario is skipped on ocis because it opens share folder which in not possible in OCIS + # but it works for OC10 see issue https://github.com/owncloud/web/issues/6896 for more detail + @smokeTest @disablePreviews @skipOnOCIS Scenario Outline: share a file & folder with another internal user Given user "Brian" has created file "testimage.jpg" in the server And user "Brian" has created file "simple-folder/lorem.txt" in the server @@ -238,8 +240,9 @@ Feature: Sharing files and folders with internal users - - @issue-ocis-2260 @disablePreviews + # this scenario is skipped on ocis because it opens share folder which in not possible in OCIS + # but it works for OC10 see issue https://github.com/owncloud/web/issues/6896 for more detail + @skipOnOCIS @disablePreviews Scenario Outline: Share files/folders with special characters in their name Given user "Brian" has created folder "Sample,Folder,With,Comma" in the server And user "Brian" has created file "sample,1.txt" in the server diff --git a/tests/acceptance/features/webUISharingPermissionsUsers/sharePermissionsUsers.feature b/tests/acceptance/features/webUISharingPermissionsUsers/sharePermissionsUsers.feature index 4e4f4eece1e..4d4c13a71bf 100644 --- a/tests/acceptance/features/webUISharingPermissionsUsers/sharePermissionsUsers.feature +++ b/tests/acceptance/features/webUISharingPermissionsUsers/sharePermissionsUsers.feature @@ -209,8 +209,9 @@ Feature: Sharing files and folders with internal users with different permission - - @issue-ocis-2260 + # this scenario is skipped on ocis because it opens share folder which in not possible in OCIS + # but it works for OC10 see issue https://github.com/owncloud/web/issues/6896 for more detail + @skipOnOCIS Scenario: User is allowed to update permissions of a reshared sub-folder within the permissions that the user has received 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 "all" permissions in the server