Update test syntax

owncloud · Jan 17, 2019 · d104b81 · d104b81
1 parent 6cff3fe
commit d104b81
Showing 1 changed file with 7 additions and 13 deletions.
diff --git a/tests/acceptance/features/webUISharingExternal/federationSharing.feature b/tests/acceptance/features/webUISharingExternal/federationSharing.feature
@@ -190,11 +190,9 @@ Feature: Federation Sharing - sharing with users on other cloud storages
       | username |
       | user2 |
     When the user shares folder "simple-folder" with remote user "user1@%remote_server_without_scheme%" using the webUI
-    And using server "REMOTE"
     And user "user1" re-logs in to "%remote_server%" using the webUI
     And the user accepts the offered remote shares using the webUI
-    And user "user1" from server "REMOTE" has shared "/simple-folder (2)" with user "user2" from server "LOCAL"
-    And using server "LOCAL"
+    And user "user1" from server "REMOTE" shares "/simple-folder (2)" with user "user2" from server "LOCAL" using the sharing API
     And user "user2" re-logs in to "%local_server%" using the webUI
     And the user accepts the offered remote shares using the webUI
     Then as "user2" folder "/simple-folder (2)" should exist
@@ -206,31 +204,27 @@ Feature: Federation Sharing - sharing with users on other cloud storages
       | username |
       | user2 |
     When the user shares folder "simple-folder" with remote user "user1@%remote_server_without_scheme%" using the webUI
-    And using server "REMOTE"
     And user "user1" re-logs in to "%remote_server%" using the webUI
     And the user accepts the offered remote shares using the webUI
-    And user "user1" from server "REMOTE" has shared "/simple-folder (2)" with user "user2" from server "LOCAL"
+    And user "user1" from server "REMOTE" shares "/simple-folder (2)" with user "user2" from server "LOCAL" using the sharing API
     And the user sets the sharing permissions of "user2@%local_server%/ (federated)" for "simple-folder (2)" using the webUI to
       | edit | no |
-    And using server "LOCAL"
     And user "user2" re-logs in to "%local_server%" using the webUI
     And the user accepts the offered remote shares using the webUI
     Then as "user2" folder "/simple-folder (2)" should exist
     And as "user2" file "/simple-folder (2)/lorem.txt" should exist
-    And the user opens folder "simple-folder (2)" using the webUI
-    And it should not be possible to delete file "lorem.txt" using the webUI
+    When the user opens folder "simple-folder (2)" using the webUI
+    Then it should not be possible to delete file "lorem.txt" using the webUI
 
   Scenario: test resharing folder and set it as readonly by owner
     Given using server "LOCAL"
     And these users have been created:
       | username |
       | user2 |
     When the user shares folder "simple-folder" with remote user "user1@%remote_server_without_scheme%" using the webUI
-    And using server "REMOTE"
     And user "user1" re-logs in to "%remote_server%" using the webUI
     And the user accepts the offered remote shares using the webUI
-    And user "user1" from server "REMOTE" has shared "/simple-folder (2)" with user "user2" from server "LOCAL"
-    And using server "LOCAL"
+    And user "user1" from server "REMOTE" shares "/simple-folder (2)" with user "user2" from server "LOCAL" using the sharing API
     And user "user1" re-logs in to "%local_server%" using the webUI
     And the user opens the share dialog for folder "simple-folder"
     And the user sets the sharing permissions of "user2@%local_server% (federated)" for "simple-folder" using the webUI to
@@ -239,8 +233,8 @@ Feature: Federation Sharing - sharing with users on other cloud storages
     And the user accepts the offered remote shares using the webUI
     Then as "user2" folder "/simple-folder (2)" should exist
     And as "user2" file "/simple-folder (2)/lorem.txt" should exist
-    And the user opens folder "simple-folder (2)" using the webUI
-    And it should not be possible to delete file "lorem.txt" using the webUI
+    When the user opens folder "simple-folder (2)" using the webUI
+    Then it should not be possible to delete file "lorem.txt" using the webUI
 
   @skip @issue-32732
   Scenario: test sharing long file names with federation share