From e144de86af5b8cc7e1e3ee435b34f3647e4e50b0 Mon Sep 17 00:00:00 2001 From: Prarup Gurung Date: Mon, 20 May 2024 12:51:35 +0545 Subject: [PATCH 1/2] trashbinFilesFolders.feature: Used sharingNG for sharing in given step --- tests/acceptance/config/behat-core.yml | 1 + .../coreApiTrashbin/trashbinFilesFolders.feature | 14 ++++++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/tests/acceptance/config/behat-core.yml b/tests/acceptance/config/behat-core.yml index 2366a49ec4..e0d584e897 100644 --- a/tests/acceptance/config/behat-core.yml +++ b/tests/acceptance/config/behat-core.yml @@ -174,6 +174,7 @@ default: - FeatureContext: *common_feature_context_params - TrashbinContext: - WebDavPropertiesContext: + - SharingNgContext: coreApiTrashbinRestore: paths: diff --git a/tests/acceptance/features/coreApiTrashbin/trashbinFilesFolders.feature b/tests/acceptance/features/coreApiTrashbin/trashbinFilesFolders.feature index 478daa2507..b88fbddb48 100644 --- a/tests/acceptance/features/coreApiTrashbin/trashbinFilesFolders.feature +++ b/tests/acceptance/features/coreApiTrashbin/trashbinFilesFolders.feature @@ -65,7 +65,12 @@ Feature: files and folders exist in the trashbin after being deleted And user "Brian" has been created with default attributes and without skeleton files And user "Alice" has created folder "/shared" And user "Alice" has moved file "/textfile0.txt" to "/shared/shared_file.txt" - And user "Alice" has shared folder "/shared" with user "Brian" + And user "Alice" has sent the following resource share invitation: + | resource | shared | + | space | Personal | + | sharee | Brian | + | shareType | user | + | permissionsRole | Editor | When user "Alice" deletes file "/shared/shared_file.txt" using the WebDAV API Then the HTTP status code should be "204" And as "Alice" the file with original path "/shared/shared_file.txt" should exist in the trashbin @@ -86,7 +91,12 @@ Feature: files and folders exist in the trashbin after being deleted And user "Brian" has been created with default attributes and without skeleton files And user "Alice" has created folder "/shared" And user "Alice" has moved file "/textfile0.txt" to "/shared/shared_file.txt" - And user "Alice" has shared folder "/shared" with user "Brian" + And user "Alice" has sent the following resource share invitation: + | resource | shared | + | space | Personal | + | sharee | Brian | + | shareType | user | + | permissionsRole | Editor | When user "Alice" deletes folder "/shared" using the WebDAV API Then the HTTP status code should be "204" And as "Alice" the folder with original path "/shared" should exist in the trashbin From c627b940b9ca6271656dfa243bbaafec69a3e8d9 Mon Sep 17 00:00:00 2001 From: Prarup Gurung Date: Mon, 20 May 2024 13:03:24 +0545 Subject: [PATCH 2/2] trashbinSharingToShares.feature: Used sharingNG for sharing in given step --- .../expected-failures-API-on-OCIS-storage.md | 22 +++---- .../trashbinSharingToShares.feature | 63 ++++++++++++++++--- 2 files changed, 65 insertions(+), 20 deletions(-) diff --git a/tests/acceptance/expected-failures-API-on-OCIS-storage.md b/tests/acceptance/expected-failures-API-on-OCIS-storage.md index 6be4e01e82..25c3ab08df 100644 --- a/tests/acceptance/expected-failures-API-on-OCIS-storage.md +++ b/tests/acceptance/expected-failures-API-on-OCIS-storage.md @@ -112,17 +112,17 @@ cannot share a folder with create permission #### [deleting a file inside a received shared folder is moved to the trash-bin of the sharer not the receiver](https://github.com/owncloud/ocis/issues/1124) -- [coreApiTrashbin/trashbinSharingToShares.feature:29](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiTrashbin/trashbinSharingToShares.feature#L29) -- [coreApiTrashbin/trashbinSharingToShares.feature:45](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiTrashbin/trashbinSharingToShares.feature#L45) -- [coreApiTrashbin/trashbinSharingToShares.feature:50](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiTrashbin/trashbinSharingToShares.feature#L50) -- [coreApiTrashbin/trashbinSharingToShares.feature:70](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiTrashbin/trashbinSharingToShares.feature#L70) -- [coreApiTrashbin/trashbinSharingToShares.feature:75](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiTrashbin/trashbinSharingToShares.feature#L75) -- [coreApiTrashbin/trashbinSharingToShares.feature:121](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiTrashbin/trashbinSharingToShares.feature#L121) -- [coreApiTrashbin/trashbinSharingToShares.feature:126](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiTrashbin/trashbinSharingToShares.feature#L126) -- [coreApiTrashbin/trashbinSharingToShares.feature:174](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiTrashbin/trashbinSharingToShares.feature#L174) -- [coreApiTrashbin/trashbinSharingToShares.feature:179](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiTrashbin/trashbinSharingToShares.feature#L179) -- [coreApiTrashbin/trashbinSharingToShares.feature:201](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiTrashbin/trashbinSharingToShares.feature#L201) -- [coreApiTrashbin/trashbinSharingToShares.feature:224](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiTrashbin/trashbinSharingToShares.feature#L224) +- [coreApiTrashbin/trashbinSharingToShares.feature:34](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiTrashbin/trashbinSharingToShares.feature#L34) +- [coreApiTrashbin/trashbinSharingToShares.feature:55](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiTrashbin/trashbinSharingToShares.feature#L55) +- [coreApiTrashbin/trashbinSharingToShares.feature:60](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiTrashbin/trashbinSharingToShares.feature#L60) +- [coreApiTrashbin/trashbinSharingToShares.feature:85](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiTrashbin/trashbinSharingToShares.feature#L85) +- [coreApiTrashbin/trashbinSharingToShares.feature:90](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiTrashbin/trashbinSharingToShares.feature#L90) +- [coreApiTrashbin/trashbinSharingToShares.feature:146](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiTrashbin/trashbinSharingToShares.feature#L146) +- [coreApiTrashbin/trashbinSharingToShares.feature:151](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiTrashbin/trashbinSharingToShares.feature#L151) +- [coreApiTrashbin/trashbinSharingToShares.feature:209](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiTrashbin/trashbinSharingToShares.feature#L209) +- [coreApiTrashbin/trashbinSharingToShares.feature:214](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiTrashbin/trashbinSharingToShares.feature#L214) +- [coreApiTrashbin/trashbinSharingToShares.feature:241](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiTrashbin/trashbinSharingToShares.feature#L241) +- [coreApiTrashbin/trashbinSharingToShares.feature:269](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiTrashbin/trashbinSharingToShares.feature#L269) #### [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) diff --git a/tests/acceptance/features/coreApiTrashbin/trashbinSharingToShares.feature b/tests/acceptance/features/coreApiTrashbin/trashbinSharingToShares.feature index 586d656456..f394107caa 100644 --- a/tests/acceptance/features/coreApiTrashbin/trashbinSharingToShares.feature +++ b/tests/acceptance/features/coreApiTrashbin/trashbinSharingToShares.feature @@ -14,7 +14,12 @@ Feature: using trashbin together with sharing And user "Brian" has been created with default attributes and without skeleton files And user "Alice" has created folder "/shared" And user "Alice" has moved file "/textfile0.txt" to "/shared/shared_file.txt" - And user "Alice" has shared folder "/shared" with user "Brian" + And user "Alice" has sent the following resource share invitation: + | resource | shared | + | space | Personal | + | sharee | Brian | + | shareType | user | + | permissionsRole | Editor | And user "Brian" has moved folder "/Shares/shared" to "/Shares/renamed_shared" When user "Brian" deletes folder "/Shares/renamed_shared" using the WebDAV API Then the HTTP status code should be "204" @@ -34,7 +39,12 @@ Feature: using trashbin together with sharing And user "Brian" has been created with default attributes and without skeleton files And user "Alice" has created folder "/shared" And user "Alice" has moved file "/textfile0.txt" to "/shared/shared_file.txt" - And user "Alice" has shared folder "/shared" with user "Brian" + And user "Alice" has sent the following resource share invitation: + | resource | shared | + | space | Personal | + | sharee | Brian | + | shareType | user | + | permissionsRole | Editor | And user "Brian" has moved file "/Shares/shared" to "/Shares/renamed_shared" When user "Brian" deletes file "/Shares/renamed_shared/shared_file.txt" using the WebDAV API Then the HTTP status code should be "204" @@ -59,7 +69,12 @@ Feature: using trashbin together with sharing And user "Carol" has been added to group "grp1" And user "Alice" has created folder "/shared" And user "Alice" has moved file "/textfile0.txt" to "/shared/shared_file.txt" - And user "Alice" has shared folder "/shared" with group "grp1" + And user "Alice" has sent the following resource share invitation: + | resource | shared | + | space | Personal | + | sharee | grp1 | + | shareType | group | + | permissionsRole | Editor | When user "Brian" deletes file "/Shares/shared/shared_file.txt" using the WebDAV API Then the HTTP status code should be "204" And as "Brian" the file with original path "/Shares/shared/shared_file.txt" should exist in the trashbin @@ -84,7 +99,12 @@ Feature: using trashbin together with sharing And user "Carol" has been added to group "grp1" And user "Alice" has created folder "/shared" And user "Alice" has moved file "/textfile0.txt" to "/shared/shared_file.txt" - And user "Alice" has shared folder "/shared" with group "grp1" + And user "Alice" has sent the following resource share invitation: + | resource | shared | + | space | Personal | + | sharee | grp1 | + | shareType | group | + | permissionsRole | Editor | When user "Alice" deletes file "/shared/shared_file.txt" using the WebDAV API Then the HTTP status code should be "204" And as "Alice" the file with original path "/shared/shared_file.txt" should exist in the trashbin @@ -110,7 +130,12 @@ Feature: using trashbin together with sharing And user "Alice" has created folder "/shared" And user "Alice" has created folder "/shared/sub" And user "Alice" has moved file "/textfile0.txt" to "/shared/sub/shared_file.txt" - And user "Alice" has shared folder "/shared" with group "grp1" + And user "Alice" has sent the following resource share invitation: + | resource | shared | + | space | Personal | + | sharee | grp1 | + | shareType | group | + | permissionsRole | Editor | When user "Brian" deletes file "/Shares/shared/sub/shared_file.txt" using the WebDAV API Then the HTTP status code should be "204" And as "Brian" the file with original path "/Shares/shared/sub/shared_file.txt" should exist in the trashbin @@ -136,7 +161,12 @@ Feature: using trashbin together with sharing And user "Alice" has created folder "/shared" And user "Alice" has created folder "/shared/sub" And user "Alice" has moved file "/textfile0.txt" to "/shared/sub/shared_file.txt" - And user "Alice" has shared folder "/shared" with group "grp1" + And user "Alice" has sent the following resource share invitation: + | resource | shared | + | space | Personal | + | sharee | grp1 | + | shareType | group | + | permissionsRole | Editor | When user "Alice" deletes file "/shared/sub/shared_file.txt" using the WebDAV API Then the HTTP status code should be "204" And as "Alice" the file with original path "/shared/sub/shared_file.txt" should exist in the trashbin @@ -157,7 +187,12 @@ Feature: using trashbin together with sharing And user "Brian" has been created with default attributes and without skeleton files And user "Alice" has created folder "/shared" And user "Alice" has moved file "/textfile0.txt" to "/shared/shared_file.txt" - And user "Alice" has shared folder "/shared" with user "Brian" + And user "Alice" has sent the following resource share invitation: + | resource | shared | + | space | Personal | + | sharee | Brian | + | shareType | user | + | permissionsRole | Editor | And user "Brian" has moved folder "/Shares/shared" to "/Shares/renamed_shared" And user "Brian" has deleted file "/Shares/renamed_shared/shared_file.txt" When user "Brian" restores the file with original path "/Shares/renamed_shared/shared_file.txt" using the trashbin API @@ -183,7 +218,12 @@ Feature: using trashbin together with sharing Given using DAV path And user "Brian" has been created with default attributes and without skeleton files And user "Brian" has created folder "shareFolderParent" - And user "Brian" has shared folder "shareFolderParent" with user "Alice" with permissions "read" + And user "Brian" has sent the following resource share invitation: + | resource | shareFolderParent | + | space | Personal | + | sharee | Alice | + | shareType | user | + | permissionsRole | Viewer | And as "Alice" folder "/Shares/shareFolderParent" should exist And user "Alice" has deleted file "/textfile0.txt" When user "Alice" restores the file with original path "/textfile0.txt" to "/Shares/shareFolderParent/textfile0.txt" using the trashbin API @@ -206,7 +246,12 @@ Feature: using trashbin together with sharing And user "Brian" has been created with default attributes and without skeleton files And user "Brian" has created folder "shareFolderParent" And user "Brian" has created folder "shareFolderParent/shareFolderChild" - And user "Brian" has shared folder "shareFolderParent" with user "Alice" with permissions "read" + And user "Brian" has sent the following resource share invitation: + | resource | shareFolderParent | + | space | Personal | + | sharee | Alice | + | shareType | user | + | permissionsRole | Viewer | And as "Alice" folder "/Shares/shareFolderParent/shareFolderChild" should exist And user "Alice" has deleted file "/textfile0.txt" When user "Alice" restores the file with original path "/textfile0.txt" to "/Shares/shareFolderParent/shareFolderChild/textfile0.txt" using the trashbin API