From b6278d55344bbcf2d318fb3b3673ae84d515c1a6 Mon Sep 17 00:00:00 2001 From: Vincent Petry Date: Thu, 11 Feb 2021 09:37:50 +0100 Subject: Fix sharing tests to work with attachment folders fix Signed-off-by: Vincent Petry --- tests/integration/features/sharing/get.feature | 12 +++++++----- tests/integration/features/sharing/hooks.feature | 14 +++++++------- tests/integration/features/sharing/move.feature | 4 ++-- tests/integration/features/sharing/restore.feature | 8 ++++---- tests/integration/features/sharing/update.feature | 4 ++-- 5 files changed, 22 insertions(+), 20 deletions(-) diff --git a/tests/integration/features/sharing/get.feature b/tests/integration/features/sharing/get.feature index 2621c8fed..9cdec8d51 100644 --- a/tests/integration/features/sharing/get.feature +++ b/tests/integration/features/sharing/get.feature @@ -125,7 +125,7 @@ Feature: get And user "participant1" renames room "group room" to "Group room" with 200 And user "participant1" adds "participant2" to room "group room" with 200 And user "participant1" shares "welcome.txt" with room "group room" with OCS 100 - And user "participant2" moves file "/welcome (2).txt" to "/renamed.txt" with 201 + And user "participant2" moves file "/Talk/welcome.txt" to "/Talk/renamed.txt" with 201 And user "participant1" updates last share with | expireDate | -3 days | And share is returned with @@ -1149,7 +1149,7 @@ Feature: get | roomName | room | And user "participant1" adds "participant2" to room "group room" with 200 And user "participant1" shares "welcome.txt" with room "group room" with OCS 100 - When user "participant2" gets the share-type DAV property for "/welcome (2).txt" + When user "participant2" gets the share-type DAV property for "Talk/welcome.txt" Then the response contains a share-types DAV property with Scenario: get DAV properties for a room share reshared with a user @@ -1269,10 +1269,12 @@ Feature: get And user "participant2" gets the DAV properties for "/" And the list of returned files for "participant2" is | / | + | /Talk/ | | /welcome.txt | - | /welcome%20(2).txt | - - + And user "participant2" gets the DAV properties for "/Talk" + And the list of returned files for "participant2" is + | /Talk/ | + | /Talk/welcome.txt | Scenario: get files after deleting a share Given user "participant1" creates room "group room" diff --git a/tests/integration/features/sharing/hooks.feature b/tests/integration/features/sharing/hooks.feature index 994943298..c58e10cef 100644 --- a/tests/integration/features/sharing/hooks.feature +++ b/tests/integration/features/sharing/hooks.feature @@ -372,8 +372,8 @@ Feature: hooks And user "participant1" adds "participant2" to room "group room" with 200 And user "participant1" adds "participant3" to room "group room" with 200 And user "participant1" shares "welcome.txt" with room "group room" with OCS 100 - And user "participant2" moves file "welcome (2).txt" to "renamed.txt" - And user "participant3" moves file "welcome (2).txt" to "renamed too.txt" + And user "participant2" moves file "Talk/welcome.txt" to "Talk/renamed.txt" + And user "participant3" moves file "Talk/welcome.txt" to "Talk/renamed too.txt" When user "participant1" removes "participant2" from room "group room" with 200 Then user "participant1" gets last share And share is returned with @@ -392,11 +392,11 @@ Feature: hooks And share is returned with | uid_owner | participant1 | | displayname_owner | participant1-displayname | - | path | /renamed too.txt | + | path | /Talk/renamed too.txt | | item_type | file | | mimetype | text/plain | - | storage_id | shared::/renamed too.txt | - | file_target | /renamed too.txt | + | storage_id | shared::/Talk/renamed too.txt | + | file_target | /Talk/renamed too.txt | | share_with | group room | | share_with_displayname | Group room | @@ -819,8 +819,8 @@ Feature: hooks | roomName | room | And user "participant1" adds "participant2" to room "group room" with 200 And user "participant1" shares "welcome.txt" with room "group room" with OCS 100 - And user "participant2" moves file "welcome (2).txt" to "renamed.txt" - And user "participant2" shares "renamed.txt" with user "participant3" with OCS 100 + And user "participant2" moves file "Talk/welcome.txt" to "Talk/renamed.txt" + And user "participant2" shares "Talk/renamed.txt" with user "participant3" with OCS 100 And user "participant3" accepts last share When user "participant1" deletes room "group room" with 200 Then user "participant1" gets all shares diff --git a/tests/integration/features/sharing/move.feature b/tests/integration/features/sharing/move.feature index 121bb6b7a..fbd035bdd 100644 --- a/tests/integration/features/sharing/move.feature +++ b/tests/integration/features/sharing/move.feature @@ -217,7 +217,7 @@ Feature: move And user "participant1" adds "participant3" to room "group room" with 200 And user "participant1" shares "welcome.txt" with room "group room" with OCS 100 And user "participant2" creates folder "/test" - When user "participant2" moves file "/welcome (2).txt" to "/test/renamed.txt" with 201 + When user "participant2" moves file "Talk/welcome.txt" to "test/renamed.txt" with 201 Then user "participant1" gets last share And share is returned with | uid_owner | participant1 | @@ -267,5 +267,5 @@ Feature: move And user "participant3" shares "/test" with user "participant2" with OCS 100 And user "participant2" accepts last share And user "participant1" shares "welcome.txt" with room "group room" with OCS 100 - When user "participant3" moves file "/welcome (2).txt" to "/test/renamed.txt" + When user "participant3" moves file "/Talk/welcome.txt" to "/test/renamed.txt" Then the HTTP status code should be "403" diff --git a/tests/integration/features/sharing/restore.feature b/tests/integration/features/sharing/restore.feature index f6bb88c72..4ad03f0ef 100644 --- a/tests/integration/features/sharing/restore.feature +++ b/tests/integration/features/sharing/restore.feature @@ -61,7 +61,7 @@ Feature: delete And user "participant1" adds "participant2" to room "group room" with 200 And user "participant1" adds "participant3" to room "group room" with 200 And user "participant1" shares "welcome.txt" with room "group room" with OCS 100 - And user "participant2" moves file "/welcome (2).txt" to "/renamed.txt" with 201 + And user "participant2" moves file "/Talk/welcome.txt" to "/Talk/renamed.txt" with 201 And user "participant2" deletes last share When user "participant2" restores last share Then the OCS status code should be "100" @@ -72,11 +72,11 @@ Feature: delete And share is returned with | uid_owner | participant1 | | displayname_owner | participant1-displayname | - | path | /renamed.txt | + | path | /Talk/renamed.txt | | item_type | file | | mimetype | text/plain | - | storage_id | shared::/renamed.txt | - | file_target | /renamed.txt | + | storage_id | shared::/Talk/renamed.txt | + | file_target | /Talk/renamed.txt | | share_with | group room | | share_with_displayname | Group room | And user "participant1" gets last share diff --git a/tests/integration/features/sharing/update.feature b/tests/integration/features/sharing/update.feature index bedd1ecc4..f44daaa2b 100644 --- a/tests/integration/features/sharing/update.feature +++ b/tests/integration/features/sharing/update.feature @@ -898,7 +898,7 @@ Feature: update And user "participant1" adds "participant3" to room "group room invited to" with 200 And user "participant1" shares "welcome.txt" with room "group room invited to" with OCS 100 And user "participant2" creates folder "/test" - And user "participant2" moves file "/welcome (2).txt" to "/test/renamed.txt" with 201 + And user "participant2" moves file "/Talk/welcome.txt" to "/test/renamed.txt" with 201 When user "participant2" updates last share with | permissions | 1 | | expireDate | +3 days | @@ -947,7 +947,7 @@ Feature: update And user "participant1" adds "participant3" to room "group room invited to" with 200 And user "participant1" shares "welcome.txt" with room "group room invited to" with OCS 100 And user "participant2" creates folder "/test" - And user "participant2" moves file "/welcome (2).txt" to "/test/renamed.txt" with 201 + And user "participant2" moves file "/Talk/welcome.txt" to "/test/renamed.txt" with 201 And user "participant1" removes "participant2" from room "group room invited to" with 200 When user "participant2" updates last share with | permissions | 1 | -- cgit v1.2.3