From e1c28c403def67a0f0bd08b741f642d253cfd62b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Calvi=C3=B1o=20S=C3=A1nchez?= Date: Thu, 28 Jun 2018 16:36:19 +0200 Subject: [PATCH] Fix filenames in sharing integration tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When a file is shared and the receiver of the share already has a file with the same name that file is left untouched, and "(2)" is appended to the name of the shared file. As "textfile0.txt" is included in the user folder skeleton all the users in the integration test have that file, so when it is shared the receiver sees the share as "/textfile0 (2).txt", and her own file as "/textfile0.txt". Signed-off-by: Daniel Calviño Sánchez --- build/integration/features/sharing-v1-part2.feature | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/integration/features/sharing-v1-part2.feature b/build/integration/features/sharing-v1-part2.feature index 99cc5a8b98..2bf1d3fb40 100644 --- a/build/integration/features/sharing-v1-part2.feature +++ b/build/integration/features/sharing-v1-part2.feature @@ -69,7 +69,7 @@ Feature: sharing And group "group1" exists And user "user1" belongs to group "group1" And file "textfile0.txt" of user "user0" is shared with group "group1" - And User "user1" moved file "/textfile0.txt" to "/FOLDER/textfile0.txt" + And User "user1" moved file "/textfile0 (2).txt" to "/FOLDER/textfile0.txt" And As an "user0" When Updating last share with | permissions | 1 | @@ -240,7 +240,7 @@ Feature: sharing And User "user1" moved file "/textfile0.txt" to "/common/textfile0.txt" And User "user1" moved file "/common/textfile0.txt" to "/common/sub/textfile0.txt" And As an "user2" - When Downloading file "/textfile0.txt" with range "bytes=10-18" + When Downloading file "/textfile0 (2).txt" with range "bytes=10-18" Then Downloaded content should be "test text" And user "user2" should see following elements | /common/sub/textfile0.txt | @@ -252,7 +252,7 @@ Feature: sharing And group "group1" exists And user "user1" belongs to group "group1" And file "textfile0.txt" of user "user0" is shared with group "group1" - And User "user1" moved file "/textfile0.txt" to "/FOLDER/textfile0.txt" + And User "user1" moved file "/textfile0 (2).txt" to "/FOLDER/textfile0.txt" And As an "user0" And Deleting last share And As an "user1"