adjust MOVE tests to check 403 code

owncloud · Jan 2, 2024 · 23111c8 · 23111c8
1 parent e7a46dc
commit 23111c8
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 33 deletions.
diff --git a/tests/acceptance/expected-failures-API-on-OCIS-storage.md b/tests/acceptance/expected-failures-API-on-OCIS-storage.md
@@ -47,8 +47,8 @@ _ocdav: double-check the webdav property parsing when custom namespaces are used
 
 #### [moving a file into a shared folder as the sharee and as the sharer](https://github.com/owncloud/ocis/issues/1287)
 
--   [coreApiVersions/fileVersions.feature:382](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiVersions/fileVersions.feature#382)  Scenario: moving a file (with versions) into a shared folder as the sharee and as the sharer
--   [coreApiVersions/fileVersions.feature:383](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiVersions/fileVersions.feature#383)  Scenario: moving a file (with versions) into a shared folder as the sharee and as the sharer
+- [coreApiVersions/fileVersions.feature:382](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiVersions/fileVersions.feature#382) Scenario: moving a file (with versions) into a shared folder as the sharee and as the sharer
+- [coreApiVersions/fileVersions.feature:383](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiVersions/fileVersions.feature#383) Scenario: moving a file (with versions) into a shared folder as the sharee and as the sharer
 
 ### Sync
 
@@ -167,8 +167,6 @@ cannot share a folder with create permission
 - [coreApiWebdavMove2/moveShareOnOcis.feature:30](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavMove2/moveShareOnOcis.feature#L30)
 - [coreApiWebdavMove2/moveShareOnOcis.feature:93](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavMove2/moveShareOnOcis.feature#L93)
 - [coreApiWebdavMove2/moveShareOnOcis.feature:95](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavMove2/moveShareOnOcis.feature#L95)
-- [coreApiWebdavMove2/moveShareOnOcis.feature:161](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavMove2/moveShareOnOcis.feature#L161)
-- [coreApiWebdavMove2/moveShareOnOcis.feature:162](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavMove2/moveShareOnOcis.feature#L162)
 
 #### [Expiration date for shares is not implemented](https://github.com/owncloud/ocis/issues/1250)
 
@@ -480,12 +478,6 @@ Not everything needs to be implemented for ocis. While the oc10 testsuite covers
 - [coreApiWebdavOperations/downloadFile.feature:184](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavOperations/downloadFile.feature#L184)
 - [coreApiWebdavOperations/downloadFile.feature:189](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavOperations/downloadFile.feature#L189)
 
-#### [moveShareInsideAnotherShare behaves differently on oCIS than oC10](https://github.com/owncloud/ocis/issues/3047)
-
-- [coreApiShareManagementToShares/moveShareInsideAnotherShare.feature:21](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiShareManagementToShares/moveShareInsideAnotherShare.feature#L21)
-- [coreApiShareManagementToShares/moveShareInsideAnotherShare.feature:41](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiShareManagementToShares/moveShareInsideAnotherShare.feature#L41)
-- [coreApiShareManagementToShares/moveShareInsideAnotherShare.feature:55](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiShareManagementToShares/moveShareInsideAnotherShare.feature#L55)
-
 #### [Renaming resource to banned name is allowed in spaces webdav](https://github.com/owncloud/ocis/issues/3099)
 
 - [coreApiWebdavMove1/moveFolder.feature:26](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavMove1/moveFolder.feature#L26)

diff --git a/tests/acceptance/features/apiSpacesDavOperation/moveByFileId.feature b/tests/acceptance/features/apiSpacesDavOperation/moveByFileId.feature
@@ -154,8 +154,8 @@ Feature: moving/renaming file using file id
     And we save it into "FILEID"
     And user "Alice" has shared folder "/folder" with user "Brian" with permissions "all"
     When user "Brian" moves a file "Shares/folder/sub-folder/test.txt" into "Shares/folder" inside space "Shares" using file-id path "<dav-path>"
-    Then the HTTP status code should be "502"
-    And the value of the item "/d:error/s:message" in the response about user "Brian" should be "gateway does not support cross storage move, use copy and delete"
+    Then the HTTP status code should be "403"
+    And the value of the item "/d:error/s:message" in the response about user "Brian" should be "cross storage moves are not permitted, use copy and delete"
     And for user "Brian" folder "folder/sub-folder" of the space "Shares" should contain these files:
       | test.txt |
     And for user "Brian" folder "folder" of the space "Shares" should not contain these files:
@@ -177,8 +177,8 @@ Feature: moving/renaming file using file id
     And user "Brian" has uploaded file with content "some data" to "/test.txt"
     And we save it into "FILEID"
     When user "Brian" moves a file "/test.txt" into "Shares/folder" inside space "Shares" using file-id path "<dav-path>"
-    Then the HTTP status code should be "502"
-    And the value of the item "/d:error/s:message" in the response about user "Brian" should be "gateway does not support cross storage move, use copy and delete"
+    Then the HTTP status code should be "403"
+    And the value of the item "/d:error/s:message" in the response about user "Brian" should be "cross storage moves are not permitted, use copy and delete"
     And for user "Brian" folder "/" of the space "Personal" should contain these files:
       | test.txt |
     But for user "Alice" folder "folder" of the space "Personal" should not contain these files:
@@ -286,8 +286,8 @@ Feature: moving/renaming file using file id
     And we save it into "FILEID"
     And user "Alice" has shared folder "/folder" with user "Brian" with permissions "all"
     When user "Brian" renames a file "Shares/folder/test.txt" into "Shares/folder/sub-folder/renamed.txt" inside space "Shares" using file-id path "<dav-path>"
-    Then the HTTP status code should be "502"
-    And the value of the item "/d:error/s:message" in the response about user "Brian" should be "gateway does not support cross storage move, use copy and delete"
+    Then the HTTP status code should be "403"
+    And the value of the item "/d:error/s:message" in the response about user "Brian" should be "cross storage moves are not permitted, use copy and delete"
     And for user "Brian" folder "folder" of the space "Shares" should contain these files:
       | test.txt |
     And for user "Brian" folder "folder/sub-folder" of the space "Shares" should not contain these files:

diff --git a/tests/acceptance/features/apiSpacesShares/moveSpaces.feature b/tests/acceptance/features/apiSpacesShares/moveSpaces.feature
@@ -107,7 +107,7 @@ Feature: move (rename) file
       | role      | <role> |
     And user "Brian" has shared folder "/testshare" with user "Alice" with permissions "<permissions>"
     When user "Alice" moves file "project.txt" from space "Project" to "/testshare/project.txt" inside space "Shares" using the WebDAV API
-    Then the HTTP status code should be "502"
+    Then the HTTP status code should be "403"
     And for user "Alice" the space "Project" should contain these entries:
       | project.txt |
     But for user "Alice" folder "testshare" of the space "Shares" should not contain these entries:
@@ -147,7 +147,7 @@ Feature: move (rename) file
     And user "Brian" has shared folder "/testshare" with user "Alice" with permissions "<permissions>"
     And user "Alice" has uploaded file with content "personal content" to "personal.txt"
     When user "Alice" moves file "personal.txt" from space "Personal" to "/testshare/personal.txt" inside space "Shares" using the WebDAV API
-    Then the HTTP status code should be "502"
+    Then the HTTP status code should be "403"
     And for user "Alice" the space "Personal" should contain these entries:
       | personal.txt |
     But for user "Alice" folder "testshare" of the space "Shares" should not contain these entries:
@@ -164,7 +164,7 @@ Feature: move (rename) file
     And user "Brian" has uploaded file with content "testshare content" to "/testshare/testshare.txt"
     And user "Brian" has shared folder "/testshare" with user "Alice" with permissions "<permissions>"
     When user "Alice" moves file "/testshare/testshare.txt" from space "Shares" to "testshare.txt" inside space "Personal" using the WebDAV API
-    Then the HTTP status code should be "502"
+    Then the HTTP status code should be "403"
     And for user "Alice" the space "Personal" should not contain these entries:
       | testshare.txt |
     And for user "Alice" folder "testshare" of the space "Shares" should contain these entries:
@@ -186,7 +186,7 @@ Feature: move (rename) file
     And user "Brian" has uploaded file with content "testshare content" to "/testshare/testshare.txt"
     And user "Brian" has shared folder "/testshare" with user "Alice" with permissions "<permissions>"
     When user "Alice" moves file "/testshare/testshare.txt" from space "Shares" to "testshare.txt" inside space "Project" using the WebDAV API
-    Then the HTTP status code should be "502"
+    Then the HTTP status code should be "403"
     And for user "Alice" the space "Project" should not contain these entries:
       | /testshare.txt |
     And for user "Alice" folder "testshare" of the space "Shares" should contain these entries:
@@ -208,7 +208,7 @@ Feature: move (rename) file
     And user "Brian" has shared folder "/testshare1" with user "Alice" with permissions "31"
     And user "Brian" has shared folder "/testshare2" with user "Alice" with permissions "31"
     When user "Alice" moves file "/testshare1/testshare1.txt" from space "Shares" to "/testshare2/testshare1.txt" inside space "Shares" using the WebDAV API
-    Then the HTTP status code should be "502"
+    Then the HTTP status code should be "403"
     And for user "Alice" folder "testshare1" of the space "Shares" should contain these entries:
       | testshare1.txt |
     But for user "Alice" folder "testshare2" of the space "Shares" should not contain these entries:
@@ -222,7 +222,7 @@ Feature: move (rename) file
     And user "Brian" has shared folder "/testshare1" with user "Alice" with permissions "31"
     And user "Brian" has shared folder "/testshare2" with user "Alice" with permissions "17"
     When user "Alice" moves file "/testshare1/testshare1.txt" from space "Shares" to "/testshare2/testshare1.txt" inside space "Shares" using the WebDAV API
-    Then the HTTP status code should be "502"
+    Then the HTTP status code should be "403"
     And for user "Alice" folder "testshare1" of the space "Shares" should contain these entries:
       | testshare1.txt |
     But for user "Alice" folder "testshare2" of the space "Shares" should not contain these entries:
@@ -236,7 +236,7 @@ Feature: move (rename) file
     And user "Brian" has shared folder "/testshare1" with user "Alice" with permissions "17"
     And user "Brian" has shared folder "/testshare2" with user "Alice" with permissions "31"
     When user "Alice" moves file "/testshare1/testshare1.txt" from space "Shares" to "/testshare2/testshare1.txt" inside space "Shares" using the WebDAV API
-    Then the HTTP status code should be "502"
+    Then the HTTP status code should be "403"
     And for user "Alice" folder "testshare1" of the space "Shares" should contain these entries:
       | testshare1.txt |
     But for user "Alice" folder "testshare2" of the space "Shares" should not contain these entries:

diff --git a/tests/acceptance/features/coreApiShareManagementToShares/moveShareInsideAnotherShare.feature b/tests/acceptance/features/coreApiShareManagementToShares/moveShareInsideAnotherShare.feature
@@ -43,13 +43,10 @@ Feature: moving a share inside another share
     And user "Brian" has created folder "localFolder/subFolder"
     And user "Brian" has uploaded file with content "local text" to "/localFolder/localFile.txt"
     When user "Brian" moves folder "localFolder" to "Shares/folderA/localFolder" using the WebDAV API
-    Then the HTTP status code should be "201"
-    And as "Alice" folder "/folderA/localFolder" should exist
-    And as "Brian" folder "/Shares/folderA/localFolder" should exist
-    And as "Alice" folder "/folderA/localFolder/subFolder" should exist
-    And as "Brian" folder "/Shares/folderA/localFolder/subFolder" should exist
-    And as "Alice" file "/folderA/localFolder/localFile.txt" should exist
-    And as "Brian" file "/Shares/folderA/localFolder/localFile.txt" should exist
+    Then the HTTP status code should be "403"
+    And as "Brian" folder "/Shares/folderA/localFolder" should not exist
+    And as "Alice" folder "/folderA/localFolder" should not exist
+    And as "Brian" folder "/localFolder" should exist
 
 
   Scenario: share receiver tries to move a whole share inside a local folder

diff --git a/tests/acceptance/features/coreApiShareOperationsToShares1/changingFilesShare.feature b/tests/acceptance/features/coreApiShareOperationsToShares1/changingFilesShare.feature
@@ -35,7 +35,7 @@ Feature: sharing
     And user "Alice" has shared folder "/share1" with user "Brian"
     And user "Alice" has shared folder "/share2" with user "Brian"
     When user "Brian" moves file "/Shares/share1/textfile0.txt" to "/Shares/share2/textfile0.txt" using the WebDAV API
-    Then the HTTP status code should be "502"
+    Then the HTTP status code should be "403"
     And as "Brian" file "/Shares/share1/textfile0.txt" should exist
     And as "Alice" file "share1/textfile0.txt" should exist
     But as "Brian" file "/Shares/share2/textfile0.txt" should not exist

diff --git a/tests/acceptance/features/coreApiWebdavMove2/moveShareOnOcis.feature b/tests/acceptance/features/coreApiWebdavMove2/moveShareOnOcis.feature
@@ -63,7 +63,7 @@ Feature: move (rename) file
       | permissions | change    |
       | shareWith   | Alice     |
     When user "Alice" moves file "/Shares/testshare/testfile.txt" to "/testfile.txt" using the WebDAV API
-    Then the HTTP status code should be "502"
+    Then the HTTP status code should be "403"
     And as "Alice" file "/Shares/testshare/testfile.txt" should exist
     And as "Brian" file "/testshare/testfile.txt" should exist
     Examples:
@@ -134,7 +134,7 @@ Feature: move (rename) file
       | permissions | change    |
       | shareWith   | Alice     |
     When user "Alice" moves folder "/Shares/testshare/testsubfolder" to "/testsubfolder" using the WebDAV API
-    Then the HTTP status code should be "502"
+    Then the HTTP status code should be "403"
     And as "Alice" folder "/Shares/testshare/testsubfolder" should exist
     And as "Brian" folder "/testshare/testsubfolder" should exist
     Examples: