addressed review

owncloud · Apr 27, 2022 · 34638a2 · 34638a2
1 parent e3e3d55
commit 34638a2
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 13 deletions.
diff --git a/...features/apiShareCreateSpecialToShares2/createShareDefaultFolderForReceivedShares.feature b/...features/apiShareCreateSpecialToShares2/createShareDefaultFolderForReceivedShares.feature
@@ -20,4 +20,4 @@ Feature: shares are received in the default folder for received shares
     Examples:
       | ocs_api_version | ocs_status_code | http_status_code   |
       | 1               | 100, 100, 404   | 200, 200, 204, 200 |
-      | 2               | 200, 200, 404   | 200, 200,204, 404  |
+      | 2               | 200, 200, 404   | 200, 200, 204, 404 |
diff --git a/.../acceptance/features/apiShareCreateSpecialToShares2/createShareGroupCaseSensitive.feature b/.../acceptance/features/apiShareCreateSpecialToShares2/createShareGroupCaseSensitive.feature
@@ -24,15 +24,25 @@ Feature: share with groups, group names are case-sensitive
     And user "Carol" has been added to group "<group_id2>"
     And user "David" has been added to group "<group_id3>"
     When user "Alice" shares file "textfile1.txt" with group "<group_id1>" using the sharing API
-    And user "Brian" accepts share "/textfile1.txt" offered by user "Alice" using the sharing API
-    Then the content of file "/Shares/textfile1.txt" for user "Brian" should be "ownCloud test text file 1"
+    Then the OCS status code should be "<ocs_status_code>"
+    And the HTTP status code should be "200"
+    When user "Brian" accepts share "/textfile1.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 the content of file "/Shares/textfile1.txt" for user "Brian" should be "ownCloud test text file 1"
     When user "Alice" shares file "textfile2.txt" with group "<group_id2>" using the sharing API
-    And user "Carol" accepts share "/textfile2.txt" offered by user "Alice" using the sharing API
-    Then the content of file "/Shares/textfile2.txt" for user "Carol" should be "ownCloud test text file 2"
+    Then the OCS status code should be "<ocs_status_code>"
+    And the HTTP status code should be "200"
+    When user "Carol" accepts share "/textfile2.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 the content of file "/Shares/textfile2.txt" for user "Carol" should be "ownCloud test text file 2"
     When user "Alice" shares file "textfile3.txt" with group "<group_id3>" using the sharing API
-    And user "David" accepts share "/textfile3.txt" offered by user "Alice" using the sharing API
-    Then the OCS status code of responses on all endpoints should be "<ocs_status_code>"
-    And the HTTP status code of responses on all endpoints should be "200"
+    Then the OCS status code should be "<ocs_status_code>"
+    And the HTTP status code should be "200"
+    When user "David" accepts share "/textfile3.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 the content of file "/Shares/textfile3.txt" for user "David" should be "ownCloud test text file 3"
     Examples:
       | ocs_api_version | group_id1            | group_id2            | group_id3            | ocs_status_code |
@@ -52,18 +62,24 @@ Feature: share with groups, group names are case-sensitive
     And group "<group_id1>" has been created
     And user "Brian" has been added to group "<group_id1>"
     When user "Alice" shares file "textfile1.txt" with group "<group_id1>" using the sharing API
-    And user "Brian" accepts share "/textfile1.txt" offered by user "Alice" using the sharing API
-    Then the fields of the last response to user "Alice" should include
+    Then the OCS status code should be "<ocs_status_code>"
+    And the HTTP status code should be "200"
+    When user "Brian" accepts share "/textfile1.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 the fields of the last response to user "Alice" should include
       | share_with  | <group_id1>           |
       | file_target | /Shares/textfile1.txt |
       | path        | /Shares/textfile1.txt |
       | permissions | share,read,update     |
       | uid_owner   | %username%            |
     And the content of file "/Shares/textfile1.txt" for user "Brian" should be "ownCloud test text file 1"
     When user "Alice" shares file "textfile2.txt" with group "<group_id2>" using the sharing API
-    And user "Alice" shares file "textfile3.txt" with group "<group_id3>" using the sharing API
-    Then the OCS status code of responses on each endpoint should be "<ocs_status_code>, <ocs_status_code>, 404, 404" respectively
-    And the HTTP status code of responses on each endpoint should be "200, 200, <http_status_code>, <http_status_code>" respectively
+    Then the OCS status code should be "404"
+    And the HTTP status code should be "<http_status_code>"
+    When user "Alice" shares file "textfile3.txt" with group "<group_id3>" using the sharing API
+    Then the OCS status code should be "404"
+    And the HTTP status code should be "<http_status_code>"
     Examples:
       | ocs_api_version | group_id1            | group_id2            | group_id3            | ocs_status_code | http_status_code |
       | 1               | case-sensitive-group | Case-Sensitive-Group | CASE-SENSITIVE-GROUP | 100             | 200              |