addhressing reviews

owncloud · Jul 26, 2024 · 301e020 · 301e020
1 parent 5762fc9
commit 301e020
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 70 deletions.
diff --git a/tests/acceptance/expected-failures-API-on-OCIS-storage.md b/tests/acceptance/expected-failures-API-on-OCIS-storage.md
@@ -8,8 +8,8 @@ Basic file management like up and download, move, copy, properties, trash, versi
 
 #### [copy personal space file to shared folder root result share in decline state](https://github.com/owncloud/ocis/issues/6999)
 
-- [coreApiWebdavProperties/copyFile.feature:261](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavProperties/copyFile.feature#L261)
-- [coreApiWebdavProperties/copyFile.feature:262](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavProperties/copyFile.feature#L262)
+- [coreApiWebdavProperties/copyFile.feature:263](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavProperties/copyFile.feature#L263)
+- [coreApiWebdavProperties/copyFile.feature:264](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavProperties/copyFile.feature#L264)
 
 #### [Custom dav properties with namespaces are rendered incorrectly](https://github.com/owncloud/ocis/issues/2140)
 
@@ -190,14 +190,14 @@ And other missing implementation of favorites
 
 #### [copying the file inside Shares folder returns 412](https://github.com/owncloud/ocis/issues/3874)
 
-- [coreApiWebdavProperties/copyFile.feature:408](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavProperties/copyFile.feature#L408)
-- [coreApiWebdavProperties/copyFile.feature:409](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavProperties/copyFile.feature#L409)
 - [coreApiWebdavProperties/copyFile.feature:410](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavProperties/copyFile.feature#L410)
-- [coreApiWebdavProperties/copyFile.feature:435](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavProperties/copyFile.feature#L435)
-- [coreApiWebdavProperties/copyFile.feature:436](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavProperties/copyFile.feature#L436)
+- [coreApiWebdavProperties/copyFile.feature:411](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavProperties/copyFile.feature#L411)
+- [coreApiWebdavProperties/copyFile.feature:412](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavProperties/copyFile.feature#L412)
 - [coreApiWebdavProperties/copyFile.feature:437](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavProperties/copyFile.feature#L437)
-- [coreApiWebdavProperties/copyFile.feature:238](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavProperties/copyFile.feature#L238)
-- [coreApiWebdavProperties/copyFile.feature:239](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavProperties/copyFile.feature#L239)
+- [coreApiWebdavProperties/copyFile.feature:438](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavProperties/copyFile.feature#L438)
+- [coreApiWebdavProperties/copyFile.feature:439](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavProperties/copyFile.feature#L439)
+- [coreApiWebdavProperties/copyFile.feature:240](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavProperties/copyFile.feature#L240)
+- [coreApiWebdavProperties/copyFile.feature:241](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavProperties/copyFile.feature#L241)
 
 ### Won't fix
 
@@ -208,9 +208,9 @@ Not everything needs to be implemented for ocis. While the oc10 testsuite covers
 
 #### [Blacklist files extensions](https://github.com/owncloud/ocis/issues/2177)
 
-- [coreApiWebdavProperties/copyFile.feature:107](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavProperties/copyFile.feature#L107)
-- [coreApiWebdavProperties/copyFile.feature:108](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavProperties/copyFile.feature#L108)
 - [coreApiWebdavProperties/copyFile.feature:109](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavProperties/copyFile.feature#L109)
+- [coreApiWebdavProperties/copyFile.feature:110](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavProperties/copyFile.feature#L110)
+- [coreApiWebdavProperties/copyFile.feature:111](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavProperties/copyFile.feature#L111)
 - [coreApiWebdavProperties/createFileFolder.feature:95](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavProperties/createFileFolder.feature#L95)
 - [coreApiWebdavProperties/createFileFolder.feature:96](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavProperties/createFileFolder.feature#L96)
 - [coreApiWebdavProperties/createFileFolder.feature:97](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavProperties/createFileFolder.feature#L97)

diff --git a/tests/acceptance/features/coreApiWebdavProperties/copyFile.feature b/tests/acceptance/features/coreApiWebdavProperties/copyFile.feature
@@ -645,26 +645,6 @@ Feature: copy file
       | old              |
       | new              |
 
-
-  Scenario Outline: copying a file into a shared folder shared via viewer and secure viewer permissions as the sharee
-    Given using <dav-path-version> DAV path
-    And user "Brian" has been created with default attributes and without skeleton files
-    And user "Brian" has created folder "/testshare"
-    And user "Brian" has sent the following resource share invitation:
-      | resource        | testshare          |
-      | space           | Personal           |
-      | sharee          | Alice              |
-      | shareType       | user               |
-      | permissionsRole | <permissions-role> |
-    When user "Alice" copies file "/textfile0.txt" to "/Shares/testshare/textfile0.txt" using the WebDAV API
-    Then the HTTP status code should be "403"
-    Examples:
-      | dav-path-version | permissions-role |
-      | old              | Viewer           |
-      | new              | Viewer           |
-      | old              | Secure viewer    |
-      | new              | Secure viewer    |
-
   @skipOnReva
   Scenario Outline: copying a file into a shared folder as the sharer
     Given using <dav-path-version> DAV path
@@ -711,7 +691,28 @@ Feature: copy file
       | new              |
 
 
-  Scenario Outline: copying a file out of a shared folder shared via secure viewer permissions as the sharee
+  Scenario Outline: sharee copies a file from a shared folder, shared with  viewer permission
+    Given using <dav-path-version> DAV path
+    And user "Brian" has been created with default attributes and without skeleton files
+    And user "Brian" has created folder "/testshare"
+    And user "Brian" has uploaded file with content "hello world" to "testshare/fileInsideShare.txt"
+    And user "Brian" has sent the following resource share invitation:
+      | resource        | testshare |
+      | space           | Personal  |
+      | sharee          | Alice     |
+      | shareType       | user      |
+      | permissionsRole | Viewer    |
+    And user "Alice" has a share "testshare" synced
+    When user "Alice" copies file "/Shares/testshare/fileInsideShare.txt" to "/fileInsideShare.txt" using the WebDAV API
+    Then the HTTP status code should be "201"
+    And as "Alice" file "/fileInsideShare.txt" should exist
+    Examples:
+      | dav-path-version |
+      | old              |
+      | new              |
+
+
+  Scenario Outline: sharee copies a file from a shared folder, shared with secure viewer permission
     Given using <dav-path-version> DAV path
     And user "Brian" has been created with default attributes and without skeleton files
     And user "Brian" has created folder "/testshare"
@@ -722,8 +723,9 @@ Feature: copy file
       | sharee          | Alice         |
       | shareType       | user          |
       | permissionsRole | Secure viewer |
+    And user "Alice" has a share "testshare" synced
     When user "Alice" copies file "/Shares/testshare/fileInsideShare.txt" to "/fileInsideShare.txt" using the WebDAV API
-    Then the HTTP status code should be "500"
+    Then the HTTP status code should be "403"
     And as "Alice" file "/fileInsideShare.txt" should not exist
     Examples:
       | dav-path-version |
@@ -816,25 +818,31 @@ Feature: copy file
     And user "Carol" has been created with default attributes and without skeleton files
     And user "Brian" has created folder "/testshare0"
     And user "Brian" has uploaded file with content "content inside testshare0" to "/testshare0/testshare0.txt"
+    And user "Brian" has created folder "/testshare0/folder_to_copy/"
     And user "Carol" has created folder "/testshare1"
     And user "Brian" has sent the following resource share invitation:
       | resource        | testshare0           |
       | space           | Personal             |
       | sharee          | Alice                |
       | shareType       | user                 |
       | permissionsRole | <permissions-role-1> |
+    And user "Alice" has a share "testshare0" synced
     And user "Carol" has sent the following resource share invitation:
       | resource        | testshare1           |
       | space           | Personal             |
       | sharee          | Alice                |
       | shareType       | user                 |
       | permissionsRole | <permissions-role-2> |
+    And user "Alice" has a share "testshare1" synced
+    When user "Alice" copies folder "/Shares/testshare0/folder_to_copy/" to "/Shares/testshare1/folder_to_copy/" using the WebDAV API
+    Then the HTTP status code should be "<status-code>"
+    And as "Alice" folder "/Shares/testshare1/folder_to_copy/" should not exist
     When user "Alice" copies file "/Shares/testshare0/testshare0.txt" to "/Shares/testshare1/testshare0.txt" using the WebDAV API
     Then the HTTP status code should be "<status-code>"
+    And as "Alice" file "/Shares/testshare1/testshare0.txt" should not exist
+
     Examples:
       | dav-path-version | permissions-role-1 | permissions-role-2 | status-code |
-      | old              | Secure viewer      | Editor             | 500         |
-      | new              | Secure viewer      | Editor             | 500         |
       | old              | Secure viewer      | Secure viewer      | 403         |
       | new              | Secure viewer      | Secure viewer      | 403         |
       | old              | Secure viewer      | Viewer             | 403         |
@@ -878,42 +886,6 @@ Feature: copy file
       | old              |
       | new              |
 
-
-  Scenario Outline: copying a folder between shares received from different users when one share is shared via Secure viewer
-    Given using <dav-path-version> DAV path
-    And user "Brian" has been created with default attributes and without skeleton files
-    And user "Carol" has been created with default attributes and without skeleton files
-    And user "Brian" has created folder "/testshare0"
-    And user "Brian" has created folder "/testshare0/folder_to_copy/"
-    And user "Carol" has created folder "/testshare1"
-    And user "Brian" has sent the following resource share invitation:
-      | resource        | testshare0           |
-      | space           | Personal             |
-      | sharee          | Alice                |
-      | shareType       | user                 |
-      | permissionsRole | <permissions-role-1> |
-    And user "Carol" has sent the following resource share invitation:
-      | resource        | testshare1           |
-      | space           | Personal             |
-      | sharee          | Alice                |
-      | shareType       | user                 |
-      | permissionsRole | <permissions-role-2> |
-    When user "Alice" copies file "/Shares/testshare0/folder_to_copy/" to "/Shares/testshare1/folder_to_copy/" using the WebDAV API
-    Then the HTTP status code should be "<status-code>"
-    Examples:
-      | dav-path-version | permissions-role-1 | permissions-role-2 | status-code |
-      | old              | Secure viewer      | Editor             | 201         |
-      | new              | Secure viewer      | Editor             | 201         |
-      | old              | Secure viewer      | Secure viewer      | 403         |
-      | new              | Secure viewer      | Secure viewer      | 403         |
-      | old              | Secure viewer      | Viewer             | 403         |
-      | new              | Secure viewer      | Viewer             | 403         |
-      | old              | Editor             | Secure viewer      | 403         |
-      | new              | Editor             | Secure viewer      | 403         |
-      | old              | Viewer             | Secure viewer      | 403         |
-      | new              | Viewer             | Secure viewer      | 403         |
-
-
   @skipOnReva
   Scenario Outline: copying a file to a folder that is shared with multiple users
     Given using <dav-path-version> DAV path