diff --git a/tests/acceptance/config/behat-core.yml b/tests/acceptance/config/behat-core.yml index 182e7170e1..e4f4326a97 100644 --- a/tests/acceptance/config/behat-core.yml +++ b/tests/acceptance/config/behat-core.yml @@ -273,6 +273,7 @@ default: context: *common_ldap_suite_context contexts: - FeatureContext: *common_feature_context_params + - SharingNgContext: - WebDavPropertiesContext: coreApiWebdavUpload: diff --git a/tests/acceptance/expected-failures-API-on-OCIS-storage.md b/tests/acceptance/expected-failures-API-on-OCIS-storage.md index a7e5431415..dfc2b74de0 100644 --- 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:285](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavProperties/copyFile.feature#L285) -- [coreApiWebdavProperties/copyFile.feature:286](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavProperties/copyFile.feature#L286) +- [coreApiWebdavProperties/copyFile.feature:297](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavProperties/copyFile.feature#L297) +- [coreApiWebdavProperties/copyFile.feature:298](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavProperties/copyFile.feature#L298) #### [Custom dav properties with namespaces are rendered incorrectly](https://github.com/owncloud/ocis/issues/2140) @@ -19,17 +19,17 @@ _ocdav: double-check the webdav property parsing when custom namespaces are used - [coreApiWebdavProperties/setFileProperties.feature:37](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavProperties/setFileProperties.feature#L37) - [coreApiWebdavProperties/setFileProperties.feature:42](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavProperties/setFileProperties.feature#L42) - [coreApiWebdavProperties/setFileProperties.feature:78](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavProperties/setFileProperties.feature#L78) -- [coreApiWebdavProperties/setFileProperties.feature:77](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavProperties/setFileProperties.feature#L77) -- [coreApiWebdavProperties/setFileProperties.feature:83](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavProperties/setFileProperties.feature#L83) +- [coreApiWebdavProperties/setFileProperties.feature:79](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavProperties/setFileProperties.feature#L79) +- [coreApiWebdavProperties/setFileProperties.feature:84](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavProperties/setFileProperties.feature#L84) #### [Cannot set custom webDav properties](https://github.com/owncloud/product/issues/264) -- [coreApiWebdavProperties/getFileProperties.feature:342](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavProperties/getFileProperties.feature#L342) -- [coreApiWebdavProperties/getFileProperties.feature:343](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavProperties/getFileProperties.feature#L343) - [coreApiWebdavProperties/getFileProperties.feature:348](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavProperties/getFileProperties.feature#L348) -- [coreApiWebdavProperties/getFileProperties.feature:378](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavProperties/getFileProperties.feature#L378) -- [coreApiWebdavProperties/getFileProperties.feature:379](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavProperties/getFileProperties.feature#L379) +- [coreApiWebdavProperties/getFileProperties.feature:349](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavProperties/getFileProperties.feature#L349) +- [coreApiWebdavProperties/getFileProperties.feature:354](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavProperties/getFileProperties.feature#L354) - [coreApiWebdavProperties/getFileProperties.feature:384](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavProperties/getFileProperties.feature#L384) +- [coreApiWebdavProperties/getFileProperties.feature:385](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavProperties/getFileProperties.feature#L385) +- [coreApiWebdavProperties/getFileProperties.feature:390](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavProperties/getFileProperties.feature#L390) #### [file versions do not report the version author](https://github.com/owncloud/ocis/issues/2914) @@ -103,12 +103,12 @@ cannot share a folder with create permission #### [d:quota-available-bytes in dprop of PROPFIND give wrong response value](https://github.com/owncloud/ocis/issues/8197) -- [coreApiWebdavProperties/getQuota.feature:55](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavProperties/getQuota.feature#L55) - [coreApiWebdavProperties/getQuota.feature:56](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavProperties/getQuota.feature#L56) - [coreApiWebdavProperties/getQuota.feature:57](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavProperties/getQuota.feature#L57) -- [coreApiWebdavProperties/getQuota.feature:71](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavProperties/getQuota.feature#L71) +- [coreApiWebdavProperties/getQuota.feature:58](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavProperties/getQuota.feature#L58) - [coreApiWebdavProperties/getQuota.feature:72](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavProperties/getQuota.feature#L72) - [coreApiWebdavProperties/getQuota.feature:73](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavProperties/getQuota.feature#L73) +- [coreApiWebdavProperties/getQuota.feature:74](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavProperties/getQuota.feature#L74) #### [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) @@ -320,16 +320,16 @@ And other missing implementation of favorites - [coreApiShareManagementBasicToShares/createShareToSharesFolder.feature:502](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiShareManagementBasicToShares/createShareToSharesFolder.feature#L502) - [coreApiShareManagementBasicToShares/createShareToSharesFolder.feature:503](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiShareManagementBasicToShares/createShareToSharesFolder.feature#L503) -#### [copying the file inside Shares folder returns 404](https://github.com/owncloud/ocis/issues/3874) +#### [copying the file inside Shares folder returns 412](https://github.com/owncloud/ocis/issues/3874) -- [coreApiWebdavProperties/copyFile.feature:398](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavProperties/copyFile.feature#L398) -- [coreApiWebdavProperties/copyFile.feature:399](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavProperties/copyFile.feature#L399) -- [coreApiWebdavProperties/copyFile.feature:404](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavProperties/copyFile.feature#L404) -- [coreApiWebdavProperties/copyFile.feature:423](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavProperties/copyFile.feature#L423) -- [coreApiWebdavProperties/copyFile.feature:424](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavProperties/copyFile.feature#L424) -- [coreApiWebdavProperties/copyFile.feature:429](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavProperties/copyFile.feature#L429) -- [coreApiWebdavProperties/copyFile.feature:268](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavProperties/copyFile.feature#L268) -- [coreApiWebdavProperties/copyFile.feature:269](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavProperties/copyFile.feature#L269) +- [coreApiWebdavProperties/copyFile.feature:439](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavProperties/copyFile.feature#L439) +- [coreApiWebdavProperties/copyFile.feature:440](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavProperties/copyFile.feature#L440) +- [coreApiWebdavProperties/copyFile.feature:445](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavProperties/copyFile.feature#L445) +- [coreApiWebdavProperties/copyFile.feature:469](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavProperties/copyFile.feature#L469) +- [coreApiWebdavProperties/copyFile.feature:470](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavProperties/copyFile.feature#L470) +- [coreApiWebdavProperties/copyFile.feature:475](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavProperties/copyFile.feature#L475) +- [coreApiWebdavProperties/copyFile.feature:275](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavProperties/copyFile.feature#L275) +- [coreApiWebdavProperties/copyFile.feature:276](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavProperties/copyFile.feature#L276) ### Won't fix @@ -340,9 +340,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:115](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavProperties/copyFile.feature#L115) -- [coreApiWebdavProperties/copyFile.feature:116](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavProperties/copyFile.feature#L116) -- [coreApiWebdavProperties/copyFile.feature:121](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavProperties/copyFile.feature#L121) +- [coreApiWebdavProperties/copyFile.feature:117](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavProperties/copyFile.feature#L117) +- [coreApiWebdavProperties/copyFile.feature:118](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavProperties/copyFile.feature#L118) +- [coreApiWebdavProperties/copyFile.feature:123](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavProperties/copyFile.feature#L123) - [coreApiWebdavProperties/createFileFolder.feature:106](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavProperties/createFileFolder.feature#L106) - [coreApiWebdavProperties/createFileFolder.feature:107](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavProperties/createFileFolder.feature#L107) - [coreApiWebdavProperties/createFileFolder.feature:112](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavProperties/createFileFolder.feature#L112) diff --git a/tests/acceptance/features/coreApiWebdavProperties/copyFile.feature b/tests/acceptance/features/coreApiWebdavProperties/copyFile.feature index 821264351b..22ad7fc2bc 100644 --- a/tests/acceptance/features/coreApiWebdavProperties/copyFile.feature +++ b/tests/acceptance/features/coreApiWebdavProperties/copyFile.feature @@ -65,11 +65,12 @@ Feature: copy file Given using 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 created a share with settings - | path | testshare | - | shareType | user | - | permissions | read | - | shareWith | Alice | + And user "Brian" has sent the following resource share invitation: + | resource | testshare | + | space | Personal | + | sharee | Alice | + | shareType | user | + | permissionsRole | Viewer | When user "Alice" copies file "/textfile0.txt" to "/Shares/testshare/textfile0.txt" using the WebDAV API Then the HTTP status code should be "403" And user "Alice" should not be able to download file "/Shares/testshare/textfile0.txt" @@ -84,11 +85,12 @@ Feature: copy file 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 "ownCloud test text file 1" to "textfile1.txt" - And user "Brian" has created a share with settings - | path | testshare | - | shareType | user | - | permissions | read | - | shareWith | Alice | + And user "Brian" has sent the following resource share invitation: + | resource | testshare | + | space | Personal | + | sharee | Alice | + | shareType | user | + | permissionsRole | Viewer | And user "Brian" has copied file "textfile1.txt" to "/testshare/overwritethis.txt" When user "Alice" copies file "/textfile0.txt" to "/Shares/testshare/overwritethis.txt" using the WebDAV API Then the HTTP status code should be "403" @@ -256,7 +258,12 @@ Feature: copy file And user "Brian" has been created with default attributes and without skeleton files And user "Brian" has created folder "/BRIAN-Folder" And user "Brian" has created folder "BRIAN-Folder/sample-folder" - And user "Brian" has shared folder "BRIAN-Folder" with user "Alice" + And user "Brian" has sent the following resource share invitation: + | resource | BRIAN-Folder | + | space | Personal | + | sharee | Alice | + | shareType | user | + | permissionsRole | Editor | When user "Alice" copies file "/textfile1.txt" to "/Shares/BRIAN-Folder" using the WebDAV API Then the HTTP status code should be "204" And the content of file "/Shares/BRIAN-Folder" for user "Alice" should be "ownCloud test text file 1" @@ -273,7 +280,12 @@ Feature: copy file Given using DAV path And user "Brian" has been created with default attributes and without skeleton files And user "Brian" has uploaded file with content "file to share" to "/sharedfile1.txt" - And user "Brian" has shared file "/sharedfile1.txt" with user "Alice" + And user "Brian" has sent the following resource share invitation: + | resource | sharedfile1.txt | + | space | Personal | + | sharee | Alice | + | shareType | user | + | permissionsRole | File Editor | And user "Alice" has created folder "FOLDER/sample-folder" When user "Alice" copies folder "/FOLDER" to "/Shares/sharedfile1.txt" using the WebDAV API Then the HTTP status code should be "204" @@ -292,7 +304,13 @@ Feature: copy file And user "Brian" has created folder "BRIAN-FOLDER" And user "Brian" has created folder "BRIAN-FOLDER/second-level-folder" And user "Brian" has created folder "BRIAN-FOLDER/second-level-folder/third-level-folder" - And user "Brian" has shared folder "BRIAN-FOLDER" with user "Alice" + And using SharingNG + And user "Brian" has sent the following resource share invitation: + | resource | BRIAN-FOLDER | + | space | Personal | + | sharee | Alice | + | shareType | user | + | permissionsRole | Editor | And user "Alice" has created folder "Sample-Folder-A" And user "Alice" has created folder "Sample-Folder-A/sample-folder-b" And user "Alice" has created folder "Sample-Folder-A/sample-folder-b/sample-folder-c" @@ -314,7 +332,13 @@ Feature: copy file And user "Brian" has created folder "BRIAN-FOLDER" And user "Brian" has created folder "BRIAN-FOLDER/second-level-folder" And user "Brian" has created folder "BRIAN-FOLDER/second-level-folder/third-level-folder" - And user "Brian" has shared folder "BRIAN-FOLDER" with user "Alice" + And using SharingNG + And user "Brian" has sent the following resource share invitation: + | resource | BRIAN-FOLDER | + | space | Personal | + | sharee | Alice | + | shareType | user | + | permissionsRole | Editor | And user "Alice" has created folder "Sample-Folder-A" And user "Alice" has created folder "Sample-Folder-A/sample-folder-b" And user "Alice" has uploaded file with content "sample file-c" to "Sample-Folder-A/sample-folder-b/textfile-c.txt" @@ -337,7 +361,13 @@ Feature: copy file And user "Brian" has been created with default attributes and without skeleton files And user "Brian" has created folder "BRIAN-FOLDER" And user "Brian" has uploaded file with content "file at second level" to "BRIAN-FOLDER/second-level-file.txt" - And user "Brian" has shared folder "BRIAN-FOLDER" with user "Alice" + And using SharingNG + And user "Brian" has sent the following resource share invitation: + | resource | BRIAN-FOLDER | + | space | Personal | + | sharee | Alice | + | shareType | user | + | permissionsRole | Editor | And user "Alice" has created folder "Sample-Folder-A" And user "Alice" has created folder "Sample-Folder-A/sample-folder-b" And user "Alice" has uploaded file with content "sample file-c" to "Sample-Folder-A/sample-folder-b/textfile-c.txt" @@ -361,7 +391,13 @@ Feature: copy file And user "Brian" has created folder "BRIAN-FOLDER" And user "Brian" has created folder "BRIAN-FOLDER/second-level-folder" And user "Brian" has uploaded file with content "file at third level" to "BRIAN-FOLDER/second-level-folder/third-level-file.txt" - And user "Brian" has shared folder "BRIAN-FOLDER" with user "Alice" + And using SharingNG + And user "Brian" has sent the following resource share invitation: + | resource | BRIAN-FOLDER | + | space | Personal | + | sharee | Alice | + | shareType | user | + | permissionsRole | Editor | And user "Alice" has created folder "FOLDER/second-level-folder" And user "Alice" has created folder "FOLDER/second-level-folder/third-level-folder" When user "Alice" copies folder "FOLDER/second-level-folder" to "/Shares/BRIAN-FOLDER/second-level-folder/third-level-file.txt" using the WebDAV API @@ -386,7 +422,12 @@ Feature: copy file And user "Brian" has been added to group "grp1" And user "Brian" has created folder "/BRIAN-Folder" And user "Brian" has created folder "BRIAN-Folder/sample-folder" - And user "Brian" has shared folder "BRIAN-Folder" with group "grp1" with permissions "15" + And user "Brian" has sent the following resource share invitation: + | resource | BRIAN-Folder | + | space | Personal | + | sharee | grp1 | + | shareType | group | + | permissionsRole | Editor | When user "Alice" copies file "/textfile1.txt" to "/Shares/BRIAN-Folder" using the WebDAV API Then the HTTP status code should be "204" And the content of file "/Shares/BRIAN-Folder" for user "Alice" should be "ownCloud test text file 1" @@ -411,7 +452,12 @@ Feature: copy file And user "Alice" has been added to group "grp1" And user "Brian" has been added to group "grp1" And user "Brian" has uploaded file with content "file to share" to "/sharedfile1.txt" - And user "Brian" has shared file "/sharedfile1.txt" with group "grp1" + And user "Brian" has sent the following resource share invitation: + | resource | sharedfile1.txt | + | space | Personal | + | sharee | grp1 | + | shareType | group | + | permissionsRole | File Editor | And user "Alice" has created folder "FOLDER/sample-folder" When user "Alice" copies folder "/FOLDER" to "/Shares/sharedfile1.txt" using the WebDAV API Then the HTTP status code should be "204" @@ -438,7 +484,13 @@ Feature: copy file And user "Brian" has created folder "BRIAN-FOLDER" And user "Brian" has created folder "BRIAN-FOLDER/second-level-folder" And user "Brian" has created folder "BRIAN-FOLDER/second-level-folder/third-level-folder" - And user "Brian" has shared folder "BRIAN-FOLDER" with group "grp1" + And using SharingNG + And user "Brian" has sent the following resource share invitation: + | resource | BRIAN-FOLDER | + | space | Personal | + | sharee | grp1 | + | shareType | group | + | permissionsRole | Editor | And user "Alice" has created folder "Sample-Folder-A" And user "Alice" has created folder "Sample-Folder-A/sample-folder-b" And user "Alice" has created folder "Sample-Folder-A/sample-folder-b/sample-folder-c" @@ -463,7 +515,13 @@ Feature: copy file And user "Brian" has created folder "BRIAN-FOLDER" And user "Brian" has created folder "BRIAN-FOLDER/second-level-folder" And user "Brian" has created folder "BRIAN-FOLDER/second-level-folder/third-level-folder" - And user "Brian" has shared folder "BRIAN-FOLDER" with group "grp1" + And using SharingNG + And user "Brian" has sent the following resource share invitation: + | resource | BRIAN-FOLDER | + | space | Personal | + | sharee | grp1 | + | shareType | group | + | permissionsRole | Editor | And user "Alice" has created folder "Sample-Folder-A" And user "Alice" has created folder "Sample-Folder-A/sample-folder-b" And user "Alice" has uploaded file with content "sample file-c" to "Sample-Folder-A/sample-folder-b/textfile-c.txt" @@ -489,7 +547,13 @@ Feature: copy file And user "Brian" has been added to group "grp1" And user "Brian" has created folder "BRIAN-FOLDER" And user "Brian" has uploaded file with content "file at second level" to "BRIAN-FOLDER/second-level-file.txt" - And user "Brian" has shared folder "BRIAN-FOLDER" with group "grp1" + And using SharingNG + And user "Brian" has sent the following resource share invitation: + | resource | BRIAN-FOLDER | + | space | Personal | + | sharee | grp1 | + | shareType | group | + | permissionsRole | Editor | And user "Alice" has created folder "Sample-Folder-A" And user "Alice" has created folder "Sample-Folder-A/sample-folder-b" And user "Alice" has uploaded file with content "sample file-c" to "Sample-Folder-A/sample-folder-b/textfile-c.txt" @@ -516,7 +580,13 @@ Feature: copy file And user "Brian" has created folder "BRIAN-FOLDER" And user "Brian" has created folder "BRIAN-FOLDER/second-level-folder" And user "Brian" has uploaded file with content "file at third level" to "BRIAN-FOLDER/second-level-folder/third-level-file.txt" - And user "Brian" has shared folder "BRIAN-FOLDER" with group "grp1" + And using SharingNG + And user "Brian" has sent the following resource share invitation: + | resource | BRIAN-FOLDER | + | space | Personal | + | sharee | grp1 | + | shareType | group | + | permissionsRole | Editor | And user "Alice" has created folder "FOLDER/second-level-folder" And user "Alice" has created folder "FOLDER/second-level-folder/third-level-folder" When user "Alice" copies folder "FOLDER/second-level-folder" to "Shares/BRIAN-FOLDER/second-level-folder/third-level-file.txt" using the WebDAV API @@ -607,11 +677,12 @@ Feature: copy file Given using 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 created a share with settings - | path | testshare | - | shareType | user | - | permissions | change | - | shareWith | Alice | + And user "Brian" has sent the following resource share invitation: + | resource | testshare | + | space | Personal | + | sharee | Alice | + | shareType | user | + | permissionsRole | Editor | When user "Alice" copies file "/textfile0.txt" to "/Shares/testshare/textfile0.txt" using the WebDAV API Then the HTTP status code should be "201" And the content of file "/Shares/testshare/textfile0.txt" for user "Alice" should be "ownCloud test text file 0" @@ -626,11 +697,12 @@ Feature: copy file Given using 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 created a share with settings - | path | testshare | - | shareType | user | - | permissions | change | - | shareWith | Alice | + And user "Brian" has sent the following resource share invitation: + | resource | testshare | + | space | Personal | + | sharee | Alice | + | shareType | user | + | permissionsRole | Editor | And user "Brian" has uploaded file with content "ownCloud test text file 0" to "/textfile0.txt" When user "Brian" copies file "/textfile0.txt" to "/testshare/textfile0.txt" using the WebDAV API Then the HTTP status code should be "201" @@ -646,11 +718,12 @@ Feature: copy file Given using 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 created a share with settings - | path | testshare | - | shareType | user | - | permissions | change | - | shareWith | Alice | + And user "Brian" has sent the following resource share invitation: + | resource | testshare | + | space | Personal | + | sharee | Alice | + | shareType | user | + | permissionsRole | Editor | And user "Alice" has uploaded file with content "ownCloud test text file inside share" to "/Shares/testshare/fileInsideShare.txt" When user "Alice" copies file "/Shares/testshare/fileInsideShare.txt" to "/fileInsideShare.txt" using the WebDAV API Then the HTTP status code should be "201" @@ -668,11 +741,12 @@ Feature: copy file 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 "ownCloud test text file inside share" to "/testshare/fileInsideShare.txt" - And user "Brian" has created a share with settings - | path | testshare | - | shareType | user | - | permissions | change | - | shareWith | Alice | + And user "Brian" has sent the following resource share invitation: + | resource | testshare | + | space | Personal | + | sharee | Alice | + | shareType | user | + | permissionsRole | Editor | When user "Brian" copies file "testshare/fileInsideShare.txt" to "/fileInsideShare.txt" using the WebDAV API Then the HTTP status code should be "201" And as "Brian" file "/fileInsideShare.txt" should exist @@ -718,16 +792,18 @@ Feature: copy file And user "Brian" has created folder "/testshare0" And user "Brian" has uploaded file with content "content inside testshare0" to "/testshare0/testshare0.txt" And user "Carol" has created folder "/testshare1" - And user "Brian" has created a share with settings - | path | testshare0 | - | shareType | user | - | permissions | change | - | shareWith | Alice | - And user "Carol" has created a share with settings - | path | testshare1 | - | shareType | user | - | permissions | change | - | shareWith | Alice | + And user "Brian" has sent the following resource share invitation: + | resource | testshare0 | + | space | Personal | + | sharee | Alice | + | shareType | user | + | permissionsRole | Editor | + And user "Carol" has sent the following resource share invitation: + | resource | testshare1 | + | space | Personal | + | sharee | Alice | + | shareType | user | + | permissionsRole | Editor | 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 "201" And as "Carol" file "testshare1/testshare0.txt" should exist @@ -748,16 +824,18 @@ Feature: copy file And user "Brian" has created folder "/testshare0/folder_to_copy/" And user "Brian" has uploaded file with content "content inside testshare0" to "/testshare0/folder_to_copy/testshare0.txt" And user "Carol" has created folder "/testshare1" - And user "Brian" has created a share with settings - | path | testshare0 | - | shareType | user | - | permissions | change | - | shareWith | Alice | - And user "Carol" has created a share with settings - | path | testshare1 | - | shareType | user | - | permissions | change | - | shareWith | Alice | + And user "Brian" has sent the following resource share invitation: + | resource | testshare0 | + | space | Personal | + | sharee | Alice | + | shareType | user | + | permissionsRole | Editor | + And user "Carol" has sent the following resource share invitation: + | resource | testshare1 | + | space | Personal | + | sharee | Alice | + | shareType | user | + | permissionsRole | Editor | 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 "201" And as "Carol" file "testshare1/folder_to_copy/testshare0.txt" should exist @@ -775,16 +853,18 @@ Feature: copy file 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 "Alice" has created folder "/testshare" - And user "Alice" has created a share with settings - | path | testshare | - | shareType | user | - | permissions | change | - | shareWith | Brian | - And user "Alice" has created a share with settings - | path | testshare | - | shareType | user | - | permissions | change | - | shareWith | Carol | + And user "Alice" has sent the following resource share invitation: + | resource | testshare | + | space | Personal | + | sharee | Brian | + | shareType | user | + | permissionsRole | Editor | + And user "Alice" has sent the following resource share invitation: + | resource | testshare | + | space | Personal | + | sharee | Carol | + | shareType | user | + | permissionsRole | Editor | When user "Alice" copies file "/textfile0.txt" to "/testshare/textfile0.txt" using the WebDAV API Then the HTTP status code should be "201" And as "Brian" file "/Shares/testshare/textfile0.txt" should exist diff --git a/tests/acceptance/features/coreApiWebdavProperties/createFileFolderWhenSharesExist.feature b/tests/acceptance/features/coreApiWebdavProperties/createFileFolderWhenSharesExist.feature index 895667401c..c67165b0e0 100644 --- a/tests/acceptance/features/coreApiWebdavProperties/createFileFolderWhenSharesExist.feature +++ b/tests/acceptance/features/coreApiWebdavProperties/createFileFolderWhenSharesExist.feature @@ -10,7 +10,12 @@ Feature: create file or folder named similar to Shares folder | Alice | | Brian | And user "Alice" has created folder "/FOLDER" - And user "Alice" has shared folder "/FOLDER" with user "Brian" with permissions "read,update" + And user "Alice" has sent the following resource share invitation: + | resource | FOLDER | + | space | Personal | + | sharee | Brian | + | shareType | user | + | permissionsRole | Viewer | Scenario Outline: create a folder with a name similar to Shares diff --git a/tests/acceptance/features/coreApiWebdavProperties/getFileProperties.feature b/tests/acceptance/features/coreApiWebdavProperties/getFileProperties.feature index 02738b93d9..89b55edc58 100644 --- a/tests/acceptance/features/coreApiWebdavProperties/getFileProperties.feature +++ b/tests/acceptance/features/coreApiWebdavProperties/getFileProperties.feature @@ -172,11 +172,12 @@ Feature: get file properties Given using DAV path And user "Brian" has been created with default attributes and without skeleton files And user "Alice" has created folder "/test" - And user "Alice" has created a share with settings - | path | test | - | shareType | user | - | permissions | all | - | shareWith | Brian | + And user "Alice" has sent the following resource share invitation: + | resource | test | + | space | Personal | + | sharee | Brian | + | shareType | user | + | permissionsRole | Editor | When user "Alice" gets the following properties of folder "/test" using the WebDAV API | propertyName | | oc:share-types | @@ -198,11 +199,12 @@ Feature: get file properties Given using DAV path And group "grp1" has been created And user "Alice" has created folder "/test" - And user "Alice" has created a share with settings - | path | test | - | shareType | group | - | permissions | all | - | shareWith | grp1 | + And user "Alice" has sent the following resource share invitation: + | resource | test | + | space | Personal | + | sharee | grp1 | + | shareType | group | + | permissionsRole | Editor | When user "Alice" gets the following properties of folder "/test" using the WebDAV API | propertyName | | oc:share-types | @@ -223,10 +225,11 @@ Feature: get file properties Scenario Outline: file that is shared by link has a share-types property Given using DAV path And user "Alice" has created folder "/test" - And user "Alice" has created a public link share with settings - | path | test | - | permissions | all | - | password | %public% | + And user "Alice" has created the following resource link share: + | resource | test | + | space | Personal | + | permissionsRole | edit | + | password | %public% | When user "Alice" gets the following properties of folder "/test" using the WebDAV API | propertyName | | oc:share-types | @@ -249,20 +252,23 @@ Feature: get file properties And user "Brian" has been created with default attributes and without skeleton files And group "grp1" has been created And user "Alice" has created folder "/test" - And user "Alice" has created a share with settings - | path | test | - | shareType | user | - | permissions | all | - | shareWith | Brian | - And user "Alice" has created a share with settings - | path | test | - | shareType | group | - | permissions | all | - | shareWith | grp1 | - And user "Alice" has created a public link share with settings - | path | test | - | permissions | all | - | password | %public% | + And user "Alice" has sent the following resource share invitation: + | resource | test | + | space | Personal | + | sharee | Brian | + | shareType | user | + | permissionsRole | Editor | + And user "Alice" has sent the following resource share invitation: + | resource | test | + | space | Personal | + | sharee | grp1 | + | shareType | group | + | permissionsRole | Editor | + And user "Alice" has created the following resource link share: + | resource | test | + | space | Personal | + | permissionsRole | edit | + | password | %public% | When user "Alice" gets the following properties of folder "/test" using the WebDAV API | propertyName | | oc:share-types | diff --git a/tests/acceptance/features/coreApiWebdavProperties/getQuota.feature b/tests/acceptance/features/coreApiWebdavProperties/getQuota.feature index eeaf462ac0..86e4890d82 100644 --- a/tests/acceptance/features/coreApiWebdavProperties/getQuota.feature +++ b/tests/acceptance/features/coreApiWebdavProperties/getQuota.feature @@ -40,11 +40,12 @@ Feature: get quota And user "Admin" has changed the quota of the personal space of "Brian Murphy" space to "10000" And user "Brian" has created folder "/testquota" And user "Brian" has uploaded file "/testquota/Brian.txt" of size 1000 bytes - And user "Brian" has created a share with settings - | path | testquota | - | shareType | user | - | permissions | all | - | shareWith | Alice | + And user "Brian" has sent the following resource share invitation: + | resource | testquota | + | space | Personal | + | sharee | Alice | + | shareType | user | + | permissionsRole | Editor | When user "Alice" gets the following properties of folder "" inside space "Shares" using the WebDAV API | propertyName | | d:quota-available-bytes | @@ -78,7 +79,12 @@ Feature: get quota And user "Brian" has been created with default attributes and without skeleton files And user "Admin" has changed the quota of the personal space of "Brian Murphy" space to "10000" And user "Alice" has uploaded file "/Alice.txt" of size 93 bytes - And user "Alice" has shared file "Alice.txt" with user "Brian" + And user "Alice" has sent the following resource share invitation: + | resource | Alice.txt | + | space | Personal | + | sharee | Brian | + | shareType | user | + | permissionsRole | File Editor | When user "Brian" gets the following properties of folder "/" using the WebDAV API | propertyName | | d:quota-available-bytes | diff --git a/tests/acceptance/features/coreApiWebdavProperties/setFileProperties.feature b/tests/acceptance/features/coreApiWebdavProperties/setFileProperties.feature index 0210a764be..6dc721b27e 100644 --- a/tests/acceptance/features/coreApiWebdavProperties/setFileProperties.feature +++ b/tests/acceptance/features/coreApiWebdavProperties/setFileProperties.feature @@ -64,11 +64,12 @@ Feature: set file properties Given using DAV path And user "Brian" has been created with default attributes and without skeleton files And user "Alice" has uploaded file "filesForUpload/textfile.txt" to "/testcustompropshared.txt" - And user "Alice" has created a share with settings - | path | testcustompropshared.txt | - | shareType | user | - | permissions | all | - | shareWith | Brian | + And user "Alice" has sent the following resource share invitation: + | resource | testcustompropshared.txt | + | space | Personal | + | sharee | Brian | + | shareType | user | + | permissionsRole | File Editor | And user "Alice" has set property "very-custom-prop" with namespace "x1='http://whatever.org/ns'" of file "/testcustompropshared.txt" to "valueForSharetest" When user "Brian" gets a custom property "very-custom-prop" with namespace "x1='http://whatever.org/ns'" of file "/testcustompropshared.txt" Then the response should contain a custom "very-custom-prop" property with namespace "x1='http://whatever.org/ns'" and value "valueForSharetest"