diff --git a/tests/acceptance/expected-failures-API-on-OCIS-storage.md b/tests/acceptance/expected-failures-API-on-OCIS-storage.md index d8c4b7e36..36c1dd103 100644 --- a/tests/acceptance/expected-failures-API-on-OCIS-storage.md +++ b/tests/acceptance/expected-failures-API-on-OCIS-storage.md @@ -58,19 +58,6 @@ Synchronization features like etag propagation, setting mtime and locking files 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:314](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiShareManagementToShares/acceptShares.feature#L314) -- [coreApiShareManagementToShares/acceptShares.feature:339](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiShareManagementToShares/acceptShares.feature#L339) -- [coreApiShareManagementToShares/acceptShares.feature:570](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiShareManagementToShares/acceptShares.feature#L570) -- [coreApiShareManagementToShares/acceptShares.feature:636](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiShareManagementToShares/acceptShares.feature#L636) -- [coreApiShareCreateSpecialToShares2/createShareReceivedInMultipleWays.feature:44](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiShareCreateSpecialToShares2/createShareReceivedInMultipleWays.feature#L44) -- [coreApiShareCreateSpecialToShares2/createShareReceivedInMultipleWays.feature:45](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiShareCreateSpecialToShares2/createShareReceivedInMultipleWays.feature#L45) -- [coreApiShareCreateSpecialToShares2/createShareReceivedInMultipleWays.feature:141](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiShareCreateSpecialToShares2/createShareReceivedInMultipleWays.feature#L141) -- [coreApiShareCreateSpecialToShares2/createShareReceivedInMultipleWays.feature:142](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiShareCreateSpecialToShares2/createShareReceivedInMultipleWays.feature#L142) -- [coreApiShareCreateSpecialToShares2/createShareReceivedInMultipleWays.feature:174](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiShareCreateSpecialToShares2/createShareReceivedInMultipleWays.feature#L174) -- [coreApiShareCreateSpecialToShares2/createShareReceivedInMultipleWays.feature:175](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiShareCreateSpecialToShares2/createShareReceivedInMultipleWays.feature#L175) - #### [file_target of an auto-renamed file is not correct directly after sharing](https://github.com/owncloud/core/issues/32322) - [coreApiShareManagementToShares/mergeShare.feature:112](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiShareManagementToShares/mergeShare.feature#L112) @@ -298,7 +285,7 @@ Not everything needs to be implemented for ocis. While the oc10 testsuite covers - [coreApiShareManagementToShares/acceptShares.feature:186](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiShareManagementToShares/acceptShares.feature#L186) - [coreApiShareManagementToShares/acceptShares.feature:235](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiShareManagementToShares/acceptShares.feature#L235) - [coreApiShareManagementToShares/acceptShares.feature:303](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiShareManagementToShares/acceptShares.feature#L303) -- [coreApiShareManagementToShares/acceptShares.feature:537](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiShareManagementToShares/acceptShares.feature#L537) +- [coreApiShareManagementToShares/acceptShares.feature:534](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiShareManagementToShares/acceptShares.feature#L534) - [coreApiShareManagementBasicToShares/deleteShareFromShares.feature:213](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiShareManagementBasicToShares/deleteShareFromShares.feature#L213) - [coreApiShareManagementBasicToShares/deleteShareFromShares.feature:214](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiShareManagementBasicToShares/deleteShareFromShares.feature#L214) - [coreApiShareManagementBasicToShares/deleteShareFromShares.feature:215](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiShareManagementBasicToShares/deleteShareFromShares.feature#L215) diff --git a/tests/acceptance/features/coreApiShareCreateSpecialToShares2/createShareReceivedInMultipleWays.feature b/tests/acceptance/features/coreApiShareCreateSpecialToShares2/createShareReceivedInMultipleWays.feature index dde07f508..f7ff24890 100644 --- a/tests/acceptance/features/coreApiShareCreateSpecialToShares2/createShareReceivedInMultipleWays.feature +++ b/tests/acceptance/features/coreApiShareCreateSpecialToShares2/createShareReceivedInMultipleWays.feature @@ -28,17 +28,17 @@ Feature: share resources where the sharee receives the share in multiple ways And the HTTP status code should be "200" And user "Brian" should be able to accept pending share "/textfile0.txt" offered by user "Alice" And the fields of the last response to user "Alice" sharing with user "Brian" should include - | share_with | %username% | - | share_with_displayname | %displayname% | - | file_target | /textfile0 (2).txt | - | path | /Shares/textfile0 (2).txt | - | permissions | share,read,update | - | uid_owner | %username% | - | displayname_owner | %displayname% | - | item_type | file | - | mimetype | text/plain | - | storage_id | ANY_VALUE | - | share_type | user | + | share_with | %username% | + | share_with_displayname | %displayname% | + | path | /textfile0.txt | + | file_target | /Shares/textfile0.txt | + | permissions | read,update | + | uid_owner | %username% | + | displayname_owner | %displayname% | + | item_type | file | + | mimetype | text/plain | + | storage_id | ANY_VALUE | + | share_type | user | Examples: | ocs-api-version | ocs-status-code | | 1 | 100 | @@ -120,22 +120,22 @@ Feature: share resources where the sharee receives the share in multiple ways Then the HTTP status code should be "200" And the OCS status code should be "" And as "Alice" the info about the last share by user "Brian" with user "Alice" should include - | uid_owner | %username% | - | share_with | %username% | - | file_target | /randomfile.txt | - | item_type | file | - | permissions | read | + | uid_owner | %username% | + | share_with | %username% | + | file_target | /Shares/randomfile.txt | + | item_type | file | + | permissions | read | When user "Carol" shares file "randomfile.txt" with user "Alice" with permissions "read,update" using the sharing API Then the HTTP status code should be "200" And the OCS status code should be "" And as "Alice" the info about the last share by user "Carol" with user "Alice" should include - | uid_owner | %username% | - | share_with | %username% | - | file_target | /randomfile (2).txt | - | item_type | file | - | permissions | read,update | + | uid_owner | %username% | + | share_with | %username% | + | file_target | /Shares/randomfile.txt | + | item_type | file | + | permissions | read,update | And the content of file "/Shares/randomfile.txt" for user "Alice" should be "First data" - And the content of file "/Shares/randomfile (2).txt" for user "Alice" should be "Second data" + And the content of file "/Shares/randomfile (1).txt" for user "Alice" should be "Second data" Examples: | ocs-api-version | ocs-status-code | | 1 | 100 | @@ -151,24 +151,24 @@ Feature: share resources where the sharee receives the share in multiple ways And user "Carol" has created folder "zzzfolder/Carol" When user "Brian" shares folder "zzzfolder" with user "Alice" with permissions "read,delete" using the sharing API Then the HTTP status code should be "200" - And the OCS status code should be "100" + And the OCS status code should be "" And as "Alice" the info about the last share by user "Brian" with user "Alice" should include - | uid_owner | %username% | - | share_with | %username% | - | file_target | /zzzfolder | - | item_type | folder | - | permissions | read,delete | + | uid_owner | %username% | + | share_with | %username% | + | file_target | /Shares/zzzfolder | + | item_type | folder | + | permissions | read,delete | When user "Carol" shares folder "zzzfolder" with user "Alice" with permissions "read" using the sharing API Then the HTTP status code should be "200" And the OCS status code should be "" And as "Alice" the info about the last share by user "Carol" with user "Alice" should include - | uid_owner | %username% | - | share_with | %username% | - | file_target | /zzzfolder (2) | - | item_type | folder | - | permissions | read,share | + | uid_owner | %username% | + | share_with | %username% | + | file_target | /Shares/zzzfolder | + | item_type | folder | + | permissions | read | And as "Alice" folder "/Shares/zzzfolder/Brian" should exist - And as "Alice" folder "/Shares/zzzfolder (2)/Carol" should exist + And as "Alice" folder "/Shares/zzzfolder (1)/Carol" should exist Examples: | ocs-api-version | ocs-status-code | | 1 | 100 | diff --git a/tests/acceptance/features/coreApiShareManagementToShares/acceptShares.feature b/tests/acceptance/features/coreApiShareManagementToShares/acceptShares.feature index 870262ca7..59ec923b4 100644 --- a/tests/acceptance/features/coreApiShareManagementToShares/acceptShares.feature +++ b/tests/acceptance/features/coreApiShareManagementToShares/acceptShares.feature @@ -312,28 +312,29 @@ Feature: accept/decline shares coming from internal users Scenario: user accepts file that was initially accepted from another user and then declined - Given user "Carol" has disabled auto-accepting - And user "Alice" has uploaded file with content "First file" to "/testfile.txt" + 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" - And user "Carol" has uploaded file with content "Third file" to "/Shares/testfile.txt" And user "Alice" has sent the following resource share invitation: | resource | testfile.txt | | space | Personal | | sharee | Carol | | shareType | user | | permissionsRole | Viewer | - 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" has declined share "/Shares/testfile.txt" offered by user "Alice" + And user "Carol" has disabled auto-accepting + And user "Brian" has sent the following resource share invitation: + | resource | testfile.txt | + | space | Personal | + | sharee | Carol | + | shareType | user | + | permissionsRole | Viewer | + When user "Carol" accepts share "/testfile.txt" offered by user "Brian" using the sharing API Then the HTTP status code should be "200" And the OCS status code should be "100" And the sharing API should report to user "Carol" that these shares are in the accepted state - | path | - | /Shares/testfile (2).txt | - | /Shares/testfile (2) (2).txt | - 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" + | path | + | /Shares/testfile.txt | + And the content of file "/Shares/testfile.txt" for user "Carol" should be "Second file" Scenario: user accepts shares received from multiple users with the same name when auto-accept share is disabled @@ -353,25 +354,21 @@ Feature: accept/decline shares coming from internal users | sharee | Alice | | shareType | user | | permissionsRole | Viewer | - And user "Alice" has created folder "Shares" - And user "Alice" has created folder "Shares/PARENT" 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 "/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 "Alice" declines share "/Shares/PARENT (1)" offered by user "Carol" using the sharing API + And user "Alice" declines share "/Shares/PARENT" 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 "/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 + And user "Alice" accepts share "/PARENT" offered by user "Carol" using the sharing API + And user "Alice" accepts share "/PARENT" 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 - | path | uid_owner | - | /Shares/PARENT (2)/ | David | - | /Shares/PARENT (2) (2)/ | Carol | - | /Shares/PARENT (2) (2) (2)/ | Brian | + | path | uid_owner | + | /Shares/PARENT | David | + | /Shares/PARENT (1) | Carol | + | /Shares/PARENT (2) | Brian | Scenario: user shares folder with matching folder-name for both user involved in sharing @@ -623,13 +620,13 @@ Feature: accept/decline shares coming from internal users And user "Brian" should see the following elements | /PARENT/ | | /Shares/PARENT/ | - | /Shares/PARENT (2)/ | + | /Shares/PARENT (1)/ | | /Shares/PaRent/ | | /Shares/PARENT.txt | - | /Shares/PARENT (2).txt | + | /Shares/PARENT (1).txt | | /Shares/parent.txt | - And the content of file "/Shares/PARENT (2)/parent.txt" for user "Brian" should be "subfile, from carol to grp1" - And the content of file "/Shares/PARENT (2).txt" for user "Brian" should be "from carol to grp1" + And the content of file "/Shares/PARENT (1)/parent.txt" for user "Brian" should be "subfile, from carol to grp1" + And the content of file "/Shares/PARENT (1).txt" for user "Brian" should be "from carol to grp1" And the content of file "/Shares/parent.txt" for user "Brian" should be "from carol to grp1" @issue-2131 @@ -686,10 +683,10 @@ Feature: accept/decline shares coming from internal users And user "Carol" should see the following elements | /PARENT/ | | /Shares/PARENT/ | - | /Shares/PARENT (2)/ | + | /Shares/PARENT (1)/ | | /Shares/PaRent/ | | /Shares/PARENT.txt | - | /Shares/PARENT (2).txt | + | /Shares/PARENT (1).txt | | /Shares/parent.txt | - And the content of file "/Shares/PARENT (2)/parent.txt" for user "Carol" should be "subfile, from brian to grp1" - And the content of file "/Shares/PARENT (2).txt" for user "Carol" should be "from brian to grp1" + And the content of file "/Shares/PARENT (1)/parent.txt" for user "Carol" should be "subfile, from brian to grp1" + And the content of file "/Shares/PARENT (1).txt" for user "Carol" should be "from brian to grp1"