diff --git a/tests/acceptance/expected-failures-API-on-OCIS-storage.md b/tests/acceptance/expected-failures-API-on-OCIS-storage.md index cfcee9add5..07c8015a5b 100644 --- a/tests/acceptance/expected-failures-API-on-OCIS-storage.md +++ b/tests/acceptance/expected-failures-API-on-OCIS-storage.md @@ -171,11 +171,11 @@ File and sync features in a shared scenario #### [accepting matching name shared resources from different users/groups sets no serial identifiers on the resource name for the receiver](https://github.com/owncloud/ocis/issues/4289) -- [coreApiShareManagementToShares/acceptShares.feature:285](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiShareManagementToShares/acceptShares.feature#L285) -- [coreApiShareManagementToShares/acceptShares.feature:315](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiShareManagementToShares/acceptShares.feature#L315) -- [coreApiShareManagementToShares/acceptShares.feature:229](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiShareManagementToShares/acceptShares.feature#L229) -- [coreApiShareManagementToShares/acceptShares.feature:494](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiShareManagementToShares/acceptShares.feature#L494) -- [coreApiShareManagementToShares/acceptShares.feature:559](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiShareManagementToShares/acceptShares.feature#L559) +- [coreApiShareManagementToShares/acceptShares.feature:239](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiShareManagementToShares/acceptShares.feature#L239) +- [coreApiShareManagementToShares/acceptShares.feature:261](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiShareManagementToShares/acceptShares.feature#L261) +- [coreApiShareManagementToShares/acceptShares.feature:209](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiShareManagementToShares/acceptShares.feature#L209) +- [coreApiShareManagementToShares/acceptShares.feature:460](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiShareManagementToShares/acceptShares.feature#L460) +- [coreApiShareManagementToShares/acceptShares.feature:525](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiShareManagementToShares/acceptShares.feature#L525) - [coreApiShareCreateSpecialToShares2/createShareReceivedInMultipleWays.feature:40](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiShareCreateSpecialToShares2/createShareReceivedInMultipleWays.feature#L40) - [coreApiShareCreateSpecialToShares2/createShareReceivedInMultipleWays.feature:41](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiShareCreateSpecialToShares2/createShareReceivedInMultipleWays.feature#L41) - [coreApiShareCreateSpecialToShares2/createShareReceivedInMultipleWays.feature:131](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiShareCreateSpecialToShares2/createShareReceivedInMultipleWays.feature#L131) @@ -194,7 +194,7 @@ File and sync features in a shared scenario #### [file_target of an auto-renamed file is not correct directly after sharing](https://github.com/owncloud/core/issues/32322) -- [coreApiShareManagementToShares/mergeShare.feature:115](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiShareManagementToShares/mergeShare.feature#L115) +- [coreApiShareManagementToShares/mergeShare.feature:112](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiShareManagementToShares/mergeShare.feature#L112) #### [File deletion using dav gives unique string in filename in the trashbin](https://github.com/owncloud/product/issues/178) @@ -339,7 +339,7 @@ cannot share a folder with create permission - [coreApiShareUpdateToShares/updateShare.feature:195](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiShareUpdateToShares/updateShare.feature#L195) - [coreApiShareUpdateToShares/updateShare.feature:159](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiShareUpdateToShares/updateShare.feature#L159) -- [coreApiShareManagementToShares/mergeShare.feature:135](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiShareManagementToShares/mergeShare.feature#L135) +- [coreApiShareManagementToShares/mergeShare.feature:132](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiShareManagementToShares/mergeShare.feature#L132) #### [Sharing folder and sub-folder with same user but different permission,the permission of sub-folder is not obeyed ](https://github.com/owncloud/ocis/issues/2440) @@ -621,13 +621,13 @@ Not everything needs to be implemented for ocis. While the oc10 testsuite covers #### [Share path in the response is different between share states](https://github.com/owncloud/ocis/issues/2540) -- [coreApiShareManagementToShares/acceptShares.feature:64](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiShareManagementToShares/acceptShares.feature#L64) -- [coreApiShareManagementToShares/acceptShares.feature:87](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiShareManagementToShares/acceptShares.feature#L87) -- [coreApiShareManagementToShares/acceptShares.feature:165](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiShareManagementToShares/acceptShares.feature#L165) -- [coreApiShareManagementToShares/acceptShares.feature:188](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiShareManagementToShares/acceptShares.feature#L188) -- [coreApiShareManagementToShares/acceptShares.feature:226](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiShareManagementToShares/acceptShares.feature#L226) -- [coreApiShareManagementToShares/acceptShares.feature:260](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiShareManagementToShares/acceptShares.feature#L260) -- [coreApiShareManagementToShares/acceptShares.feature:480](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiShareManagementToShares/acceptShares.feature#L480) +- [coreApiShareManagementToShares/acceptShares.feature:29](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiShareManagementToShares/acceptShares.feature#L29) +- [coreApiShareManagementToShares/acceptShares.feature:63](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiShareManagementToShares/acceptShares.feature#L63) +- [coreApiShareManagementToShares/acceptShares.feature:135](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiShareManagementToShares/acceptShares.feature#L135) +- [coreApiShareManagementToShares/acceptShares.feature:156](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiShareManagementToShares/acceptShares.feature#L156) +- [coreApiShareManagementToShares/acceptShares.feature:184](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiShareManagementToShares/acceptShares.feature#L184) +- [coreApiShareManagementToShares/acceptShares.feature:229](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiShareManagementToShares/acceptShares.feature#L229) +- [coreApiShareManagementToShares/acceptShares.feature:439](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiShareManagementToShares/acceptShares.feature#L439) - [coreApiShareOperationsToShares2/shareAccessByID.feature:122](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiShareOperationsToShares2/shareAccessByID.feature#L122) - [coreApiShareOperationsToShares2/shareAccessByID.feature:123](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiShareOperationsToShares2/shareAccessByID.feature#L123) - - [coreApiShareManagementBasicToShares/deleteShareFromShares.feature:179](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiShareManagementBasicToShares/deleteShareFromShares.feature#L179) diff --git a/tests/acceptance/features/coreApiShareManagementToShares/acceptShares.feature b/tests/acceptance/features/coreApiShareManagementToShares/acceptShares.feature index cb2e80125e..819c0a0f33 100644 --- a/tests/acceptance/features/coreApiShareManagementToShares/acceptShares.feature +++ b/tests/acceptance/features/coreApiShareManagementToShares/acceptShares.feature @@ -25,8 +25,8 @@ Feature: accept/decline shares coming from internal users And user "Brian" has uploaded file "filesForUpload/textfile.txt" to "textfile0.txt" And user "Brian" has uploaded file "filesForUpload/textfile.txt" to "PARENT/parent.txt" - @smokeTest - Scenario Outline: share a file & folder with another internal group when auto accept is disabled + @smokeTest @issue-2540 + Scenario: share a file & folder with another internal group when auto accept is disabled Given user "Carol" has created folder "FOLDER" And user "Carol" has created folder "PARENT" And user "Carol" has uploaded file "filesForUpload/textfile.txt" to "textfile0.txt" @@ -43,9 +43,9 @@ Feature: accept/decline shares coming from internal users | /Shares/PARENT/parent.txt | | /Shares/textfile0.txt | And the sharing API should report to user "Brian" that these shares are in the pending state - | path | - | | - | | + | path | + | /Shares/PARENT/ | + | /Shares/textfile0.txt | And user "Carol" should see the following elements | /FOLDER/ | | /PARENT/ | @@ -55,16 +55,12 @@ Feature: accept/decline shares coming from internal users | /Shares/PARENT/parent.txt | | /Shares/textfile0.txt | And the sharing API should report to user "Carol" that these shares are in the pending state - | path | - | | - | | - @issue-2540 - Examples: - | pending_share_path_1 | pending_share_path_2 | - | /Shares/PARENT/ | /Shares/textfile0.txt | + | path | + | /Shares/PARENT/ | + | /Shares/textfile0.txt | - - Scenario Outline: share a file & folder with another internal user when auto accept is disabled + @issue-2540 + Scenario: share a file & folder with another internal user when auto accept is disabled When user "Alice" shares folder "/PARENT" with user "Brian" using the sharing API And user "Alice" shares file "/textfile0.txt" with user "Brian" using the sharing API Then the OCS status code of responses on all endpoints should be "100" @@ -78,13 +74,9 @@ Feature: accept/decline shares coming from internal users | /Shares/PARENT/parent.txt | | /Shares/textfile0.txt | And the sharing API should report to user "Brian" that these shares are in the pending state - | path | - | | - | | - @issue-2540 - Examples: - | pending_share_path_1 | pending_share_path_2 | - | /Shares/PARENT/ | /Shares/textfile0.txt | + | path | + | /Shares/PARENT/ | + | /Shares/textfile0.txt | @smokeTest @issue-2131 Scenario: accept a pending share @@ -139,8 +131,8 @@ Feature: accept/decline shares coming from internal users | path | | /Shares/shared/ | - @smokeTest - Scenario Outline: declines a pending share + @smokeTest @issue-2540 + Scenario: declines a pending share Given user "Alice" has shared folder "/PARENT" with user "Brian" And user "Alice" has shared file "/textfile0.txt" with user "Brian" When user "Brian" declines share "/PARENT" offered by user "Alice" using the sharing API @@ -156,16 +148,12 @@ Feature: accept/decline shares coming from internal users | /Shares/PARENT/parent.txt | | /Shares/textfile0.txt | And the sharing API should report to user "Brian" that these shares are in the declined state - | path | - | | - | | - @issue-2540 - Examples: - | declined_share_path_1 | declined_share_path_2 | - | /Shares/PARENT/ | /Shares/textfile0.txt | + | path | + | /Shares/PARENT/ | + | /Shares/textfile0.txt | - @smokeTest @issue-2128 - Scenario Outline: decline an accepted share + @smokeTest @issue-2128 @issue-2540 + Scenario: decline an accepted share Given user "Alice" has shared folder "/PARENT" with user "Brian" And user "Alice" has shared file "/textfile0.txt" with user "Brian" And user "Brian" has accepted share "/PARENT" offered by user "Alice" @@ -179,13 +167,9 @@ Feature: accept/decline shares coming from internal users | /Shares/PARENT/parent.txt | | /Shares/textfile0.txt | And the sharing API should report to user "Brian" that these shares are in the declined state - | path | - | | - | | - @issue-2540 - Examples: - | declined_share_path_1 | declined_share_path_2 | - | /Shares/PARENT/ | /Shares/textfile0.txt | + | path | + | /Shares/PARENT/ | + | /Shares/textfile0.txt | Scenario: deleting shares in pending state @@ -196,8 +180,8 @@ Feature: accept/decline shares coming from internal users Then the HTTP status code of responses on all endpoints should be "204" And the sharing API should report that no shares are shared with user "Brian" - - Scenario Outline: only one user in a group accepts a share + @issue-2540 + Scenario: only one user in a group accepts a share Given user "Alice" has shared folder "/PARENT" with group "grp1" And user "Alice" has shared file "/textfile0.txt" with group "grp1" When user "Brian" accepts share "/PARENT" offered by user "Alice" using the sharing API @@ -209,9 +193,9 @@ Feature: accept/decline shares coming from internal users | /Shares/PARENT/parent.txt | | /Shares/textfile0.txt | And the sharing API should report to user "Carol" that these shares are in the pending state - | path | - | | - | | + | path | + | /Shares/PARENT/ | + | /Shares/textfile0.txt | But user "Brian" should see the following elements | /Shares/PARENT/ | | /Shares/PARENT/parent.txt | @@ -220,10 +204,6 @@ Feature: accept/decline shares coming from internal users | path | | /Shares/PARENT/ | | /Shares/textfile0.txt | - @issue-2540 - Examples: - | pending_share_path_1 | pending_share_path_2 | - | /Shares/PARENT/ | /Shares/textfile0.txt | @issue-2131 Scenario: receive two shares with identical names from different users, accept one by one @@ -245,22 +225,18 @@ Feature: accept/decline shares coming from internal users | /Shares/shared/ | | /Shares/shared (2)/ | - - Scenario Outline: share with a group that you are part of yourself + @issue-2540 + Scenario: share with a group that you are part of yourself When user "Alice" shares folder "/PARENT" with group "grp1" using the sharing API Then the OCS status code should be "100" And the HTTP status code should be "200" And the sharing API should report to user "Brian" that these shares are in the pending state | path | - | | + | /Shares/PARENT/ | And the sharing API should report that no shares are shared with user "Alice" - @issue-2540 - Examples: - | pending_share_path | - | /Shares/PARENT/ | - Scenario Outline: user accepts file that was initially accepted from another user and then declined + Scenario: user accepts file that was initially accepted from another user and then declined Given user "Alice" has uploaded file with content "First file" to "/testfile.txt" And user "Brian" has uploaded file with content "Second file" to "/testfile.txt" And user "Carol" has created folder "Shares" @@ -270,7 +246,7 @@ Feature: accept/decline shares coming from internal users When user "Carol" declines share "/Shares/testfile (2).txt" offered by user "Alice" using the sharing API And user "Brian" shares file "/testfile.txt" with user "Carol" using the sharing API And user "Carol" accepts share "/testfile.txt" offered by user "Brian" using the sharing API - And user "Carol" accepts share "" offered by user "Alice" using the sharing API + And user "Carol" accepts share "/testfile (2).txt" offered by user "Alice" using the sharing API Then the OCS status code of responses on all endpoints should be "100" And the HTTP status code of responses on all endpoints should be "200" And the sharing API should report to user "Carol" that these shares are in the accepted state @@ -280,12 +256,9 @@ Feature: accept/decline shares coming from internal users And the content of file "/Shares/testfile.txt" for user "Carol" should be "Third file" And the content of file "/Shares/testfile (2).txt" for user "Carol" should be "Second file" And the content of file "/Shares/testfile (2) (2).txt" for user "Carol" should be "First file" - Examples: - | accepted_share_path | - | /testfile (2).txt | - Scenario Outline: user accepts shares received from multiple users with the same name when auto-accept share is disabled + Scenario: user accepts shares received from multiple users with the same name when auto-accept share is disabled Given user "David" has been created with default attributes and without skeleton files And user "David" has created folder "PARENT" And user "Brian" has shared folder "/PARENT" with user "Alice" @@ -296,13 +269,13 @@ Feature: accept/decline shares coming from internal users When user "Alice" accepts share "/PARENT" offered by user "Brian" using the sharing API And user "Alice" declines share "/Shares/PARENT (2)" offered by user "Brian" using the sharing API And user "Alice" accepts share "/PARENT" offered by user "Carol" using the sharing API - And user "Alice" accepts share "" offered by user "Brian" using the sharing API + And user "Alice" accepts share "/PARENT (2)" offered by user "Brian" using the sharing API And user "Alice" declines share "/Shares/PARENT (2)" offered by user "Carol" using the sharing API And user "Alice" declines share "/Shares/PARENT (2) (2)" offered by user "Brian" using the sharing API And user "David" shares folder "/PARENT" with user "Alice" using the sharing API And user "Alice" accepts share "/PARENT" offered by user "David" using the sharing API - And user "Alice" accepts share "" offered by user "Carol" using the sharing API - And user "Alice" accepts share "" offered by user "Brian" using the sharing API + And user "Alice" accepts share "/PARENT (2)" offered by user "Carol" using the sharing API + And user "Alice" accepts share "/PARENT (2) (2)" offered by user "Brian" using the sharing API Then the OCS status code of responses on all endpoints should be "100" And the HTTP status code of responses on all endpoints should be "200" And the sharing API should report to user "Alice" that these shares are in the accepted state @@ -310,9 +283,6 @@ Feature: accept/decline shares coming from internal users | /Shares/PARENT (2)/ | David | | /Shares/PARENT (2) (2)/ | Carol | | /Shares/PARENT (2) (2) (2)/ | Brian | - Examples: - | accepted_share_path_1 | accepted_share_path_2 | - | /PARENT (2) | /PARENT (2) (2) | Scenario: user shares folder with matching folder-name for both user involved in sharing @@ -465,19 +435,15 @@ Feature: accept/decline shares coming from internal users | /PARENT (2)/ | And the content of file "/Shares/PARENT/abc.txt" for user "David" should be "uploaded content" - @issue-1123 - Scenario Outline: deleting a share accepted file and folder + @issue-1123 @issue-2540 + Scenario: deleting a share accepted file and folder Given user "Alice" has shared folder "/PARENT" with user "Brian" And user "Brian" has accepted share "/PARENT" offered by user "Alice" When user "Brian" deletes file "/Shares/PARENT" using the WebDAV API Then the HTTP status code should be "204" And the sharing API should report to user "Brian" that these shares are in the declined state - | path | - | | - @issue-2540 - Examples: - | declined_share_path | - | /Shares/PARENT | + | path | + | /Shares/PARENT | @issue-765 @issue-2131 Scenario: shares exist after restoring already shared file to a previous version @@ -491,7 +457,7 @@ Feature: accept/decline shares coming from internal users And the content of file "/Shares/toShareFile.txt" for user "Brian" should be "Test Content." @issue-2131 - Scenario: a user receives multiple group shares for matching file and folder name + Scenario: user receives multiple group shares for matching file and folder name Given group "grp2" has been created And user "Alice" has been added to group "grp2" And user "Brian" has been added to group "grp2" @@ -556,7 +522,7 @@ Feature: accept/decline shares coming from internal users And the content of file "/Shares/parent.txt" for user "Brian" should be "from carol to grp1" @issue-2131 - Scenario: a group receives multiple shares from non-member for matching file and folder name + Scenario: group receives multiple shares from non-member for matching file and folder name Given user "Brian" has been removed from group "grp1" And user "Alice" has created folder "/PaRent" And user "Carol" has created folder "/PARENT" diff --git a/tests/acceptance/features/coreApiShareManagementToShares/acceptSharesToSharesFolder.feature b/tests/acceptance/features/coreApiShareManagementToShares/acceptSharesToSharesFolder.feature index b6e2d2085b..23dc4c341d 100644 --- a/tests/acceptance/features/coreApiShareManagementToShares/acceptSharesToSharesFolder.feature +++ b/tests/acceptance/features/coreApiShareManagementToShares/acceptSharesToSharesFolder.feature @@ -14,7 +14,7 @@ Feature: accept/decline shares coming from internal users to the Shares folder | Brian | - Scenario: When accepting a share of a file, the received file is accessible + Scenario: accept an incoming file share Given user "Alice" has uploaded file with content "ownCloud test text file 0" to "textfile0.txt" And user "Alice" has shared file "/textfile0.txt" with user "Brian" When user "Brian" accepts share "/textfile0.txt" offered by user "Alice" using the sharing API @@ -23,7 +23,7 @@ Feature: accept/decline shares coming from internal users to the Shares folder And the content of file "/Shares/textfile0.txt" for user "Brian" should be "ownCloud test text file 0" - Scenario: When accepting a share of a folder, the received folder is accessible + Scenario: accept an incoming folder share Given user "Alice" has created folder "/PARENT" And user "Alice" has uploaded file with content "ownCloud test text file parent" to "PARENT/parent.txt" And user "Alice" has shared file "/PARENT" with user "Brian" @@ -31,7 +31,7 @@ Feature: accept/decline shares coming from internal users to the Shares folder Then the content of file "/Shares/PARENT/parent.txt" for user "Brian" should be "ownCloud test text file parent" - Scenario: When accepting a share of a file, the response is valid + Scenario: accept an incoming file share and check the response Given user "Alice" has uploaded file with content "ownCloud test text file 0" to "textfile0.txt" And user "Alice" has shared file "/textfile0.txt" with user "Brian" When user "Brian" accepts share "/textfile0.txt" offered by user "Alice" using the sharing API @@ -52,7 +52,7 @@ Feature: accept/decline shares coming from internal users to the Shares folder And the content of file "/Shares/textfile0.txt" for user "Brian" should be "ownCloud test text file 0" - Scenario: When accepting a share of a folder, the response is valid + Scenario: accept an incoming folder share and check the response Given user "Alice" has created folder "/PARENT" And user "Alice" has uploaded file with content "ownCloud test text file parent" to "PARENT/parent.txt" And user "Alice" has shared file "/PARENT" with user "Brian" diff --git a/tests/acceptance/features/coreApiShareManagementToShares/mergeShare.feature b/tests/acceptance/features/coreApiShareManagementToShares/mergeShare.feature index 9d1fc5d65f..45032d84c8 100644 --- a/tests/acceptance/features/coreApiShareManagementToShares/mergeShare.feature +++ b/tests/acceptance/features/coreApiShareManagementToShares/mergeShare.feature @@ -12,7 +12,7 @@ Feature: sharing And user "Brian" has been added to group "grp1" @smokeTest - Scenario: Merging shares for recipient when shared from outside with group and member + Scenario: merging shares for recipient when shared from outside with group and member Given user "Alice" has created folder "/merge-test-outside" When user "Alice" shares folder "/merge-test-outside" with group "grp1" using the sharing API And user "Alice" shares folder "/merge-test-outside" with user "Brian" using the sharing API @@ -23,7 +23,7 @@ Feature: sharing And as "Brian" folder "/Shares/merge-test-outside (2)" should not exist - Scenario: Merging shares for recipient when shared from outside with group and member with different permissions + Scenario: merging shares for recipient when shared from outside with group and member with different permissions Given user "Alice" has created folder "/merge-test-outside-perms" When user "Alice" shares folder "/merge-test-outside-perms" with group "grp1" with permissions "read" using the sharing API And user "Alice" shares folder "/merge-test-outside-perms" with user "Brian" with permissions "all" using the sharing API @@ -34,7 +34,7 @@ Feature: sharing And as "Brian" folder "/Shares/merge-test-outside-perms (2)" should not exist - Scenario: Merging shares for recipient when shared from outside with two groups + Scenario: merging shares for recipient when shared from outside with two groups Given group "grp2" has been created And user "Brian" has been added to group "grp2" And user "Alice" has created folder "/merge-test-outside-twogroups" @@ -47,7 +47,7 @@ Feature: sharing And as "Brian" folder "/Shares/merge-test-outside-twogroups (2)" should not exist - Scenario: Merging shares for recipient when shared from outside with two groups with different permissions + Scenario: merging shares for recipient when shared from outside with two groups with different permissions Given group "grp2" has been created And user "Brian" has been added to group "grp2" And user "Alice" has created folder "/merge-test-outside-twogroups-perms" @@ -60,7 +60,7 @@ Feature: sharing And as "Brian" folder "/Shares/merge-test-outside-twogroups-perms (2)" should not exist - Scenario: Merging shares for recipient when shared from outside with two groups and member + Scenario: merging shares for recipient when shared from outside with two groups and member Given group "grp2" has been created And user "Brian" has been added to group "grp2" And user "Alice" has created folder "/merge-test-outside-twogroups-member-perms" @@ -74,7 +74,7 @@ Feature: sharing And as "Brian" folder "/Shares/merge-test-outside-twogroups-member-perms (2)" should not exist - Scenario: Merging shares for recipient when shared from inside with group + Scenario: merging shares for recipient when shared from inside with group Given user "Brian" has created folder "/merge-test-inside-group" When user "Brian" shares folder "/merge-test-inside-group" with group "grp1" using the sharing API Then the OCS status code should be "100" @@ -83,7 +83,7 @@ Feature: sharing And as "Brian" folder "/Shares/merge-test-inside-group" should not exist - Scenario: Merging shares for recipient when shared from inside with two groups + Scenario: merging shares for recipient when shared from inside with two groups Given group "grp2" has been created And user "Brian" has been added to group "grp2" And user "Brian" has created folder "/merge-test-inside-twogroups" @@ -96,7 +96,7 @@ Feature: sharing And as "Brian" folder "/Shares/merge-test-inside-twogroups (2)" should not exist - Scenario Outline: Merging shares for recipient when shared from inside with group with less permissions + Scenario: merging shares for recipient when shared from inside with group with less permissions Given group "grp2" has been created And user "Brian" has been added to group "grp2" And user "Brian" has created folder "/merge-test-inside-twogroups-perms" @@ -104,15 +104,12 @@ Feature: sharing And user "Brian" shares folder "/merge-test-inside-twogroups-perms" with group "grp2" using the sharing API Then the OCS status code of responses on all endpoints should be "100" And the HTTP status code of responses on all endpoints should be "200" - And as user "Brian" folder "/merge-test-inside-twogroups-perms" should contain a property "oc:permissions" with value "" or with value "" + And as user "Brian" folder "/merge-test-inside-twogroups-perms" should contain a property "oc:permissions" with value "RDNVCKZ" or with value "RMDNVCKZ" And as "Brian" folder "/Shares/merge-test-inside-twogroups-perms" should not exist And as "Brian" folder "/Shares/merge-test-inside-twogroups-perms (2)" should not exist - Examples: - | expected_permission_1 | expected_permission_2 | - | RDNVCKZ | RMDNVCKZ | - Scenario: Merging shares for recipient when shared from outside with group then user and recipient renames in between + Scenario: merging shares for recipient when shared from outside with group then user and recipient renames in between Given user "Alice" has created folder "/merge-test-outside-groups-renamebeforesecondshare" # Section 1: Brian receives and accepts the group share from Alice and moves and renames it out of the "Shares" folder When user "Alice" shares folder "/merge-test-outside-groups-renamebeforesecondshare" with group "grp1" using the sharing API @@ -132,7 +129,7 @@ Feature: sharing But as "Brian" folder "/merge-test-outside-groups-renamebeforesecondshare-renamed" should not exist - Scenario: Merging shares for recipient when shared from outside with user then group and recipient renames in between + Scenario: merging shares for recipient when shared from outside with user then group and recipient renames in between Given user "Alice" has created folder "/merge-test-outside-groups-renamebeforesecondshare" # Section 1: Brian receives and accepts the user share from Alice and moves and renames it out of the "Shares" folder When user "Alice" shares folder "/merge-test-outside-groups-renamebeforesecondshare" with user "Brian" using the sharing API diff --git a/tests/acceptance/features/coreApiShareManagementToShares/moveReceivedShare.feature b/tests/acceptance/features/coreApiShareManagementToShares/moveReceivedShare.feature index 486481650a..dbba7112f1 100644 --- a/tests/acceptance/features/coreApiShareManagementToShares/moveReceivedShare.feature +++ b/tests/acceptance/features/coreApiShareManagementToShares/moveReceivedShare.feature @@ -11,7 +11,7 @@ Feature: sharing | Carol | - Scenario: Keep usergroup shares when the user renames the share within the Shares folder(#22143) + Scenario: keep user/group shares when the user renames the share within the Shares folder Given group "grp1" has been created And user "Brian" has been added to group "grp1" And user "Carol" has been added to group "grp1" diff --git a/tests/acceptance/features/coreApiShareManagementToShares/moveShareInsideAnotherShare.feature b/tests/acceptance/features/coreApiShareManagementToShares/moveShareInsideAnotherShare.feature index 1f4be27544..c6caac893b 100644 --- a/tests/acceptance/features/coreApiShareManagementToShares/moveShareInsideAnotherShare.feature +++ b/tests/acceptance/features/coreApiShareManagementToShares/moveShareInsideAnotherShare.feature @@ -2,7 +2,7 @@ Feature: moving a share inside another share As a user I want to move a shared resource inside another shared resource - Because I need full flexibility when managing resources. + So that I have full flexibility when managing resources Background: Given auto-accept shares has been disabled diff --git a/tests/acceptance/features/coreApiShareOperationsToShares1/accessToShare.feature b/tests/acceptance/features/coreApiShareOperationsToShares1/accessToShare.feature index dcc64d3893..0054c77542 100644 --- a/tests/acceptance/features/coreApiShareOperationsToShares1/accessToShare.feature +++ b/tests/acceptance/features/coreApiShareOperationsToShares1/accessToShare.feature @@ -10,7 +10,7 @@ Feature: sharing And user "Alice" has uploaded file with content "some data" to "/textfile0.txt" @smokeTest - Scenario Outline: Sharee can see the share + Scenario Outline: sharee can see the share Given using OCS API version "" And user "Alice" has shared file "textfile0.txt" with user "Brian" And user "Brian" has accepted share "/textfile0.txt" offered by user "Alice" @@ -24,7 +24,7 @@ Feature: sharing | 2 | 200 | @smokeTest - Scenario Outline: Sharee can see the filtered share + Scenario Outline: sharee can see the filtered share Given using OCS API version "" And user "Alice" has uploaded file with content "some data" to "/textfile1.txt" And user "Alice" has shared file "textfile0.txt" with user "Brian" @@ -41,7 +41,7 @@ Feature: sharing | 2 | 200 | @smokeTest @issue-1257 - Scenario Outline: Sharee can't see the share that is filtered out + Scenario Outline: sharee can't see the share that is filtered out Given using OCS API version "" And user "Alice" has uploaded file with content "some data" to "/textfile1.txt" And user "Alice" has shared file "textfile0.txt" with user "Brian" @@ -58,7 +58,7 @@ Feature: sharing | 2 | 200 | @smokeTest @issue-1289 - Scenario Outline: Sharee can see the group share + Scenario Outline: sharee can see the group share Given using OCS API version "" And group "grp1" has been created And user "Brian" has been added to group "grp1"