diff --git a/tests/integration/features/sharing/create.feature b/tests/integration/features/sharing/create.feature index e30d6fde03..3de5924ca6 100644 --- a/tests/integration/features/sharing/create.feature +++ b/tests/integration/features/sharing/create.feature @@ -749,9 +749,8 @@ Feature: create | mimetype | text/plain | | storage_id | shared::/Talk/welcome.txt | | file_target | /Talk/welcome.txt | - | share_with | participant2 | - | share_with_displayname | participant2-displayname | - | share_type | 0 | + | share_with | group room | + | share_with_displayname | Group room | And share 1 is returned with | uid_owner | participant1 | | displayname_owner | participant1-displayname | @@ -760,8 +759,9 @@ Feature: create | mimetype | text/plain | | storage_id | shared::/Talk/welcome.txt | | file_target | /Talk/welcome.txt | - | share_with | group room | - | share_with_displayname | Group room | + | share_with | participant2 | + | share_with_displayname | participant2-displayname | + | share_type | 0 | Scenario: create share with a room including a user who already received that share directly Given user "participant1" creates room "group room" diff --git a/tests/integration/features/sharing/delete.feature b/tests/integration/features/sharing/delete.feature index a152367c82..587f3e9b69 100644 --- a/tests/integration/features/sharing/delete.feature +++ b/tests/integration/features/sharing/delete.feature @@ -254,11 +254,11 @@ Feature: delete And share 0 is returned with | uid_owner | participant1 | | displayname_owner | participant1-displayname | - | path | /Talk/welcome.txt | + | path | /welcome (2).txt | | item_type | file | | mimetype | text/plain | - | storage_id | shared::/Talk/welcome.txt | - | file_target | /Talk/welcome.txt | + | storage_id | shared::/welcome (2).txt | + | file_target | /welcome (2).txt | | share_with | participant2 | | share_with_displayname | participant2-displayname | | share_type | 0 | @@ -345,11 +345,11 @@ Feature: delete And share 0 is returned with | uid_owner | participant1 | | displayname_owner | participant1-displayname | - | path | /Talk/welcome.txt | + | path | /welcome (2).txt | | item_type | file | | mimetype | text/plain | - | storage_id | shared::/Talk/welcome.txt | - | file_target | /Talk/welcome.txt | + | storage_id | shared::/welcome (2).txt | + | file_target | /welcome (2).txt | | share_with | participant2 | | share_with_displayname | participant2-displayname | | share_type | 0 | diff --git a/tests/integration/features/sharing/get.feature b/tests/integration/features/sharing/get.feature index 640ba75c1c..2621c8fedc 100644 --- a/tests/integration/features/sharing/get.feature +++ b/tests/integration/features/sharing/get.feature @@ -186,7 +186,7 @@ Feature: get And user "participant1" shares "test" with room "group room invited to" with OCS 100 And user "participant1" shares "welcome.txt" with room "group room invited to" with OCS 100 And user "participant1" shares "test" with room "own one-to-one room" with OCS 100 - And user "participant2" shares "welcome (2).txt" with user "participant3" with OCS 100 + And user "participant2" shares "Talk/welcome.txt" with user "participant3" with OCS 100 And user "participant3" accepts last share And user "participant3" shares "welcome (2).txt" with room "one-to-one room not invited to" with OCS 100 And user "participant1" creates folder "/deleted" @@ -211,7 +211,7 @@ Feature: get | item_type | folder | | mimetype | httpd/unix-directory | | storage_id | home::participant1 | - | file_target | /test | + | file_target | /{TALK_PLACEHOLDER}/test | | share_with | group room invited to | | share_with_displayname | Group room invited to | | permissions | 31 | @@ -232,7 +232,7 @@ Feature: get | item_type | folder | | mimetype | httpd/unix-directory | | storage_id | home::participant1 | - | file_target | /test | + | file_target | /{TALK_PLACEHOLDER}/test | | share_with | own one-to-one room | | share_with_displayname | participant3-displayname | | permissions | 31 | @@ -258,30 +258,17 @@ Feature: get And user "participant1" shares "test" with room "group room invited to" with OCS 100 And user "participant1" shares "welcome.txt" with room "group room invited to" with OCS 100 And user "participant1" shares "test" with room "own one-to-one room" with OCS 100 - And user "participant2" shares "welcome (2).txt" with user "participant3" with OCS 100 + And user "participant2" shares "Talk/welcome.txt" with user "participant3" with OCS 100 And user "participant3" accepts last share And user "participant3" shares "welcome (2).txt" with room "one-to-one room not invited to" with OCS 100 And user "participant1" creates folder "/deleted" And user "participant1" shares "deleted" with room "group room invited to" with OCS 100 - And user "participant2" shares "deleted" with user "participant3" with OCS 100 + And user "participant2" shares "Talk/deleted" with user "participant3" with OCS 100 And user "participant3" accepts last share And user "participant1" deletes file "deleted" When user "participant1" gets all shares and reshares Then the list of returned shares has 6 shares And share 0 is returned with - | uid_owner | participant2 | - | displayname_owner | participant2-displayname | - | uid_file_owner | participant1 | - | displayname_file_owner | participant1-displayname | - | path | /welcome.txt | - | item_type | file | - | mimetype | text/plain | - | storage_id | home::participant1 | - | file_target | /welcome (2).txt | - | share_with | participant3 | - | share_with_displayname | participant3-displayname | - | share_type | 0 | - And share 1 is returned with | uid_owner | participant1 | | displayname_owner | participant1-displayname | | path | /welcome.txt | @@ -291,18 +278,18 @@ Feature: get | file_target | /{TALK_PLACEHOLDER}/welcome.txt | | share_with | own group room | | share_with_displayname | Own group room | - And share 2 is returned with + And share 1 is returned with | uid_owner | participant1 | | displayname_owner | participant1-displayname | | path | /test | | item_type | folder | | mimetype | httpd/unix-directory | | storage_id | home::participant1 | - | file_target | /test | + | file_target | /{TALK_PLACEHOLDER}/test | | share_with | group room invited to | | share_with_displayname | Group room invited to | | permissions | 31 | - And share 3 is returned with + And share 2 is returned with | uid_owner | participant1 | | displayname_owner | participant1-displayname | | path | /welcome.txt | @@ -312,17 +299,30 @@ Feature: get | file_target | /{TALK_PLACEHOLDER}/welcome.txt | | share_with | group room invited to | | share_with_displayname | Group room invited to | - And share 4 is returned with + And share 3 is returned with | uid_owner | participant1 | | displayname_owner | participant1-displayname | | path | /test | | item_type | folder | | mimetype | httpd/unix-directory | | storage_id | home::participant1 | - | file_target | /test | + | file_target | /{TALK_PLACEHOLDER}/test | | share_with | own one-to-one room | | share_with_displayname | participant3-displayname | | permissions | 31 | + And share 4 is returned with + | uid_owner | participant2 | + | displayname_owner | participant2-displayname | + | uid_file_owner | participant1 | + | displayname_file_owner | participant1-displayname | + | path | /welcome.txt | + | item_type | file | + | mimetype | text/plain | + | storage_id | home::participant1 | + | file_target | /welcome (2).txt | + | share_with | participant3 | + | share_with_displayname | participant3-displayname | + | share_type | 0 | And share 5 is returned with | uid_owner | participant3 | | displayname_owner | participant3-displayname | @@ -332,7 +332,7 @@ Feature: get | item_type | file | | mimetype | text/plain | | storage_id | home::participant1 | - | file_target | /welcome (2).txt | + | file_target | /{TALK_PLACEHOLDER}/welcome (2).txt | | share_with | private_conversation | | share_with_displayname | Private conversation | @@ -367,7 +367,7 @@ Feature: get | item_type | file | | mimetype | text/plain | | storage_id | home::participant1 | - | file_target | /welcome (2).txt | + | file_target | /{TALK_PLACEHOLDER}/welcome (2).txt | | share_with | private_conversation | | share_with_displayname | Private conversation | @@ -402,7 +402,7 @@ Feature: get | item_type | file | | mimetype | text/plain | | storage_id | home::participant1 | - | file_target | /welcome (2).txt | + | file_target | /{TALK_PLACEHOLDER}/welcome (2).txt | | share_with | private_conversation | | share_with_displayname | Private conversation | @@ -427,7 +427,7 @@ Feature: get And user "participant1" shares "test" with room "group room invited to" with OCS 100 And user "participant1" shares "welcome.txt" with room "group room invited to" with OCS 100 And user "participant1" shares "test" with room "own one-to-one room" with OCS 100 - And user "participant2" shares "welcome (2).txt" with user "participant3" with OCS 100 + And user "participant2" shares "Talk/welcome.txt" with user "participant3" with OCS 100 And user "participant3" accepts last share And user "participant3" shares "welcome (2).txt" with room "one-to-one room not invited to" with OCS 100 When user "participant1" gets all shares for "/welcome.txt" @@ -474,7 +474,7 @@ Feature: get And user "participant1" shares "test" with room "group room invited to" with OCS 100 And user "participant1" shares "welcome.txt" with room "group room invited to" with OCS 100 And user "participant1" shares "test" with room "own one-to-one room" with OCS 100 - And user "participant2" shares "welcome (2).txt" with user "participant3" with OCS 100 + And user "participant2" shares "Talk/welcome.txt" with user "participant3" with OCS 100 And user "participant3" accepts last share And user "participant3" shares "welcome (2).txt" with room "one-to-one room not invited to" with OCS 100 And user "participant1" deletes file "welcome.txt" @@ -503,25 +503,12 @@ Feature: get And user "participant1" shares "test" with room "group room invited to" with OCS 100 And user "participant1" shares "welcome.txt" with room "group room invited to" with OCS 100 And user "participant1" shares "test" with room "own one-to-one room" with OCS 100 - And user "participant2" shares "welcome (2).txt" with user "participant3" with OCS 100 + And user "participant2" shares "Talk/welcome.txt" with user "participant3" with OCS 100 And user "participant3" accepts last share And user "participant3" shares "welcome (2).txt" with room "one-to-one room not invited to" with OCS 100 When user "participant1" gets all shares and reshares for "/welcome.txt" Then the list of returned shares has 4 shares And share 0 is returned with - | uid_owner | participant2 | - | displayname_owner | participant2-displayname | - | uid_file_owner | participant1 | - | displayname_file_owner | participant1-displayname | - | path | /welcome.txt | - | item_type | file | - | mimetype | text/plain | - | storage_id | home::participant1 | - | file_target | /welcome (2).txt | - | share_with | participant3 | - | share_with_displayname | participant3-displayname | - | share_type | 0 | - And share 1 is returned with | uid_owner | participant1 | | displayname_owner | participant1-displayname | | path | /welcome.txt | @@ -531,7 +518,7 @@ Feature: get | file_target | /{TALK_PLACEHOLDER}/welcome.txt | | share_with | own group room | | share_with_displayname | Own group room | - And share 2 is returned with + And share 1 is returned with | uid_owner | participant1 | | displayname_owner | participant1-displayname | | path | /welcome.txt | @@ -541,6 +528,19 @@ Feature: get | file_target | /{TALK_PLACEHOLDER}/welcome.txt | | share_with | group room invited to | | share_with_displayname | Group room invited to | + And share 2 is returned with + | uid_owner | participant2 | + | displayname_owner | participant2-displayname | + | uid_file_owner | participant1 | + | displayname_file_owner | participant1-displayname | + | path | /welcome.txt | + | item_type | file | + | mimetype | text/plain | + | storage_id | home::participant1 | + | file_target | /welcome (2).txt | + | share_with | participant3 | + | share_with_displayname | participant3-displayname | + | share_type | 0 | And share 3 is returned with | uid_owner | participant3 | | displayname_owner | participant3-displayname | @@ -550,7 +550,7 @@ Feature: get | item_type | file | | mimetype | text/plain | | storage_id | home::participant1 | - | file_target | /welcome (2).txt | + | file_target | /{TALK_PLACEHOLDER}/welcome (2).txt | | share_with | private_conversation | | share_with_displayname | Private conversation | @@ -585,7 +585,7 @@ Feature: get | item_type | file | | mimetype | text/plain | | storage_id | home::participant1 | - | file_target | /welcome (2).txt | + | file_target | /{TALK_PLACEHOLDER}/welcome (2).txt | | share_with | private_conversation | | share_with_displayname | Private conversation | @@ -620,7 +620,7 @@ Feature: get | item_type | file | | mimetype | text/plain | | storage_id | home::participant1 | - | file_target | /welcome (2).txt | + | file_target | /{TALK_PLACEHOLDER}/welcome (2).txt | | share_with | private_conversation | | share_with_displayname | Private conversation | @@ -656,7 +656,7 @@ Feature: get | item_type | file | | mimetype | text/plain | | storage_id | home::participant1 | - | file_target | /welcome (2).txt | + | file_target | /{TALK_PLACEHOLDER}/welcome (2).txt | | share_with | private_conversation | | share_with_displayname | Private conversation | @@ -692,7 +692,7 @@ Feature: get | item_type | file | | mimetype | text/plain | | storage_id | home::participant1 | - | file_target | /welcome (2).txt | + | file_target | /{TALK_PLACEHOLDER}/welcome (2).txt | | share_with | private_conversation | | share_with_displayname | Private conversation | | token | A_TOKEN | @@ -730,7 +730,7 @@ Feature: get | item_type | file | | mimetype | text/plain | | storage_id | home::participant1 | - | file_target | /welcome (2).txt | + | file_target | /{TALK_PLACEHOLDER}/welcome (2).txt | | share_with | public room invited to | | share_with_displayname | Public room invited to | | token | A_TOKEN | @@ -768,7 +768,7 @@ Feature: get | item_type | file | | mimetype | text/plain | | storage_id | home::participant1 | - | file_target | /welcome (2).txt | + | file_target | /{TALK_PLACEHOLDER}/welcome (2).txt | | share_with | public room self-joined to | | share_with_displayname | Public room self-joined to | | token | A_TOKEN | @@ -794,7 +794,7 @@ Feature: get And user "participant1" shares "test" with room "group room invited to" with OCS 100 And user "participant1" shares "welcome.txt" with room "group room invited to" with OCS 100 And user "participant1" shares "test" with room "own one-to-one room" with OCS 100 - And user "participant2" shares "welcome (2).txt" with user "participant3" with OCS 100 + And user "participant2" shares "Talk/welcome.txt" with user "participant3" with OCS 100 And user "participant3" accepts last share And user "participant3" shares "welcome (2).txt" with room "one-to-one room not invited to" with OCS 100 And user "participant1" deletes file "welcome.txt" @@ -828,7 +828,7 @@ Feature: get And user "participant1" shares "welcome.txt" with room "group room invited to" with OCS 100 And user "participant1" shares "test2" with room "own one-to-one room" with OCS 100 And user "participant1" moves file "/welcome.txt" to "/test/renamed.txt" with 201 - And user "participant2" shares "subfolder" with user "participant3" with OCS 100 + And user "participant2" shares "Talk/subfolder" with user "participant3" with OCS 100 And user "participant3" accepts last share And user "participant3" shares "subfolder" with room "one-to-one room not invited to" with OCS 100 # Only direct children are taken into account @@ -845,6 +845,17 @@ Feature: get | share_with | own group room | | share_with_displayname | Own group room | And share 1 is returned with + | uid_owner | participant1 | + | displayname_owner | participant1-displayname | + | path | /test/subfolder | + | item_type | folder | + | mimetype | httpd/unix-directory | + | storage_id | home::participant1 | + | file_target | /{TALK_PLACEHOLDER}/subfolder | + | share_with | group room invited to | + | share_with_displayname | Group room invited to | + | permissions | 31 | + And share 2 is returned with | uid_owner | participant1 | | displayname_owner | participant1-displayname | | path | /test/renamed.txt | @@ -854,7 +865,7 @@ Feature: get | file_target | /{TALK_PLACEHOLDER}/welcome.txt | | share_with | group room invited to | | share_with_displayname | Group room invited to | - And share 2 is returned with + And share 3 is returned with | uid_file_owner | participant1 | | displayname_file_owner | participant1-displayname | | uid_owner | participant2 | @@ -868,17 +879,6 @@ Feature: get | share_with_displayname | participant3-displayname | | share_type | 0 | | permissions | 31 | - And share 3 is returned with - | uid_owner | participant1 | - | displayname_owner | participant1-displayname | - | path | /test/subfolder | - | item_type | folder | - | mimetype | httpd/unix-directory | - | storage_id | home::participant1 | - | file_target | /subfolder | - | share_with | group room invited to | - | share_with_displayname | Group room invited to | - | permissions | 31 | And share 4 is returned with | uid_file_owner | participant1 | | displayname_file_owner | participant1-displayname | @@ -889,7 +889,7 @@ Feature: get | item_type | folder | | mimetype | httpd/unix-directory | | storage_id | home::participant1 | - | file_target | /subfolder | + | file_target | /{TALK_PLACEHOLDER}/subfolder | | share_with | private_conversation | | share_with_displayname | Private conversation | | permissions | 31 | @@ -920,7 +920,7 @@ Feature: get And user "participant1" shares "welcome.txt" with room "group room invited to" with OCS 100 And user "participant1" shares "test2" with room "own one-to-one room" with OCS 100 And user "participant1" moves file "/welcome.txt" to "/test/renamed.txt" with 201 - And user "participant2" shares "subfolder" with user "participant3" with OCS 100 + And user "participant2" shares "Talk/subfolder" with user "participant3" with OCS 100 And user "participant3" accepts last share And user "participant3" shares "subfolder" with room "one-to-one room not invited to" with OCS 100 And user "participant1" deletes file "test" @@ -968,11 +968,11 @@ Feature: get And share 1 is returned with | uid_owner | participant3 | | displayname_owner | participant3-displayname | - | path | /test | + | path | /Talk/test | | item_type | folder | | mimetype | httpd/unix-directory | - | storage_id | shared::/test | - | file_target | /test | + | storage_id | shared::/Talk/test | + | file_target | /Talk/test | | share_with | group room invited to | | share_with_displayname | Group room invited to | | permissions | 31 | @@ -989,11 +989,11 @@ Feature: get And share 3 is returned with | uid_owner | participant3 | | displayname_owner | participant3-displayname | - | path | /test | + | path | /Talk/test | | item_type | folder | | mimetype | httpd/unix-directory | - | storage_id | shared::/test | - | file_target | /test | + | storage_id | shared::/Talk/test | + | file_target | /Talk/test | | share_with | own one-to-one room | | share_with_displayname | participant3-displayname | | permissions | 31 | @@ -1018,7 +1018,7 @@ Feature: get And user "participant3" shares "test" with room "group room invited to" with OCS 100 And user "participant2" shares "welcome.txt" with room "group room invited to" with OCS 100 And user "participant3" shares "test" with room "own one-to-one room" with OCS 100 - When user "participant1" gets all received shares for "/welcome (2).txt" + When user "participant1" gets all received shares for "/Talk/welcome.txt" Then the list of returned shares has 2 shares And share 0 is returned with | uid_owner | participant2 | @@ -1099,7 +1099,7 @@ Feature: get | item_type | file | | mimetype | text/plain | | storage_id | home::participant1 | - | file_target | /welcome (2).txt | + | file_target | /Talk/welcome.txt | | share_with | group room | | share_with_displayname | Group room | | permissions | 0 | @@ -1161,7 +1161,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 - And user "participant2" shares "welcome (2).txt" with user "participant3" with OCS 100 + And user "participant2" shares "Talk/welcome.txt" with user "participant3" with OCS 100 And user "participant3" accepts last share When user "participant1" gets the share-type DAV property for "/welcome.txt" Then the response contains a share-types DAV property with @@ -1191,9 +1191,9 @@ 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 - And user "participant2" shares "welcome (2).txt" with user "participant3" with OCS 100 + And user "participant2" shares "Talk/welcome.txt" with user "participant3" with OCS 100 And user "participant3" accepts last share - 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 | 0 | @@ -1300,6 +1300,7 @@ Feature: get When user "participant2" gets the DAV properties for "/" Then the list of returned files for "participant2" is | / | + | /Talk/ | | /welcome.txt | And user "participant1" gets the DAV properties for "/" And the list of returned files for "participant1" is diff --git a/tests/integration/features/sharing/hooks.feature b/tests/integration/features/sharing/hooks.feature index 43f44011a6..9949432982 100644 --- a/tests/integration/features/sharing/hooks.feature +++ b/tests/integration/features/sharing/hooks.feature @@ -174,7 +174,7 @@ Feature: hooks | item_type | folder | | mimetype | httpd/unix-directory | | storage_id | home::participant1 | - | file_target | /test | + | file_target | /{TALK_PLACEHOLDER}/test | | share_with | group room | | share_with_displayname | Group room | | permissions | 31 | @@ -187,7 +187,7 @@ Feature: hooks | roomName | room | And user "participant1" adds "participant2" to room "group room" with 200 And user "participant2" shares "welcome.txt" with room "group room" with OCS 100 - And user "participant1" shares "welcome (2).txt" with user "participant3" with OCS 100 + And user "participant1" shares "Talk/welcome.txt" with user "participant3" with OCS 100 And user "participant3" accepts last share When user "participant1" removes "participant2" from room "group room" with 200 Then user "participant1" gets last share @@ -216,11 +216,11 @@ Feature: hooks | displayname_owner | participant1-displayname | | uid_file_owner | participant2 | | displayname_file_owner | participant2-displayname | - | path | /Talk/welcome.txt | + | path | /welcome (2).txt | | item_type | file | | mimetype | text/plain | - | storage_id | shared::/Talk/welcome.txt | - | file_target | /Talk/welcome.txt | + | storage_id | shared::/welcome (2).txt | + | file_target | /welcome (2).txt | | share_with | participant3 | | share_with_displayname | participant3-displayname | | share_type | 0 | @@ -408,7 +408,7 @@ 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" shares "welcome (2).txt" with user "participant3" with OCS 100 + And user "participant2" shares "Talk/welcome.txt" with user "participant3" with OCS 100 And user "participant3" accepts last share When user "participant1" removes "participant2" from room "group room" with 200 Then user "participant1" gets last share @@ -435,11 +435,11 @@ Feature: hooks | displayname_owner | participant2-displayname | | uid_file_owner | participant1 | | displayname_file_owner | participant1-displayname | - | path | /Talk/welcome.txt | + | path | /welcome (2).txt | | item_type | file | | mimetype | text/plain | - | storage_id | shared::/Talk/welcome.txt | - | file_target | /Talk/welcome.txt | + | storage_id | shared::/welcome (2).txt | + | file_target | /welcome (2).txt | | share_with | participant3 | | share_with_displayname | participant3-displayname | | share_type | 0 | @@ -493,7 +493,7 @@ Feature: hooks | roomName | room | And user "participant1" adds "participant2" to room "group room" with 200 And user "participant2" shares "welcome.txt" with room "group room" with OCS 100 - And user "participant1" shares "welcome (2).txt" with user "participant3" with OCS 100 + And user "participant1" shares "Talk/welcome.txt" with user "participant3" with OCS 100 And user "participant3" accepts last share And user "participant1" removes "participant2" from room "group room" with 200 When user "participant1" adds "participant2" to room "group room" with 200 @@ -523,11 +523,11 @@ Feature: hooks | displayname_owner | participant1-displayname | | uid_file_owner | participant2 | | displayname_file_owner | participant2-displayname | - | path | /Talk/welcome.txt | + | path | /welcome (2).txt | | item_type | file | | mimetype | text/plain | - | storage_id | shared::/Talk/welcome.txt | - | file_target | /Talk/welcome.txt | + | storage_id | shared::/welcome (2).txt | + | file_target | /welcome (2).txt | | share_with | participant3 | | share_with_displayname | participant3-displayname | | share_type | 0 | @@ -679,7 +679,7 @@ 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" shares "welcome (2).txt" with user "participant3" with OCS 100 + And user "participant2" shares "Talk/welcome.txt" with user "participant3" with OCS 100 And user "participant3" accepts last share And user "participant1" removes "participant2" from room "group room" with 200 When user "participant1" adds "participant2" to room "group room" with 200 @@ -707,7 +707,7 @@ Feature: hooks | item_type | file | | mimetype | text/plain | | storage_id | shared::/Talk/welcome.txt | - | file_target | /Talk/welcome.txt | + | file_target | /welcome (2).txt | | share_with | participant3 | | share_with_displayname | participant3-displayname | | share_type | 0 | @@ -717,11 +717,11 @@ Feature: hooks | displayname_owner | participant2-displayname | | uid_file_owner | participant1 | | displayname_file_owner | participant1-displayname | - | path | /Talk/welcome.txt | + | path | /welcome (2).txt | | item_type | file | | mimetype | text/plain | - | storage_id | shared::/Talk/welcome.txt | - | file_target | /Talk/welcome.txt | + | storage_id | shared::/welcome (2).txt | + | file_target | /welcome (2).txt | | share_with | participant3 | | share_with_displayname | participant3-displayname | | share_type | 0 | @@ -788,7 +788,7 @@ 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" shares "welcome (2).txt" with user "participant3" with OCS 100 + And user "participant2" shares "Talk/welcome.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 @@ -804,11 +804,11 @@ Feature: hooks | displayname_owner | participant2-displayname | | uid_file_owner | participant1 | | displayname_file_owner | participant1-displayname | - | path | /Talk/welcome.txt | + | path | /welcome (2).txt | | item_type | file | | mimetype | text/plain | - | storage_id | shared::/Talk/welcome.txt | - | file_target | /Talk/welcome.txt | + | storage_id | shared::/welcome (2).txt | + | file_target | /welcome (2).txt | | share_with | participant3 | | share_with_displayname | participant3-displayname | | share_type | 0 | @@ -995,7 +995,7 @@ Feature: hooks And user "participant1" adds "participant2" to room "group room invited to" with 200 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" shares "welcome (2).txt" with user "participant4" with OCS 100 + And user "participant2" shares "Talk/welcome.txt" with user "participant4" with OCS 100 And user "participant4" accepts last share When user "participant2" is deleted Then user "participant1" gets last share @@ -1034,7 +1034,7 @@ Feature: hooks | item_type | file | | mimetype | text/plain | | storage_id | shared::/Talk/welcome.txt | - | file_target | /Talk/welcome.txt | + | file_target | /welcome (2).txt | | share_with | participant4 | | share_with_displayname | participant4-displayname | | share_type | 0 | @@ -1056,11 +1056,11 @@ Feature: hooks | displayname_owner | participant2 | | uid_file_owner | participant1 | | displayname_file_owner | participant1-displayname | - | path | /Talk/welcome.txt | + | path | /welcome (2).txt | | item_type | file | | mimetype | text/plain | - | storage_id | shared::/Talk/welcome.txt | - | file_target | /Talk/welcome.txt | + | storage_id | shared::/welcome (2).txt | + | file_target | /welcome (2).txt | | share_with | participant4 | | share_with_displayname | participant4-displayname | | share_type | 0 | diff --git a/tests/integration/features/sharing/transfer-ownership.feature b/tests/integration/features/sharing/transfer-ownership.feature index 92b1874a86..dccb8f819d 100644 --- a/tests/integration/features/sharing/transfer-ownership.feature +++ b/tests/integration/features/sharing/transfer-ownership.feature @@ -116,7 +116,7 @@ Feature: transfer-ownership | path | /Talk/welcome.txt | | item_type | file | | mimetype | text/plain | - | storage_id | shared::/welcome.txt | + | storage_id | shared::/Talk/welcome.txt | | file_target | /Talk/welcome.txt | | share_with | group room | | share_with_displayname | Group room |