From 369c95556ecd9365734b4d22174c0e5c7b1d1176 Mon Sep 17 00:00:00 2001 From: Viktor Scharf Date: Thu, 6 Nov 2025 14:49:33 +0100 Subject: [PATCH 1/2] Sync share before action --- ...cted-failures-API-on-decomposed-storage.md | 2 +- .../expected-failures-API-on-posix-storage.md | 2 +- .../deleteShareFromShares.feature | 32 ++++++++++++------- .../uploadToShare.feature | 1 + 4 files changed, 24 insertions(+), 13 deletions(-) diff --git a/tests/acceptance/expected-failures-API-on-decomposed-storage.md b/tests/acceptance/expected-failures-API-on-decomposed-storage.md index ff92bce7db..13c5035e72 100644 --- a/tests/acceptance/expected-failures-API-on-decomposed-storage.md +++ b/tests/acceptance/expected-failures-API-on-decomposed-storage.md @@ -116,8 +116,8 @@ _ocdav: api compatibility, return correct status code_ - [coreApiWebdavUploadTUS/uploadToShare.feature:256](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/coreApiWebdavUploadTUS/uploadToShare.feature#L256) - [coreApiWebdavUploadTUS/uploadToShare.feature:279](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/coreApiWebdavUploadTUS/uploadToShare.feature#L279) - [coreApiWebdavUploadTUS/uploadToShare.feature:280](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/coreApiWebdavUploadTUS/uploadToShare.feature#L280) -- [coreApiWebdavUploadTUS/uploadToShare.feature:375](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/coreApiWebdavUploadTUS/uploadToShare.feature#L375) - [coreApiWebdavUploadTUS/uploadToShare.feature:376](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/coreApiWebdavUploadTUS/uploadToShare.feature#L376) +- [coreApiWebdavUploadTUS/uploadToShare.feature:377](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/coreApiWebdavUploadTUS/uploadToShare.feature#L377) #### [Renaming resource to banned name is allowed in spaces webdav](https://github.com/owncloud/ocis/issues/3099) diff --git a/tests/acceptance/expected-failures-API-on-posix-storage.md b/tests/acceptance/expected-failures-API-on-posix-storage.md index ff92bce7db..13c5035e72 100644 --- a/tests/acceptance/expected-failures-API-on-posix-storage.md +++ b/tests/acceptance/expected-failures-API-on-posix-storage.md @@ -116,8 +116,8 @@ _ocdav: api compatibility, return correct status code_ - [coreApiWebdavUploadTUS/uploadToShare.feature:256](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/coreApiWebdavUploadTUS/uploadToShare.feature#L256) - [coreApiWebdavUploadTUS/uploadToShare.feature:279](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/coreApiWebdavUploadTUS/uploadToShare.feature#L279) - [coreApiWebdavUploadTUS/uploadToShare.feature:280](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/coreApiWebdavUploadTUS/uploadToShare.feature#L280) -- [coreApiWebdavUploadTUS/uploadToShare.feature:375](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/coreApiWebdavUploadTUS/uploadToShare.feature#L375) - [coreApiWebdavUploadTUS/uploadToShare.feature:376](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/coreApiWebdavUploadTUS/uploadToShare.feature#L376) +- [coreApiWebdavUploadTUS/uploadToShare.feature:377](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/coreApiWebdavUploadTUS/uploadToShare.feature#L377) #### [Renaming resource to banned name is allowed in spaces webdav](https://github.com/owncloud/ocis/issues/3099) diff --git a/tests/acceptance/features/coreApiShareManagementBasicToShares/deleteShareFromShares.feature b/tests/acceptance/features/coreApiShareManagementBasicToShares/deleteShareFromShares.feature index 5c2c213074..4b6ee68ea7 100644 --- a/tests/acceptance/features/coreApiShareManagementBasicToShares/deleteShareFromShares.feature +++ b/tests/acceptance/features/coreApiShareManagementBasicToShares/deleteShareFromShares.feature @@ -23,6 +23,7 @@ Feature: sharing | sharee | grp1 | | shareType | group | | permissionsRole | File Editor | + And user "Brian" has a share "textfile0.txt" synced And user "Brian" has moved file "/Shares/textfile0.txt" to "/Shares/anotherName.txt" When user "Alice" deletes the last share using the sharing API Then the OCS status code should be "" @@ -89,6 +90,7 @@ Feature: sharing | sharee | Brian | | shareType | user | | permissionsRole | Editor | + And user "Brian" has a share "shared" synced When user "Brian" deletes file "/Shares/shared/shared_file.txt" using the WebDAV API Then the HTTP status code should be "204" And as "Brian" file "/Shares/shared/shared_file.txt" should not exist @@ -114,6 +116,7 @@ Feature: sharing | sharee | Brian | | shareType | user | | permissionsRole | Editor | + And user "Brian" has a share "shared" synced When user "Brian" deletes folder "/Shares/shared/sub" using the WebDAV API Then the HTTP status code should be "204" And as "Brian" folder "/Shares/shared/sub" should not exist @@ -165,6 +168,7 @@ Feature: sharing | sharee | Brian | | shareType | user | | permissionsRole | Viewer | + And user "Brian" has a share "shared" synced When user "Brian" deletes file "/Shares/shared/shared_file.txt" using the WebDAV API Then the HTTP status code should be "403" And as "Alice" file "/shared/shared_file.txt" should exist @@ -187,6 +191,7 @@ Feature: sharing | sharee | Brian | | shareType | user | | permissionsRole | Uploader | + And user "Brian" has a share "shared" synced When user "Brian" deletes file "/Shares/shared/shared_file.txt" using the WebDAV API Then the HTTP status code should be "403" And as "Alice" file "/shared/shared_file.txt" should exist @@ -208,6 +213,7 @@ Feature: sharing | sharee | Brian | | shareType | user | | permissionsRole | Uploader | + And user "Brian" has a share "shared" synced And user "Brian" has uploaded file "filesForUpload/textfile.txt" to "/Shares/shared/textfile.txt" When user "Brian" deletes file "/Shares/shared/textfile.txt" using the WebDAV API Then the HTTP status code should be "403" @@ -220,7 +226,7 @@ Feature: sharing | spaces | - Scenario Outline: group share recipient tries to delete the share +Scenario Outline: group share recipient tries to delete the share Given using OCS API version "" And group "grp1" has been created And these users have been created with default attributes: @@ -237,6 +243,7 @@ Feature: sharing | sharee | grp1 | | shareType | group | | permissionsRole | | + And user "Brian" has a share "" synced When user "Brian" deletes the last share of user "Alice" using the sharing API Then the OCS status code should be "996" And the HTTP status code should be "" @@ -244,11 +251,11 @@ Feature: sharing And as "Brian" entry "" should exist And as "Carol" entry "" should exist Examples: - | entry-to-share | permission-role | ocs-api-version | http-status-code | received-entry | - | /shared/shared_file.txt | File Editor | 1 | 200 | /Shares/shared_file.txt | - | /shared/shared_file.txt | File Editor | 2 | 500 | /Shares/shared_file.txt | - | /shared | Editor | 1 | 200 | /Shares/shared | - | /shared | Editor | 2 | 500 | /Shares/shared | + | entry-to-share | permission-role | ocs-api-version | http-status-code | received-entry | sync-entry | + | /shared/shared_file.txt | File Editor | 1 | 200 | /Shares/shared_file.txt | shared_file.txt | + | /shared/shared_file.txt | File Editor | 2 | 500 | /Shares/shared_file.txt | shared_file.txt | + | /shared | Editor | 1 | 200 | /Shares/shared | shared | + | /shared | Editor | 2 | 500 | /Shares/shared | shared | Scenario Outline: individual share recipient tries to delete the share @@ -262,17 +269,18 @@ Feature: sharing | sharee | Brian | | shareType | user | | permissionsRole | | + And user "Brian" has a share "" synced When user "Brian" deletes the last share of user "Alice" using the sharing API Then the OCS status code should be "996" And the HTTP status code should be "" And as "Alice" entry "" should exist And as "Brian" entry "" should exist Examples: - | entry-to-share | permission-role | ocs-api-version | http-status-code | received-entry | - | /shared/shared_file.txt | File Editor | 1 | 200 | /Shares/shared_file.txt | - | /shared/shared_file.txt | File Editor | 2 | 500 | /Shares/shared_file.txt | - | /shared | Editor | 1 | 200 | /Shares/shared | - | /shared | Editor | 2 | 500 | /Shares/shared | + | entry-to-share | permission-role | ocs-api-version | http-status-code | received-entry | sync-entry | + | /shared/shared_file.txt | File Editor | 1 | 200 | /Shares/shared_file.txt | shared_file.txt | + | /shared/shared_file.txt | File Editor | 2 | 500 | /Shares/shared_file.txt | shared_file.txt | + | /shared | Editor | 1 | 200 | /Shares/shared | shared | + | /shared | Editor | 2 | 500 | /Shares/shared | shared | @issue-720 Scenario Outline: request PROPFIND after sharer deletes the collaborator @@ -284,6 +292,7 @@ Feature: sharing | sharee | Brian | | shareType | user | | permissionsRole | File Editor | + And user "Brian" has a share "textfile0.txt" synced When user "Alice" deletes the last share using the sharing API Then the OCS status code should be "" And the HTTP status code should be "200" @@ -304,6 +313,7 @@ Feature: sharing | sharee | Brian | | shareType | user | | permissionsRole | File Editor | + And user "Brian" has a share "textfile0.txt" synced When user "Brian" tries to delete the last share of user "Alice" using the sharing API Then the HTTP status code should be "" And the OCS status code should be "996" diff --git a/tests/acceptance/features/coreApiWebdavUploadTUS/uploadToShare.feature b/tests/acceptance/features/coreApiWebdavUploadTUS/uploadToShare.feature index 3d35870534..9951daf88e 100644 --- a/tests/acceptance/features/coreApiWebdavUploadTUS/uploadToShare.feature +++ b/tests/acceptance/features/coreApiWebdavUploadTUS/uploadToShare.feature @@ -290,6 +290,7 @@ Feature: upload file to shared folder And user "Alice" sends a chunk to the last created TUS Location with offset "5" and data "56789" with checksum "MD5 099ebea48ea9666a7da2177267983138" using the TUS protocol on the WebDAV API And user "Alice" shares file "textFile.txt" with user "Brian" using the sharing API Then the HTTP status code should be "200" + And user "Brian" has a share "textFile.txt" synced And the content of file "/Shares/textFile.txt" for user "Brian" should be "0123456789" Examples: | dav-path-version | From f715f5a879b4a5186d4a979cbc4c788e9e096cda Mon Sep 17 00:00:00 2001 From: Viktor Scharf Date: Thu, 6 Nov 2025 16:06:47 +0100 Subject: [PATCH 2/2] lint fix --- .../deleteShareFromShares.feature | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/acceptance/features/coreApiShareManagementBasicToShares/deleteShareFromShares.feature b/tests/acceptance/features/coreApiShareManagementBasicToShares/deleteShareFromShares.feature index 4b6ee68ea7..6a2ead9851 100644 --- a/tests/acceptance/features/coreApiShareManagementBasicToShares/deleteShareFromShares.feature +++ b/tests/acceptance/features/coreApiShareManagementBasicToShares/deleteShareFromShares.feature @@ -226,7 +226,7 @@ Feature: sharing | spaces | -Scenario Outline: group share recipient tries to delete the share + Scenario Outline: group share recipient tries to delete the share Given using OCS API version "" And group "grp1" has been created And these users have been created with default attributes: