From 62df492944e293e5d8cf8b7e3d7b14c644a20982 Mon Sep 17 00:00:00 2001 From: Prarup Gurung Date: Fri, 14 Jun 2024 12:00:18 +0545 Subject: [PATCH] Removed failing ocs scenarios, removed from expected failure --- .../expected-failures-API-on-OCIS-storage.md | 22 ---------------- .../deleteShareFromShares.feature | 25 +++++++++---------- 2 files changed, 12 insertions(+), 35 deletions(-) diff --git a/tests/acceptance/expected-failures-API-on-OCIS-storage.md b/tests/acceptance/expected-failures-API-on-OCIS-storage.md index 06ebe61fb3..a5935fd747 100644 --- a/tests/acceptance/expected-failures-API-on-OCIS-storage.md +++ b/tests/acceptance/expected-failures-API-on-OCIS-storage.md @@ -56,20 +56,6 @@ Synchronization features like etag propagation, setting mtime and locking files ### Share -File and sync features in a shared scenario - -#### [File deletion using dav gives unique string in filename in the trashbin](https://github.com/owncloud/product/issues/178) - -- [coreApiShareManagementBasicToShares/deleteShareFromShares.feature:75](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiShareManagementBasicToShares/deleteShareFromShares.feature#L75) -- [coreApiShareManagementBasicToShares/deleteShareFromShares.feature:93](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiShareManagementBasicToShares/deleteShareFromShares.feature#L93) - -cannot share a folder with create permission - -#### [Resource with share permission create is readable for sharee](https://github.com/owncloud/ocis/issues/4524) - -- [coreApiShareManagementBasicToShares/deleteShareFromShares.feature:155](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiShareManagementBasicToShares/deleteShareFromShares.feature#L155) -- [coreApiShareManagementBasicToShares/deleteShareFromShares.feature:172](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiShareManagementBasicToShares/deleteShareFromShares.feature#L172) - #### [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) @@ -281,14 +267,6 @@ Not everything needs to be implemented for ocis. While the oc10 testsuite covers - [coreApiShareManagementToShares/acceptShares.feature:235](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiShareManagementToShares/acceptShares.feature#L235) - [coreApiShareManagementToShares/acceptShares.feature:303](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiShareManagementToShares/acceptShares.feature#L303) - [coreApiShareManagementToShares/acceptShares.feature:534](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiShareManagementToShares/acceptShares.feature#L534) -- [coreApiShareManagementBasicToShares/deleteShareFromShares.feature:213](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiShareManagementBasicToShares/deleteShareFromShares.feature#L213) -- [coreApiShareManagementBasicToShares/deleteShareFromShares.feature:214](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiShareManagementBasicToShares/deleteShareFromShares.feature#L214) -- [coreApiShareManagementBasicToShares/deleteShareFromShares.feature:215](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiShareManagementBasicToShares/deleteShareFromShares.feature#L215) -- [coreApiShareManagementBasicToShares/deleteShareFromShares.feature:216](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiShareManagementBasicToShares/deleteShareFromShares.feature#L216) -- [coreApiShareManagementBasicToShares/deleteShareFromShares.feature:237](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiShareManagementBasicToShares/deleteShareFromShares.feature#L237) -- [coreApiShareManagementBasicToShares/deleteShareFromShares.feature:238](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiShareManagementBasicToShares/deleteShareFromShares.feature#L238) -- [coreApiShareManagementBasicToShares/deleteShareFromShares.feature:239](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiShareManagementBasicToShares/deleteShareFromShares.feature#L239) -- [coreApiShareManagementBasicToShares/deleteShareFromShares.feature:240](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiShareManagementBasicToShares/deleteShareFromShares.feature#L240) #### [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 0e304d67c0..7d3f8db57e 100644 --- a/tests/acceptance/features/coreApiShareManagementBasicToShares/deleteShareFromShares.feature +++ b/tests/acceptance/features/coreApiShareManagementBasicToShares/deleteShareFromShares.feature @@ -87,7 +87,7 @@ Feature: sharing And as "Brian" file "/Shares/shared/shared_file.txt" should not exist And as "Alice" file "/shared/shared_file.txt" should not exist And as "Alice" file "/shared_file.txt" should exist in the trashbin - And as "Brian" file "/shared_file.txt" should exist in the trashbin + And as "Brian" the file with original path "/shared_file.txt" should not exist in the trashbin Scenario: deleting a folder out of a share as recipient creates a backup for the owner @@ -107,8 +107,8 @@ Feature: sharing And as "Alice" folder "/shared/sub" should not exist And as "Alice" folder "/sub" should exist in the trashbin And as "Alice" file "/sub/shared_file.txt" should exist in the trashbin - And as "Brian" folder "/sub" should exist in the trashbin - And as "Brian" file "/sub/shared_file.txt" should exist in the trashbin + And as "Brian" the folder with original path "/sub" should not exist in the trashbin + And as "Brian" the file with original path "/sub/shared_file.txt" should not exist in the trashbin @smokeTest Scenario: unshare from self @@ -165,8 +165,7 @@ Feature: sharing 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 - # Note: for Brian, the file does not "exist" because he only has "create" permission, not "read" - And as "Brian" file "/Shares/shared/shared_file.txt" should not exist + And as "Brian" file "/Shares/shared/shared_file.txt" should exist Scenario: sharee of an upload-only shared folder tries to delete their file in the folder @@ -182,8 +181,7 @@ Feature: sharing When user "Brian" deletes file "/Shares/shared/textfile.txt" using the WebDAV API Then the HTTP status code should be "403" And as "Alice" file "/shared/textfile.txt" should exist - # Note: for Brian, the file does not "exist" because he only has "create" permission, not "read" - And as "Brian" file "/Shares/shared/textfile.txt" should not exist + And as "Brian" file "/Shares/shared/textfile.txt" should exist Scenario Outline: group share recipient tries to delete the share @@ -196,6 +194,7 @@ Feature: sharing And user "Carol" has been added to group "grp1" And user "Alice" has created folder "/shared" And user "Alice" has moved file "/textfile0.txt" to "/shared/shared_file.txt" + And using SharingNG And user "Alice" has sent the following resource share invitation: | resource | | | space | Personal | @@ -203,7 +202,7 @@ Feature: sharing | shareType | group | | permissionsRole | | When user "Brian" deletes the last share of user "Alice" using the sharing API - Then the OCS status code should be "404" + 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 @@ -211,9 +210,9 @@ Feature: sharing 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 | 404 | /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 | 404 | /Shares/shared | + | /shared | Editor | 2 | 500 | /Shares/shared | Scenario Outline: individual share recipient tries to delete the share @@ -228,16 +227,16 @@ Feature: sharing | shareType | user | | permissionsRole | | When user "Brian" deletes the last share of user "Alice" using the sharing API - Then the OCS status code should be "404" + 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 | 404 | /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 | 404 | /Shares/shared | + | /shared | Editor | 2 | 500 | /Shares/shared | @issue-720 Scenario Outline: request PROPFIND after sharer deletes the collaborator