Merge pull request #5561 from owncloud/forward-port-share=permission-…

…CoreApiSharePublicLink3 [tests-only][full-ci]Forward-port refactor share permission related scenario
owncloud · Feb 14, 2023 · 93c2844 · 93c2844
2 parents 6a10559 + 13365f8
commit 93c2844
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 312 deletions.
diff --git a/tests/acceptance/expected-failures-API-on-OCIS-storage.md b/tests/acceptance/expected-failures-API-on-OCIS-storage.md
@@ -253,18 +253,16 @@ cannot share a folder with create permission
 - [coreApiSharePublicLink2/copyFromPublicLink.feature:174](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiSharePublicLink2/copyFromPublicLink.feature#L174)
 - [coreApiSharePublicLink2/copyFromPublicLink.feature:189](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiSharePublicLink2/copyFromPublicLink.feature#L189)
 - [coreApiSharePublicLink2/copyFromPublicLink.feature:190](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiSharePublicLink2/copyFromPublicLink.feature#L190)
-- [coreApiSharePublicLink3/updatePublicLinkShare.feature:45](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiSharePublicLink3/updatePublicLinkShare.feature#L45)
-- [coreApiSharePublicLink3/updatePublicLinkShare.feature:46](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiSharePublicLink3/updatePublicLinkShare.feature#L46)
 
 #### [Upload-only shares must not overwrite but create a separate file](https://github.com/owncloud/ocis/issues/1267)
 
-- [coreApiSharePublicLink3/uploadToPublicLinkShare.feature:24](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiSharePublicLink3/uploadToPublicLinkShare.feature#L24)
-- [coreApiSharePublicLink3/uploadToPublicLinkShare.feature:273](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiSharePublicLink3/uploadToPublicLinkShare.feature#L273)
+- [coreApiSharePublicLink3/uploadToPublicLinkShare.feature:10](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiSharePublicLink3/uploadToPublicLinkShare.feature#L10)
+- [coreApiSharePublicLink3/uploadToPublicLinkShare.feature:131](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiSharePublicLink3/uploadToPublicLinkShare.feature#L131)
 
 #### [Set quota over settings](https://github.com/owncloud/ocis/issues/1290)
 
-- [coreApiSharePublicLink3/uploadToPublicLinkShare.feature:160](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiSharePublicLink3/uploadToPublicLinkShare.feature#L160)
-- [coreApiSharePublicLink3/uploadToPublicLinkShare.feature:179](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiSharePublicLink3/uploadToPublicLinkShare.feature#L179)
+- [coreApiSharePublicLink3/uploadToPublicLinkShare.feature:84](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiSharePublicLink3/uploadToPublicLinkShare.feature#L84)
+- [coreApiSharePublicLink3/uploadToPublicLinkShare.feature:93](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiSharePublicLink3/uploadToPublicLinkShare.feature#L93)
 
 
 #### [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)
@@ -701,11 +699,6 @@ Not everything needs to be implemented for ocis. While the oc10 testsuite covers
 - [coreApiWebdavUpload1/uploadFileToBlacklistedName.feature:70](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavUpload1/uploadFileToBlacklistedName.feature#L70)
 - [coreApiWebdavUpload1/uploadFileToBlacklistedName.feature:76](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavUpload1/uploadFileToBlacklistedName.feature#L76)
 
-#### [Allow public link sharing only for certain groups feature not implemented](https://github.com/owncloud/ocis/issues/4623)
-
-- [coreApiSharePublicLink3/allowGroupToCreatePublicLinks.feature:35](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiSharePublicLink3/allowGroupToCreatePublicLinks.feature#L35)
-- [coreApiSharePublicLink3/allowGroupToCreatePublicLinks.feature:92](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiSharePublicLink3/allowGroupToCreatePublicLinks.feature#L92)
-
 #### [Preview of text file with UTF content does not render correctly](https://github.com/owncloud/ocis/issues/2570)
 
 - [coreApiWebdavPreviews/previews.feature:211](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavPreviews/previews.feature#L211)

diff --git a/tests/acceptance/features/bootstrap/Sharing.php b/tests/acceptance/features/bootstrap/Sharing.php
@@ -2858,7 +2858,9 @@ public function checkFields(string $user, ?TableNode $body):void {
 			"uid_file_owner",
 			"share_with",
 			"displayname_file_owner",
-			"displayname_owner"
+			"displayname_owner",
+			"additional_info_owner",
+			"additional_info_file_owner"
 		];
 		foreach ($bodyRows as $field => $value) {
 			if (\in_array($field, $userRelatedFieldNames)) {

diff --git a/tests/acceptance/features/coreApiSharePublicLink3/allowGroupToCreatePublicLinks.feature b/tests/acceptance/features/coreApiSharePublicLink3/allowGroupToCreatePublicLinks.feature
diff --git a/tests/acceptance/features/coreApiSharePublicLink3/updatePublicLinkShare.feature b/tests/acceptance/features/coreApiSharePublicLink3/updatePublicLinkShare.feature
@@ -14,7 +14,7 @@ Feature: update a public link share
     When user "Alice" updates the last public link share using the sharing API with
       | expireDate | 2040-01-01T23:59:59+0100 |
     Then the OCS status code should be "<ocs_status_code>"
-    And the OCS status message should be "Ok"
+    And the OCS status message should be "OK"
     And the HTTP status code should be "200"
     And the fields of the last response to user "Alice" should include
       | id                         | A_STRING             |
@@ -28,8 +28,8 @@ Feature: update a public link share
       | token                      | A_STRING             |
       | uid_file_owner             | %username%           |
       | displayname_file_owner     | %displayname%        |
-      | additional_info_owner      |                      |
-      | additional_info_file_owner |                      |
+      | additional_info_owner      | %emailaddress%       |
+      | additional_info_file_owner | %emailaddress%       |
       | item_type                  | folder               |
       | item_source                | A_STRING             |
       | path                       | /FOLDER              |
@@ -413,25 +413,17 @@ Feature: update a public link share
       | permissions | read    |
     And user "Alice" has updated the last public link share with
       | permissions | read,update,create,delete |
-    When the public deletes file "CHILD/child.txt" from the last public link share using the <public-webdav-api-version> public WebDAV API
-    And the public deletes file "parent.txt" from the last public link share using the <public-webdav-api-version> public WebDAV API
+    When the public deletes file "CHILD/child.txt" from the last public link share using the new public WebDAV API
+    And the public deletes file "parent.txt" from the last public link share using the new public WebDAV API
     Then the HTTP status code of responses on all endpoints should be "204"
     And as "Alice" file "PARENT/CHILD/child.txt" should not exist
     And as "Alice" file "PARENT/parent.txt" should not exist
-
-    @notToImplementOnOCIS @issue-ocis-2079
     Examples:
-      | ocs_api_version | public-webdav-api-version |
-      | 1               | old                       |
-      | 2               | old                       |
-
+      | ocs_api_version |
+      | 1               |
+      | 2               |
 
-    Examples:
-      | ocs_api_version | public-webdav-api-version |
-      | 1               | new                       |
-      | 2               | new                       |
 
-  @skipOnOcV10
   Scenario Outline: API responds with a full set of parameters when owner renames the folder with a public link in ocis
     Given using OCS API version "<ocs_api_version>"
     And using <dav-path> DAV path
@@ -478,7 +470,6 @@ Feature: update a public link share
       | spaces   | 2               | 200             |
 
 
-  @skipOnOcV10
   Scenario Outline: API responds with a full set of parameters when owner renames the file with a public link in ocis
     Given using OCS API version "<ocs_api_version>"
     And using <dav-path> DAV path