diff --git a/tests/acceptance/expected-failures-API-on-OCIS-storage.md b/tests/acceptance/expected-failures-API-on-OCIS-storage.md index 81709131e9..ebb2bfdb0c 100644 --- a/tests/acceptance/expected-failures-API-on-OCIS-storage.md +++ b/tests/acceptance/expected-failures-API-on-OCIS-storage.md @@ -49,15 +49,6 @@ Synchronization features like etag propagation, setting mtime and locking files ### Share -#### [copying a folder within a public link folder to folder with same name as an already existing file overwrites the parent file](https://github.com/owncloud/ocis/issues/1232) - -- [coreApiSharePublicLink2/copyFromPublicLink.feature:75](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiSharePublicLink2/copyFromPublicLink.feature#L75) -- [coreApiSharePublicLink2/copyFromPublicLink.feature:105](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiSharePublicLink2/copyFromPublicLink.feature#L105) -- [coreApiSharePublicLink2/copyFromPublicLink.feature:199](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiSharePublicLink2/copyFromPublicLink.feature#L199) -- [coreApiSharePublicLink2/copyFromPublicLink.feature:200](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiSharePublicLink2/copyFromPublicLink.feature#L200) -- [coreApiSharePublicLink2/copyFromPublicLink.feature:217](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiSharePublicLink2/copyFromPublicLink.feature#L217) -- [coreApiSharePublicLink2/copyFromPublicLink.feature:218](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiSharePublicLink2/copyFromPublicLink.feature#L218) - #### [d:quota-available-bytes in dprop of PROPFIND give wrong response value](https://github.com/owncloud/ocis/issues/8197) - [coreApiWebdavProperties/getQuota.feature:57](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavProperties/getQuota.feature#L57) @@ -239,5 +230,12 @@ Not everything needs to be implemented for ocis. While the oc10 testsuite covers - [coreApiWebdavMove2/moveShareOnOcis.feature:307](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavMove2/moveShareOnOcis.feature#L307) - [coreApiWebdavMove2/moveShareOnOcis.feature:310](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavMove2/moveShareOnOcis.feature#L310) +### [COPY file/folder to same name is possible (but 500 code error for folder with spaces path)](https://github.com/owncloud/ocis/issues/8711) + +- [coreApiSharePublicLink2/copyFromPublicLink.feature:198](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiSharePublicLink2/copyFromPublicLink.feature#L198) +- [coreApiWebdavProperties/copyFile.feature:979](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavProperties/copyFile.feature#L979) +- [coreApiWebdavProperties/copyFile.feature:980](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavProperties/copyFile.feature#L980) +- [coreApiWebdavProperties/copyFile.feature:981](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavProperties/copyFile.feature#L981) + Note: always have an empty line at the end of this file. The bash script that processes this file requires that the last line has a newline on the end. diff --git a/tests/acceptance/expected-failures-localAPI-on-OCIS-storage.md b/tests/acceptance/expected-failures-localAPI-on-OCIS-storage.md index 6e7546c92a..b91ab38d33 100644 --- a/tests/acceptance/expected-failures-localAPI-on-OCIS-storage.md +++ b/tests/acceptance/expected-failures-localAPI-on-OCIS-storage.md @@ -282,6 +282,8 @@ The expected failures in this file are from features in the owncloud/ocis repo. - [apiSpacesDavOperation/moveByFileId.feature:207](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiSpacesDavOperation/moveByFileId.feature#L207) - [apiSpacesDavOperation/moveByFileId.feature:208](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiSpacesDavOperation/moveByFileId.feature#L208) - [apiSpacesDavOperation/moveByFileId.feature:209](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiSpacesDavOperation/moveByFileId.feature#L209) +- [apiSpacesDavOperation/moveByFileId.feature:492](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiSpacesDavOperation/moveByFileId.feature#L492) +- [apiSpacesDavOperation/moveByFileId.feature:493](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiSpacesDavOperation/moveByFileId.feature#L493) ### [OCM. sharing issues](https://github.com/owncloud/ocis/issues/9534) diff --git a/tests/acceptance/features/coreApiSharePublicLink2/copyFromPublicLink.feature b/tests/acceptance/features/coreApiSharePublicLink2/copyFromPublicLink.feature index 1f39d8e5dd..40000d8099 100644 --- a/tests/acceptance/features/coreApiSharePublicLink2/copyFromPublicLink.feature +++ b/tests/acceptance/features/coreApiSharePublicLink2/copyFromPublicLink.feature @@ -57,7 +57,7 @@ Feature: copying from public link share And the content of file "/PARENT/testFolder/copy1.txt" for user "Alice" should be "some data" - Scenario: copy file within a public link folder to same file name as already existing one + Scenario: copy file within a public link folder to existing file Given user "Alice" has uploaded file with content "some data 0" to "/PARENT/testfile.txt" And user "Alice" has uploaded file with content "some data 1" to "/PARENT/copy1.txt" And using SharingNG @@ -72,7 +72,7 @@ Feature: copying from public link share And the content of file "/PARENT/copy1.txt" for user "Alice" should be "some data 0" @issue-1232 - Scenario: copy folder within a public link folder to the same folder name as an already existing file + Scenario: copy folder within a public link folder to existing file Given user "Alice" has created folder "/PARENT/testFolder" And user "Alice" has uploaded file with content "some data" to "/PARENT/testFolder/testfile.txt" And user "Alice" has uploaded file with content "some data 1" to "/PARENT/copy1.txt" @@ -82,11 +82,11 @@ Feature: copying from public link share | space | Personal | | permissionsRole | edit | When the public copies folder "/testFolder" to "/copy1.txt" using the new public WebDAV API - Then the HTTP status code should be "403" + Then the HTTP status code should be "204" And as "Alice" folder "/PARENT/testFolder" should exist - And as "Alice" folder "/PARENT/copy1.txt" should exist - And as "Alice" file "/PARENT/copy1.txt/testfile.txt" should not exist - And the content of file "/PARENT/testFolder/testfile.txt" for user "Alice" should be "some data" + And the content of file "/PARENT/copy1.txt/testfile.txt" for user "Alice" should be "some data" + But as "Alice" file "/PARENT/copy1.txt" should not exist + And as "Alice" file "/copy1.txt" should exist in the trashbin Scenario: copy file within a public link folder and delete file @@ -102,7 +102,7 @@ Feature: copying from public link share And as "Alice" file "/PARENT/copy1.txt" should not exist @issue-1232 - Scenario: copy file within a public link folder to a file with name same as an existing folder + Scenario: copy file within a public link folder to existing folder Given user "Alice" has uploaded file with content "some data" to "/PARENT/testfile.txt" And user "Alice" has created folder "/PARENT/new-folder" And user "Alice" has uploaded file with content "some data 1" to "/PARENT/new-folder/testfile1.txt" @@ -112,11 +112,11 @@ Feature: copying from public link share | space | Personal | | permissionsRole | edit | When the public copies file "/testfile.txt" to "/new-folder" using the new public WebDAV API - Then the HTTP status code should be "403" - And as "Alice" file "/PARENT/testfile.txt" should exist - And as "Alice" folder "/PARENT/new-folder" should exist + Then the HTTP status code should be "204" And the content of file "/PARENT/testfile.txt" for user "Alice" should be "some data" - And the content of file "/PARENT/new-folder/testfile.txt" for user "Alice" should be "some data" + And the content of file "/PARENT/new-folder" for user "Alice" should be "some data" + And as "Alice" folder "/PARENT/new-folder" should not exist + And as "Alice" folder "new-folder" should exist in the trashbin Scenario Outline: copy file with special characters in it's name within a public link folder @@ -182,25 +182,20 @@ Feature: copying from public link share | C++ file.cpp | | sample,1.txt | - @issue-1230 - Scenario Outline: copy file within a public link folder to a file with unusual destination names + @issue-8711 + Scenario: copy file within a public link folder to a same file Given user "Alice" has uploaded file with content "some data" to "/PARENT/testfile.txt" And using SharingNG And user "Alice" has created the following resource link share: | resource | PARENT | | space | Personal | | permissionsRole | edit | - When the public copies file "/testfile.txt" to "/" using the new public WebDAV API - Then the HTTP status code should be "403" - And as "Alice" file "/PARENT/testfile.txt" should exist + When the public copies file "/testfile.txt" to "/testfile.txt" using the new public WebDAV API + Then the HTTP status code should be "204" And the content of file "/PARENT/testfile.txt" for user "Alice" should be "some data" - Examples: - | destination-file-name | - | testfile.txt | - | | - @issue-1230 - Scenario Outline: copy folder within a public link folder to a folder with unusual destination names + @issue-8711 + Scenario: copy folder within a public link folder to a same folder Given user "Alice" has created folder "/PARENT/testFolder" And user "Alice" has uploaded file with content "some data" to "/PARENT/testFolder/testfile.txt" And using SharingNG @@ -208,11 +203,34 @@ Feature: copying from public link share | resource | PARENT | | space | Personal | | permissionsRole | edit | - When the public copies folder "/testFolder" to "/" using the new public WebDAV API - Then the HTTP status code should be "403" + When the public copies folder "/testFolder" to "/testFolder" using the new public WebDAV API + Then the HTTP status code should be "204" + And as "Alice" folder "/PARENT/testFolder" should exist + And the content of file "/PARENT/testFolder/testfile.txt" for user "Alice" should be "some data" + + @issue-1230 + Scenario: copy file within a public link folder to a share item root + Given user "Alice" has uploaded file with content "some data" to "/PARENT/testfile.txt" + And using SharingNG + And user "Alice" has created the following resource link share: + | resource | PARENT | + | space | Personal | + | permissionsRole | edit | + When the public copies file "/testfile.txt" to "/" using the new public WebDAV API + Then the HTTP status code should be "409" + And as "Alice" file "/PARENT/testfile.txt" should exist + And the content of file "/PARENT/testfile.txt" for user "Alice" should be "some data" + + @issue-1230 + Scenario: copy folder within a public link folder to a share item root + Given user "Alice" has created folder "/PARENT/testFolder" + And user "Alice" has uploaded file with content "some data" to "/PARENT/testFolder/testfile.txt" + And using SharingNG + And user "Alice" has created the following resource link share: + | resource | PARENT | + | space | Personal | + | permissionsRole | edit | + When the public copies folder "/testFolder" to "/" using the new public WebDAV API + Then the HTTP status code should be "409" And as "Alice" folder "/PARENT/testFolder" should exist And the content of file "/PARENT/testFolder/testfile.txt" for user "Alice" should be "some data" - Examples: - | destination-file-name | - | testFolder | - | | diff --git a/tests/acceptance/features/coreApiWebdavProperties/copyFile.feature b/tests/acceptance/features/coreApiWebdavProperties/copyFile.feature index e4b6010ebc..61c9ca14a9 100644 --- a/tests/acceptance/features/coreApiWebdavProperties/copyFile.feature +++ b/tests/acceptance/features/coreApiWebdavProperties/copyFile.feature @@ -951,3 +951,31 @@ Feature: copy file | spaces | "'single'" | "folder-'single'" | "folder-'single'/'single'" | | spaces | "question?" | "folder-question?" | "folder-question?/question?" | | spaces | "&and#hash" | "folder-&and#hash" | "folder-&and#hash/&and#hash" | + + @issue-8711 + Scenario Outline: copying a file to itself + Given using DAV path + And user "Alice" has uploaded file with content "lorem epsum" to "textfile.txt" + When user "Alice" copies file "textfile.txt" to "textfile.txt" using the WebDAV API + Then the HTTP status code should be "204" + And the content of file "textfile.txt" for user "Alice" should be "lorem epsum" + Examples: + | dav-path-version | + | old | + | new | + | spaces | + + @issue-8711 + Scenario Outline: copying a folder to itself + Given using DAV path + And user "Alice" has created folder "FOLDER1" + And user "Alice" has uploaded file with content "Folder 1 text" to "FOLDER1/textfile.txt" + When user "Alice" copies folder "FOLDER1" to "FOLDER1" using the WebDAV API + Then the HTTP status code should be "204" + And as "Alice" folder "FOLDER1" should exist + And the content of file "FOLDER1/textfile.txt" for user "Alice" should be "lorem epsum" + Examples: + | dav-path-version | + | old | + | new | + | spaces |