Merge pull request #39963 from owncloud/improveThenStepInApiShareResh…

…areToShare2 [tests-only][full-ci] Improve Then step in apiShareReshareToShares2 suite
owncloud · Apr 11, 2022 · b070a9e · b070a9e
2 parents b31266f + cbb64a4
commit b070a9e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/tests/acceptance/features/apiShareReshareToShares2/reShareChain.feature b/tests/acceptance/features/apiShareReshareToShares2/reShareChain.feature
@@ -22,7 +22,8 @@ Feature: resharing can be done on a reshared resource
     And user "Carol" has shared file "/Shares/textfile0_shared.txt" with user "David"
     And user "David" has accepted share "<pending_share_path>" offered by user "Carol"
     When user "Brian" deletes file "/textfile0_shared.txt" using the WebDAV API
-    Then the content of file "/Shares/textfile0_shared.txt" for user "Carol" should be "ownCloud test text file 0"
+    Then the HTTP status code should be "204"
+    And the content of file "/Shares/textfile0_shared.txt" for user "Carol" should be "ownCloud test text file 0"
     And the content of file "/Shares/textfile0_shared.txt" for user "David" should be "ownCloud test text file 0"
     @skipOnOcV10.6 @skipOnOcV10.7 @skipOnOcV10.8.0
     Examples:
@@ -47,5 +48,6 @@ Feature: resharing can be done on a reshared resource
     And user "Carol" has shared file "/Shares/textfile0.txt" with user "David"
     And user "David" has accepted share "/textfile0.txt" offered by user "Carol"
     When user "Brian" deletes file "/Shares/textfile0.txt" using the WebDAV API
-    Then the content of file "/Shares/textfile0.txt" for user "Carol" should be "ownCloud test text file 0"
+    Then the HTTP status code should be "204"
+    And the content of file "/Shares/textfile0.txt" for user "Carol" should be "ownCloud test text file 0"
     And the content of file "/Shares/textfile0.txt" for user "David" should be "ownCloud test text file 0"
diff --git a/tests/acceptance/features/apiShareReshareToShares2/reShareDisabled.feature b/tests/acceptance/features/apiShareReshareToShares2/reShareDisabled.feature
@@ -33,9 +33,7 @@ Feature: resharing can be disabled
     When user "Alice" shares file "/textfile0.txt" with user "Brian" with permissions "share,update,read" using the sharing API
     Then the OCS status code should be "<ocs_status_code>"
     And the HTTP status code should be "200"
-    When user "Brian" accepts share "/textfile0.txt" offered by user "Alice" using the sharing API
-    Then the OCS status code should be "<ocs_status_code>"
-    And the HTTP status code should be "200"
+    And user "Brian" should be able to accept pending share "/textfile0.txt" offered by user "Alice"
     And as "Brian" file "/Shares/textfile0.txt" should exist
     Examples:
       | ocs_api_version | ocs_status_code |

diff --git a/tests/acceptance/features/apiShareReshareToShares2/reShareSubfolder.feature b/tests/acceptance/features/apiShareReshareToShares2/reShareSubfolder.feature
@@ -20,9 +20,7 @@ Feature: a subfolder of a received share can be reshared
     When user "Brian" shares folder "/Shares/TMP/SUB" with user "Carol" with permissions "share,read" using the sharing API
     Then the OCS status code should be "<ocs_status_code>"
     And the HTTP status code should be "200"
-    When user "Carol" accepts share "<pending_sub_share_path>" offered by user "Brian" using the sharing API
-    Then the OCS status code should be "<ocs_status_code>"
-    And the HTTP status code should be "200"
+    And user "Carol" should be able to accept pending share "<pending_sub_share_path>" offered by user "Brian"
     And as "Carol" folder "/Shares/SUB" should exist
     And as "Brian" folder "/Shares/TMP/SUB" should exist
     @skipOnOcV10.6 @skipOnOcV10.7 @skipOnOcV10.8.0