Improve tests

Author: Vincent Petry

tests/integration/features/webdav-related-new-endpoint.feature

@@ -544,7 +544,6 @@ Feature: webdav-related-new-endpoint
 		When user "user0" moves new chunk file with id "chunking-42" to "/existingFile.txt"
 		Then User "user0" checks id of file "/existingFile.txt"
 
-
 	Scenario: Checking file id after a move between received shares
 		Given using new dav path
 		And user "user0" exists
@@ -554,22 +553,14 @@ Feature: webdav-related-new-endpoint
 		And folder "/folderA" of user "user0" is shared with user "user1"
 		And folder "/folderB" of user "user0" is shared with user "user1"
 		And user "user1" created a folder "/folderA/ONE"
-		And user "user1" created a folder "/folderA/ONE/TWO"
 		And User "user1" stores id of file "/folderA/ONE"
-		And User "user1" moves folder "/folderA/ONE" to "/folderB"
-		When user "user1" created a folder "/folderB/ONE/TWO/THREE"
-		And using old dav path
-		Then user "user1" should see following elements
-			| /FOLDER/ |
-			| /PARENT/ |
-			| /PARENT/parent.txt |
-			| /textfile0.txt |
-			| /textfile1.txt |
-			| /textfile2.txt |
-			| /textfile3.txt |
-			| /textfile4.txt |
-			| /folderA |
-			| /folderB |
-			| /folderB/ONE |
-			| /folderB/ONE/TWO |
-			| /folderB/ONE/TWO/THREE |
+		And user "user1" created a folder "/folderA/ONE/TWO"
+		When User "user1" moves folder "/folderA/ONE" to "/folderB/ONE"
+		Then as "user1" the folder "/folderA" exists
+		And as "user1" the folder "/folderA/ONE" does not exist
+		# yes, a weird bug used to make this one fail
+		And as "user1" the folder "/folderA/ONE/TWO" does not exist
+		And as "user1" the folder "/folderB/ONE" exists
+		And as "user1" the folder "/folderB/ONE/TWO" exists
+		And User "user1" checks id of file "/folderB/ONE"
+

tests/integration/features/webdav-related-old-endpoint.feature

@@ -486,3 +486,24 @@ Feature: webdav-related-old-endpoint
 		When As an "user0"
 		And Downloading file "/myChunkedFile.txt"
 		Then Downloaded content should be "AAAAABBBBBCCCCC"
+
+	Scenario: Checking file id after a move between received shares
+		Given using old dav path
+		And user "user0" exists
+		And user "user1" exists
+		And user "user0" created a folder "/folderA"
+		And user "user0" created a folder "/folderB"
+		And folder "/folderA" of user "user0" is shared with user "user1"
+		And folder "/folderB" of user "user0" is shared with user "user1"
+		And user "user1" created a folder "/folderA/ONE"
+		And User "user1" stores id of file "/folderA/ONE"
+		And user "user1" created a folder "/folderA/ONE/TWO"
+		When User "user1" moves folder "/folderA/ONE" to "/folderB/ONE"
+		Then as "user1" the folder "/folderA" exists
+		And as "user1" the folder "/folderA/ONE" does not exist
+		# yes, a weird bug used to make this one fail
+		And as "user1" the folder "/folderA/ONE/TWO" does not exist
+		And as "user1" the folder "/folderB/ONE" exists
+		And as "user1" the folder "/folderB/ONE/TWO" exists
+		And User "user1" checks id of file "/folderB/ONE"
+