Skip to content

Commit

Permalink
Merge pull request #33410 from owncloud/stable10-remove-skip-on-fixed…
Browse files Browse the repository at this point in the history
…Issues

[stable10] remove skip on fixed issues
  • Loading branch information
individual-it authored Nov 5, 2018
2 parents c3300cb + 1374ef4 commit f4f25e1
Show file tree
Hide file tree
Showing 19 changed files with 85 additions and 68 deletions.
5 changes: 3 additions & 2 deletions tests/acceptance/features/apiProvisioning-v2/addGroup.feature
Original file line number Diff line number Diff line change
Expand Up @@ -75,12 +75,13 @@ Feature: add groups
And the HTTP status code should be "400"
And group "new-group" should exist

@skip @issue-31276
@issue-31276
Scenario: normal user tries to create a group
Given user "brand-new-user" has been created
When user "brand-new-user" sends HTTP method "POST" to OCS API endpoint "/cloud/groups" with body
| groupid | new-group |
Then the OCS status code should be "401"
Then the OCS status code should be "997"
#And the OCS status code should be "401"
And the HTTP status code should be "401"
And group "new-group" should not exist

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,13 @@ Feature: add users to group
| var/../etc | using slash-dot-dot |
| priv/subadmins/1 | Subadmins mentioned not at the end |

@skip @issue-31276
@issue-31276
Scenario: normal user tries to add himself to a group
Given user "brand-new-user" has been created
When user "brand-new-user" sends HTTP method "POST" to OCS API endpoint "/cloud/users/brand-new-user/groups" with body
| groupid | new-group |
Then the OCS status code should be "401"
Then the OCS status code should be "997"
#And the OCS status code should be "401"
And the HTTP status code should be "401"
And the API should not return any data

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ Feature: create a subadmin
Then the OCS status code should be "400"
And the HTTP status code should be "400"

@skip @issue-31276
@issue-31276
Scenario: subadmin of a group tries to make another user subadmin of their group
Given user "subadmin" has been created
And user "brand-new-user" has been created
Expand All @@ -44,7 +44,8 @@ Feature: create a subadmin
| groupid | new-group |
When user "subadmin" sends HTTP method "POST" to OCS API endpoint "/cloud/users/brand-new-user/subadmins" with body
| groupid | new-group |
Then the OCS status code should be "401"
Then the OCS status code should be "997"
#And the OCS status code should be "401"
And the HTTP status code should be "401"
And the user "not-user" should not be the subadmin of the group "new-group"

10 changes: 6 additions & 4 deletions tests/acceptance/features/apiProvisioning-v2/deleteGroup.feature
Original file line number Diff line number Diff line change
Expand Up @@ -59,22 +59,24 @@ Feature: delete groups
| var/../etc | using slash-dot-dot |
| priv/subadmins/1 | Subadmins mentioned not at the end |

@skip @issue-31276
@issue-31276
Scenario: normal user tries to delete the group
Given user "brand-new-user" has been created
And group "new-group" has been created
And user "brand-new-user" has been added to group "new-group"
When user "brand-new-user" sends HTTP method "DELETE" to OCS API endpoint "/cloud/groups/new-group"
Then the OCS status code should be "401"
Then the OCS status code should be "997"
#And the OCS status code should be "401"
And the HTTP status code should be "401"
And group "new-group" should exist

@skip @issue-31276
@issue-31276
Scenario: subadmin of the group tries to delete the group
Given user "subadmin" has been created
And group "new-group" has been created
And user "subadmin" has been made a subadmin of group "new-group"
When user "subamin" sends HTTP method "DELETE" to OCS API endpoint "/cloud/groups/new-group"
Then the OCS status code should be "401"
Then the OCS status code should be "997"
#And the OCS status code should be "401"
And the HTTP status code should be "401"
And group "new-group" should exist
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,12 @@ Feature: delete users
And the HTTP status code should be "200"
And user "brand-new-user" should not exist

@skip @issue-31276
@issue-31276
Scenario: normal user tries to delete a user
Given user "user1" has been created
And user "user2" has been created
When user "user1" sends HTTP method "DELETE" to OCS API endpoint "/cloud/users/user2"
Then the OCS status code should be "401"
Then the OCS status code should be "997"
#And the OCS status code should be "401"
And the HTTP status code should be "401"
And user "user2" should exist
Original file line number Diff line number Diff line change
Expand Up @@ -15,22 +15,24 @@ Feature: disable an app
And the HTTP status code should be "200"
And app "comments" should be disabled

@skip @issue-31276
@issue-31276
Scenario: subadmin tries to disable an app
Given user "subadmin" has been created
And group "newgroup" has been created
And user "subadmin" has been made a subadmin of group "newgroup"
And the app "comments" has been enabled
When user "subadmin" disables the app "comments"
Then the OCS status code should be "997"
#And the OCS status code should be "401"
And the HTTP status code should be "401"
And app "comments" should be enabled

@skip @issue-31276
@issue-31276
Scenario: normal user tries to disable an app
Given user "newuser" has been created
And the app "comments" has been enabled
When user "newuser" disables the app "comments"
Then the OCS status code should be "997"
#And the OCS status code should be "401"
And the HTTP status code should be "401"
And app "comments" should be enabled
15 changes: 9 additions & 6 deletions tests/acceptance/features/apiProvisioning-v2/disableUser.feature
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ Feature: disable user
And the HTTP status code should be "200"
And user "user1" should be disabled

@skip @issue-31276
@issue-31276
Scenario: Subadmin should not be able to disable an user not in their group
Given user "subadmin" has been created
And user "user1" has been created
Expand All @@ -38,11 +38,12 @@ Feature: disable user
And user "user1" has been added to group "another-group"
And user "subadmin" has been made a subadmin of group "new-group"
When user "subadmin" sends HTTP method "PUT" to OCS API endpoint "/cloud/users/user1/disable"
Then the OCS status code should be "401"
Then the OCS status code should be "997"
#And the OCS status code should be "401"
And the HTTP status code should be "401"
And user "user1" should be enabled

@skip @issue-31276
@issue-31276
Scenario: Subadmins should not be able to disable users that have admin permissions in their group
Given user "another-admin" has been created
And user "subadmin" has been created
Expand All @@ -52,7 +53,8 @@ Feature: disable user
And user "another-admin" has been added to group "new-group"
And user "subadmin" has been made a subadmin of group "new-group"
When user "subadmin" sends HTTP method "PUT" to OCS API endpoint "/cloud/users/another-admin/disable"
Then the OCS status code should be "401"
Then the OCS status code should be "997"
#And the OCS status code should be "401"
And the HTTP status code should be "401"
And user "another-admin" should be enabled

Expand Down Expand Up @@ -83,12 +85,13 @@ Feature: disable user
And the HTTP status code should be "400"
And user "another-admin" should be enabled

@skip @issue-31276
@issue-31276
Scenario: disable an user with a regular user
Given user "user1" has been created
And user "user2" has been created
When user "user1" sends HTTP method "PUT" to OCS API endpoint "/cloud/users/user2/disable"
Then the OCS status code should be "401"
Then the OCS status code should be "997"
#And the OCS status code should be "401"
And the HTTP status code should be "401"
And user "user2" should be enabled

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,22 +15,24 @@ Feature: enable an app
And the HTTP status code should be "200"
And app "comments" should be enabled

@skip @issue-31276
@issue-31276
Scenario: subadmin tries to enable an app
Given user "subadmin" has been created
And group "newgroup" has been created
And user "subadmin" has been made a subadmin of group "newgroup"
And the app "comments" has been disabled
When user "subadmin" enables the app "comments"
Then the OCS status code should be "997"
#And the OCS status code should be "401"
And the HTTP status code should be "401"
And app "comments" should be disabled

@skip @issue-31276
@issue-31276
Scenario: normal user tries to enable an app
Given user "newuser" has been created
And the app "comments" has been disabled
When user "newuser" enables the app "comments"
Then the OCS status code should be "997"
#And the OCS status code should be "401"
And the HTTP status code should be "401"
And app "comments" should be disabled
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,14 @@ Feature: enable user
When user "another-admin" sends HTTP method "PUT" to OCS API endpoint "/cloud/users/another-admin/enable"
Then user "another-admin" should be disabled

@skip @issue-31276
@issue-31276
Scenario: normal user tries to enable other user
Given user "user1" has been created
And user "user2" has been created
And user "user2" has been disabled
When user "user1" sends HTTP method "PUT" to OCS API endpoint "/cloud/users/user2/enable"
Then the OCS status code should be "401"
Then the OCS status code should be "997"
#And the OCS status code should be "401"
And the HTTP status code should be "401"
And user "user2" should be disabled

Expand Down
10 changes: 6 additions & 4 deletions tests/acceptance/features/apiProvisioning-v2/getGroup.feature
Original file line number Diff line number Diff line change
Expand Up @@ -44,20 +44,22 @@ Feature: get group
| user1 |
| user2 |

@skip @issue-31276
@issue-31276
Scenario: subadmin tries to get users in a group he is not responsible for
Given user "subadmin" has been created
And group "new-group" has been created
And group "another-group" has been created
And user "subadmin" has been made a subadmin of group "new-group"
When user "subadmin" sends HTTP method "GET" to OCS API endpoint "/cloud/groups/another-group"
Then the OCS status code should be "401"
Then the OCS status code should be "997"
#And the OCS status code should be "401"
And the HTTP status code should be "401"

@skip @issue-31276
@issue-31276
Scenario: normal user tries to get users in his group
Given user "newuser" has been created
And group "new-group" has been created
When user "newuser" sends HTTP method "GET" to OCS API endpoint "/cloud/groups/new-group"
Then the OCS status code should be "401"
Then the OCS status code should be "997"
#And the OCS status code should be "401"
And the HTTP status code should be "401"
Original file line number Diff line number Diff line change
Expand Up @@ -26,25 +26,27 @@ Feature: get subadmins
And the HTTP status code should be "400"
And the API should not return any data

@skip @issue-31276
@issue-31276
Scenario: subadmin tries to get other subadmins of the same group
Given user "subadmin" has been created
And user "newsubadmin" has been created
And group "new-group" has been created
And user "subadmin" has been made a subadmin of group "new-group"
And user "newsubadmin" has been made a subadmin of group "new-group"
When user "subadmin" sends HTTP method "GET" to OCS API endpoint "/cloud/groups/new-group/subadmins"
Then the OCS status code should be "401"
Then the OCS status code should be "997"
#And the OCS status code should be "401"
And the HTTP status code should be "401"
And the API should not return any data

@skip @issue-31276
@issue-31276
Scenario: normal user tries to get the subadmins of the group
Given user "newuser" has been created
And user "subadmin" has been created
And group "new-group" has been created
And user "subadmin" has been made a subadmin of group "new-group"
When user "newuser" sends HTTP method "GET" to OCS API endpoint "/cloud/groups/new-group/subadmins"
Then the OCS status code should be "401"
Then the OCS status code should be "997"
#And the OCS status code should be "401"
And the HTTP status code should be "401"
And the API should not return any data
Original file line number Diff line number Diff line change
Expand Up @@ -80,13 +80,14 @@ Feature: get user groups
And the OCS status code should be "200"
And the HTTP status code should be "200"

@skip @issue-31276
@issue-31276
Scenario: normal user tries to get the groups of another user
Given user "newuser" has been created
And user "anotheruser" has been created
And group "newgroup" has been created
And user "newuser" has been added to group "newgroup"
When user "anotheruser" sends HTTP method "GET" to OCS API endpoint "/cloud/users/newuser/groups"
Then the OCS status code should be "401"
Then the OCS status code should be "997"
#And the OCS status code should be "401"
And the HTTP status code should be "401"
And the API should not return any data
5 changes: 3 additions & 2 deletions tests/acceptance/features/apiProvisioning-v2/getUsers.feature
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,12 @@ Feature: get users
And the OCS status code should be "200"
And the HTTP status code should be "200"

@skip @issue-31276
@issue-31276
Scenario: normal user tries to get other users
Given user "normaluser" has been created
And user "newuser" has been created
When user "normaluser" sends HTTP method "GET" to OCS API endpoint "/cloud/users"
And the OCS status code should be "401"
Then the OCS status code should be "997"
#And the OCS status code should be "401"
And the HTTP status code should be "401"
And the API should not return any data
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ Feature: remove a user from a group
And the HTTP status code should be "403"
And user "brand-new-user" should belong to group "new-group"

@skip @issue-31276
@issue-31276
Scenario: normal user tries to remove the user in his group
Given user "newuser" has been created
And user "anotheruser" has been created
Expand All @@ -112,6 +112,7 @@ Feature: remove a user from a group
And user "anotheruser" has been added to group "new-group"
When user "newuser" sends HTTP method "DELETE" to OCS API endpoint "/cloud/users/anotheruser/groups" with body
| groupid | new-group |
Then the OCS status code should be "401"
Then the OCS status code should be "997"
#And the OCS status code should be "401"
And the HTTP status code should be "401"
And user "anotheruser" should belong to group "new-group"
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Feature: remove subadmin
And the HTTP status code should be "200"
And the user "brand-new-user" should not be the subadmin of the group "new-group"

@skip @issue-31276
@issue-31276
Scenario: subadmin tries to remove other subadmin in the group
Given user "subadmin" has been created
And group "new-group" has been created
Expand All @@ -27,11 +27,12 @@ Feature: remove subadmin
And user "newsubadmin" has been made a subadmin of group "new-group"
When user "subadmin" sends HTTP method "DELETE" to OCS API endpoint "/cloud/users/newsubadmin/subadmins" with body
| groupid | new-group |
Then the OCS status code should be "401"
Then the OCS status code should be "997"
#And the OCS status code should be "401"
And the HTTP status code should be "401"
And the user "newsubadmin" should be the subadmin of the group "new-group"

@skip @issue-31276
@issue-31276
Scenario: normal user tries to remove subadmin in the group
Given user "subadmin" has been created
And user "newuser" has been created
Expand All @@ -41,5 +42,6 @@ Feature: remove subadmin
When user "newuser" sends HTTP method "DELETE" to OCS API endpoint "/cloud/users/subadmin/subadmins" with body
| groupid | new-group |
Then the OCS status code should be "997"
#And the OCS status code should be "401"
And the HTTP status code should be "401"
And the user "subadmin" should be the subadmin of the group "new-group"
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ Feature: sharing
| ocs_api_version | ocs_status_code |
| 1 | 997 |

@skip @issue-32068
@issue-32068
Scenario: Creating a new share with a disabled user
Given using OCS API version "2"
And user "user1" has been created
Expand All @@ -152,7 +152,8 @@ Feature: sharing
| path | welcome.txt |
| shareWith | user1 |
| shareType | 0 |
Then the OCS status code should be "401"
Then the OCS status code should be "997"
#And the OCS status code should be "401"
And the HTTP status code should be "401"

@public_link_share-feature-required
Expand Down
Loading

0 comments on commit f4f25e1

Please sign in to comment.