Given steps changed to when

owncloud · Mar 6, 2020 · 3738e09 · 3738e09
1 parent d3647f1
commit 3738e09
Showing 1 changed file with 13 additions and 12 deletions.
diff --git a/tests/acceptance/features/apiFederation/federated.feature b/tests/acceptance/features/apiFederation/federated.feature
@@ -593,9 +593,9 @@ Feature: federated
     And user "user0" has uploaded file with content "thisContentShouldBeChanged" to "/PARENT/RandomFolder/file-to-share"
     And user "user0" from server "REMOTE" has shared "/PARENT/RandomFolder/file-to-share" with user "user1" from server "LOCAL"
     And user "user1" from server "LOCAL" has accepted the last pending share
-    And user "user0" has uploaded file with content "thisContentIsFinal" to "/PARENT/RandomFolder/file-to-share"
     And using OCS API version "<ocs-api-version>"
-    When using server "LOCAL"
+    When user "user0" uploads file with content "thisContentIsFinal" to "/PARENT/RandomFolder/file-to-share" using the WebDAV API
+    And using server "LOCAL"
     Then the content of file "/file-to-share" for user "user1" should be "thisContentIsFinal"
     Examples:
       | ocs-api-version |
@@ -608,10 +608,10 @@ Feature: federated
     And user "user0" has uploaded file with content "thisContentShouldBeVisible" to "/PARENT/RandomFolder/file-to-share"
     And user "user0" from server "REMOTE" has shared "/PARENT/RandomFolder" with user "user1" from server "LOCAL"
     And user "user1" from server "LOCAL" has accepted the last pending share
-    And user "user0" has uploaded file with content "thisContentIsFinal" to "/PARENT/RandomFolder/new-file"
-    And user "user0" has created folder "/PARENT/RandomFolder/sub-folder"
     And using OCS API version "<ocs-api-version>"
-    When using server "LOCAL"
+    When user "user0" uploads file with content "thisContentIsFinal" to "/PARENT/RandomFolder/new-file" using the WebDAV API
+    And user "user0" creates folder "/PARENT/RandomFolder/sub-folder" using the WebDAV API
+    And using server "LOCAL"
     Then as "user1" file "/RandomFolder/new-file" should exist
     And as "user1" file "/RandomFolder/file-to-share" should exist
     And as "user1" folder "/RandomFolder/sub-folder" should exist
@@ -628,12 +628,13 @@ Feature: federated
     And user "user0" has uploaded file with content "thisContentShouldBeVisible" to "/PARENT/RandomFolder/file-to-share"
     And user "user0" from server "REMOTE" has shared "/PARENT/RandomFolder" with user "user1" from server "LOCAL"
     And user "user1" from server "LOCAL" has accepted the last pending share
-    And user "user0" has deleted folder "/PARENT/RandomFolder/sub-folder"
-    And user "user0" has deleted file "/PARENT/RandomFolder/file-to-share"
     And using OCS API version "<ocs-api-version>"
-    When using server "LOCAL"
+    When user "user0" deletes folder "/PARENT/RandomFolder/sub-folder" using the WebDAV API
+    And user "user0" deletes file "/PARENT/RandomFolder/file-to-share" using the WebDAV API
+    And using server "LOCAL"
     Then as "user1" file "/RandomFolder/file-to-share" should not exist
     And as "user1" folder "/RandomFolder/sub-folder" should not exist
+    But as "user1" folder "/RandomFolder" should exist
     Examples:
       | ocs-api-version |
       | 1               |
@@ -646,13 +647,13 @@ Feature: federated
     And user "user0" has uploaded file with content "thisContentShouldBeVisible" to "/PARENT/RandomFolder/file-to-share"
     And user "user0" from server "REMOTE" has shared "/PARENT/RandomFolder" with user "user1" from server "LOCAL"
     And user "user1" from server "LOCAL" has accepted the last pending share
-    And user "user0" has moved folder "/PARENT/RandomFolder/sub-folder" to "/PARENT/RandomFolder/renamed-sub-folder"
-    And user "user0" has moved file "/PARENT/RandomFolder/file-to-share" to "/PARENT/RandomFolder/renamedFile"
     And using OCS API version "<ocs-api-version>"
-    When using server "LOCAL"
+    When user "user0" moves folder "/PARENT/RandomFolder/sub-folder" to "/PARENT/RandomFolder/renamed-sub-folder" using the WebDAV API
+    And user "user0" moves file "/PARENT/RandomFolder/file-to-share" to "/PARENT/RandomFolder/renamedFile" using the WebDAV API
+    And using server "LOCAL"
     Then as "user1" file "/RandomFolder/file-to-share" should not exist
     But as "user1" file "/RandomFolder/renamedFile" should exist
-    And the content of file "/RandomFolder/renamedFile" should be "thisContentShouldBeVisible"
+    And the content of file "/RandomFolder/renamedFile" for user "user1" should be "thisContentShouldBeVisible"
     And as "user1" folder "/RandomFolder/sub-folder" should not exist
     But as "user1" folder "/RandomFolder/renamed-sub-folder" should exist
     Examples: