diff --git a/tests/acceptance/expected-failures-without-remotephp.md b/tests/acceptance/expected-failures-without-remotephp.md index b7eb81934b..df63699249 100644 --- a/tests/acceptance/expected-failures-without-remotephp.md +++ b/tests/acceptance/expected-failures-without-remotephp.md @@ -2,16 +2,16 @@ #### [REPORT request without remote.php returns empty result (only with dav/spaces path)](https://github.com/owncloud/ocis/issues/10329) -- [apiContract/sharesReport.feature:42](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiContract/sharesReport.feature#L42) -- [apiContract/sharesReport.feature:66](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiContract/sharesReport.feature#L66) -- [apiContract/sharesReport.feature:130](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiContract/sharesReport.feature#L130) -- [apiContract/sharesReport.feature:159](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiContract/sharesReport.feature#L159) +- [apiContract/sharesReport.feature:43](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiContract/sharesReport.feature#L43) +- [apiContract/sharesReport.feature:68](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiContract/sharesReport.feature#L68) +- [apiContract/sharesReport.feature:134](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiContract/sharesReport.feature#L134) +- [apiContract/sharesReport.feature:164](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiContract/sharesReport.feature#L164) - [apiContract/spacesReport.feature:16](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiContract/spacesReport.feature#L16) -- [apiContract/spacesReport.feature:34](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiContract/spacesReport.feature#L34) -- [apiContract/spacesReport.feature:53](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiContract/spacesReport.feature#L53) -- [apiContract/spacesReport.feature:71](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiContract/spacesReport.feature#L71) -- [apiContract/spacesSharesReport.feature:45](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiContract/spacesSharesReport.feature#L45) -- [apiContract/spacesSharesReport.feature:75](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiContract/spacesSharesReport.feature#L75) +- [apiContract/spacesReport.feature:35](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiContract/spacesReport.feature#L35) +- [apiContract/spacesReport.feature:55](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiContract/spacesReport.feature#L55) +- [apiContract/spacesReport.feature:74](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiContract/spacesReport.feature#L74) +- [apiContract/spacesSharesReport.feature:46](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiContract/spacesSharesReport.feature#L46) +- [apiContract/spacesSharesReport.feature:77](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiContract/spacesSharesReport.feature#L77) - [apiSearch1/dateSearch.feature:19](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiSearch1/dateSearch.feature#L19) - [apiSearch1/dateSearch.feature:39](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiSearch1/dateSearch.feature#L39) - [apiSearch1/dateSearch.feature:40](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiSearch1/dateSearch.feature#L40) diff --git a/tests/acceptance/features/apiContract/sharesReport.feature b/tests/acceptance/features/apiContract/sharesReport.feature index 00ab519b94..19f4acd9d2 100644 --- a/tests/acceptance/features/apiContract/sharesReport.feature +++ b/tests/acceptance/features/apiContract/sharesReport.feature @@ -27,14 +27,15 @@ Feature: REPORT request to Shares space And the following headers should match these regular expressions | X-Request-Id | %request_id_pattern% | And as user "Brian" the REPORT response should contain a resource "SubFolder1" with these key and value pairs: - | key | value | - | oc:fileid | %file_id_pattern% | - | oc:file-parent | %file_id_pattern% | - | oc:shareroot | /folderMain | - | oc:name | SubFolder1 | - | d:getcontenttype | httpd/unix-directory | - | oc:permissions | S | - | oc:remote-item-id | %file_id_pattern% | + | key | value | + | oc:fileid | %file_id_pattern% | + | oc:file-parent | %file_id_pattern% | + | oc:shareroot | /folderMain | + | oc:name | SubFolder1 | + | d:getcontenttype | httpd/unix-directory | + | oc:permissions | S | + | oc:privatelink | %base_url%/f/[0-9a-z-$%]+ | + | oc:remote-item-id | %file_id_pattern% | Examples: | dav-path-version | | old | @@ -50,15 +51,16 @@ Feature: REPORT request to Shares space And the following headers should match these regular expressions | X-Request-Id | %request_id_pattern% | And as user "Brian" the REPORT response should contain a resource "frodo.txt" with these key and value pairs: - | key | value | - | oc:fileid | %file_id_pattern% | - | oc:file-parent | %file_id_pattern% | - | oc:shareroot | /folderMain | - | oc:name | frodo.txt | - | d:getcontenttype | text/plain | - | oc:permissions | S | - | d:getcontentlength | 34 | - | oc:remote-item-id | %file_id_pattern% | + | key | value | + | oc:fileid | %file_id_pattern% | + | oc:file-parent | %file_id_pattern% | + | oc:shareroot | /folderMain | + | oc:name | frodo.txt | + | d:getcontenttype | text/plain | + | oc:permissions | S | + | oc:privatelink | %base_url%/f/[0-9a-z-$%]+ | + | d:getcontentlength | 34 | + | oc:remote-item-id | %file_id_pattern% | Examples: | dav-path-version | | old | @@ -105,24 +107,26 @@ Feature: REPORT request to Shares space And the following headers should match these regular expressions | X-Request-Id | %request_id_pattern% | And as user "Brian" the REPORT response should contain a resource "secureFolder" with these key and value pairs: - | key | value | - | oc:shareroot | /secureFolder | - | oc:name | secureFolder | - | d:getcontenttype | httpd/unix-directory | - | oc:permissions | SMX | - | oc:size | 14 | - | oc:remote-item-id | %file_id_pattern% | + | key | value | + | oc:shareroot | /secureFolder | + | oc:name | secureFolder | + | d:getcontenttype | httpd/unix-directory | + | oc:permissions | SMX | + | oc:privatelink | %base_url%/f/[0-9a-z-$%]+ | + | oc:size | 14 | + | oc:remote-item-id | %file_id_pattern% | When user "Brian" searches for "secure.txt" using the WebDAV API And the following headers should match these regular expressions | X-Request-Id | %request_id_pattern% | Then the HTTP status code should be "207" And as user "Brian" the REPORT response should contain a resource "secure.txt" with these key and value pairs: - | key | value | - | oc:shareroot | /secureFolder | - | oc:name | secure.txt | - | d:getcontenttype | text/plain | - | oc:permissions | SX | - | d:getcontentlength | 14 | + | key | value | + | oc:shareroot | /secureFolder | + | oc:name | secure.txt | + | d:getcontenttype | text/plain | + | oc:permissions | SX | + | oc:privatelink | %base_url%/f/[0-9a-z-$%]+ | + | d:getcontentlength | 14 | Examples: | dav-path-version | | old | @@ -146,12 +150,13 @@ Feature: REPORT request to Shares space And the following headers should match these regular expressions | X-Request-Id | %request_id_pattern% | And as user "Brian" the REPORT response should contain a resource "secure.txt" with these key and value pairs: - | key | value | - | oc:shareroot | /secure.txt | - | oc:name | secure.txt | - | d:getcontenttype | text/plain | - | oc:permissions | SMX | - | d:getcontentlength | 14 | + | key | value | + | oc:shareroot | /secure.txt | + | oc:name | secure.txt | + | d:getcontenttype | text/plain | + | oc:permissions | SMX | + | oc:privatelink | %base_url%/f/[0-9a-z-$%]+ | + | d:getcontentlength | 14 | Examples: | dav-path-version | | old | diff --git a/tests/acceptance/features/apiContract/spacesReport.feature b/tests/acceptance/features/apiContract/spacesReport.feature index 0688e2d9b1..6104aa8adf 100644 --- a/tests/acceptance/features/apiContract/spacesReport.feature +++ b/tests/acceptance/features/apiContract/spacesReport.feature @@ -22,13 +22,14 @@ Feature: REPORT request to project space And the following headers should match these regular expressions | X-Request-Id | %request_id_pattern% | And as user "Alice" the REPORT response should contain a resource "testFile.txt" with these key and value pairs: - | key | value | - | oc:fileid | %file_id_pattern% | - | oc:file-parent | %file_id_pattern% | - | oc:name | testFile.txt | - | d:getcontenttype | text/plain | - | oc:permissions | RDNVW | - | d:getcontentlength | 12 | + | key | value | + | oc:fileid | %file_id_pattern% | + | oc:file-parent | %file_id_pattern% | + | oc:name | testFile.txt | + | d:getcontenttype | text/plain | + | oc:permissions | RDNVW | + | oc:privatelink | %base_url%/f/[0-9a-z-$%]+ | + | d:getcontentlength | 12 | @issue-10329 Scenario: check the response of the searched sub-file @@ -41,13 +42,14 @@ Feature: REPORT request to project space And the following headers should match these regular expressions | X-Request-Id | %request_id_pattern% | And as user "Alice" the REPORT response should contain a resource "insideTheFolder.txt" with these key and value pairs: - | key | value | - | oc:fileid | %file_id_pattern% | - | oc:file-parent | %file_id_pattern% | - | oc:name | insideTheFolder.txt | - | d:getcontenttype | text/plain | - | oc:permissions | RDNVW | - | d:getcontentlength | 12 | + | key | value | + | oc:fileid | %file_id_pattern% | + | oc:file-parent | %file_id_pattern% | + | oc:name | insideTheFolder.txt | + | d:getcontenttype | text/plain | + | oc:permissions | RDNVW | + | oc:privatelink | %base_url%/f/[0-9a-z-$%]+ | + | d:getcontentlength | 12 | @issue-10329 Scenario: check the response of the searched folder @@ -59,13 +61,14 @@ Feature: REPORT request to project space And the following headers should match these regular expressions | X-Request-Id | %request_id_pattern% | And as user "Alice" the REPORT response should contain a resource "folderMain" with these key and value pairs: - | key | value | - | oc:fileid | %file_id_pattern% | - | oc:file-parent | %file_id_pattern% | - | oc:name | folderMain | - | d:getcontenttype | httpd/unix-directory | - | oc:permissions | RDNVCK | - | oc:size | 0 | + | key | value | + | oc:fileid | %file_id_pattern% | + | oc:file-parent | %file_id_pattern% | + | oc:name | folderMain | + | d:getcontenttype | httpd/unix-directory | + | oc:permissions | RDNVCK | + | oc:privatelink | %base_url%/f/[0-9a-z-$%]+ | + | oc:size | 0 | @issue-10329 Scenario: check the response of the searched sub-folder @@ -78,10 +81,11 @@ Feature: REPORT request to project space | X-Request-Id | %request_id_pattern% | And the HTTP status code should be "207" And as user "Alice" the REPORT response should contain a resource "sub-folder" with these key and value pairs: - | key | value | - | oc:fileid | %file_id_pattern% | - | oc:file-parent | %file_id_pattern% | - | oc:name | sub-folder | - | d:getcontenttype | httpd/unix-directory | - | oc:permissions | RDNVCK | - | oc:size | 0 | + | key | value | + | oc:fileid | %file_id_pattern% | + | oc:file-parent | %file_id_pattern% | + | oc:name | sub-folder | + | d:getcontenttype | httpd/unix-directory | + | oc:permissions | RDNVCK | + | oc:privatelink | %base_url%/f/[0-9a-z-$%]+ | + | oc:size | 0 | diff --git a/tests/acceptance/features/apiContract/spacesSharesReport.feature b/tests/acceptance/features/apiContract/spacesSharesReport.feature index f9569be4be..1a3ffcd5d9 100644 --- a/tests/acceptance/features/apiContract/spacesSharesReport.feature +++ b/tests/acceptance/features/apiContract/spacesSharesReport.feature @@ -29,15 +29,16 @@ Feature: Report test And the following headers should match these regular expressions | X-Request-Id | %request_id_pattern% | And as user "Brian" the REPORT response should contain a resource "SubFolder1" with these key and value pairs: - | key | value | - | oc:fileid | %file_id_pattern% | - | oc:file-parent | %file_id_pattern% | - | oc:shareroot | /folderMain | - | oc:name | SubFolder1 | - | d:getcontenttype | httpd/unix-directory | - | oc:permissions | S | - | oc:size | 12 | - | oc:remote-item-id | %file_id_pattern% | + | key | value | + | oc:fileid | %file_id_pattern% | + | oc:file-parent | %file_id_pattern% | + | oc:shareroot | /folderMain | + | oc:name | SubFolder1 | + | d:getcontenttype | httpd/unix-directory | + | oc:permissions | S | + | oc:privatelink | %base_url%/f/[0-9a-z-$%]+ | + | oc:size | 12 | + | oc:remote-item-id | %file_id_pattern% | Examples: | dav-path-version | | old | @@ -59,15 +60,16 @@ Feature: Report test And the following headers should match these regular expressions | X-Request-Id | %request_id_pattern% | And as user "Brian" the REPORT response should contain a resource "insideTheFolder.txt" with these key and value pairs: - | key | value | - | oc:fileid | %file_id_pattern% | - | oc:file-parent | %file_id_pattern% | - | oc:shareroot | /folderMain | - | oc:name | insideTheFolder.txt | - | d:getcontenttype | text/plain | - | oc:permissions | SD | - | d:getcontentlength | 12 | - | oc:remote-item-id | %file_id_pattern% | + | key | value | + | oc:fileid | %file_id_pattern% | + | oc:file-parent | %file_id_pattern% | + | oc:shareroot | /folderMain | + | oc:name | insideTheFolder.txt | + | d:getcontenttype | text/plain | + | oc:permissions | SD | + | oc:privatelink | %base_url%/f/[0-9a-z-$%]+ | + | d:getcontentlength | 12 | + | oc:remote-item-id | %file_id_pattern% | Examples: | dav-path-version | | old |