Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[tests-only][full-ci] shift existing settings api test scenarios to apiSettings test suite #10841

Merged
merged 1 commit into from
Jan 15, 2025
Merged

[tests-only][full-ci] shift existing settings api test scenarios to apiSettings test suite #10841

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions tests/acceptance/config/behat.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,6 +361,7 @@ default:
- SettingsContext:
- SharingNgContext:
- NotificationContext:
- OcisConfigContext:

apiSharingNgShareInvitation:
paths:
Expand Down
8 changes: 3 additions & 5 deletions tests/acceptance/expected-failures-localAPI-on-OCIS-storage.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,9 @@ The expected failures in this file are from features in the owncloud/ocis repo.

#### [Settings service user can list other peoples assignments](https://github.com/owncloud/ocis/issues/5032)

- [apiAccountsHashDifficulty/assignRole.feature:27](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiAccountsHashDifficulty/assignRole.feature#L27)
- [apiAccountsHashDifficulty/assignRole.feature:28](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiAccountsHashDifficulty/assignRole.feature#L28)
- [apiGraph/getAssignedRole.feature:31](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiGraph/getAssignedRole.feature#L31)
- [apiGraph/getAssignedRole.feature:32](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiGraph/getAssignedRole.feature#L32)
- [apiGraph/getAssignedRole.feature:33](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiGraph/getAssignedRole.feature#L33)
- [apiSettings/settings.feature:116](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiSettings/settings.feature#L116)
- [apiSettings/settings.feature:117](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiSettings/settings.feature#L117)
- [apiSettings/settings.feature:118](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiSettings/settings.feature#L118)

#### [A User can get information of another user with Graph API](https://github.com/owncloud/ocis/issues/5125)

Expand Down
34 changes: 17 additions & 17 deletions tests/acceptance/features/apiAccountsHashDifficulty/assignRole.feature
View file
Open in desktop
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please keep this feature file but change tests to use graph

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This suite is a special one.

Original file line number Diff line number Diff line change
Expand Up @@ -4,35 +4,35 @@ Feature: assign role
So that I can provide them different authority


Scenario Outline: only admin user can see all existing roles
Scenario Outline: user can see all existing roles
Given user "Alice" has been created with default attributes
And the administrator has given "Alice" the role "<user-role>" using the settings api
When user "Alice" tries to get all existing roles using the settings API
When user "Alice" gets all applications using the Graph API
Then the HTTP status code should be "<http-status-code>"
Examples:
| user-role | http-status-code |
| Admin | 201 |
| Space Admin | 201 |
| User | 201 |
| Admin | 200 |
| Space Admin | 200 |
| User | 200 |


@issue-5032
Scenario Outline: only admin user can see assignments list
Given user "Alice" has been created with default attributes
And the administrator has given "Alice" the role "<user-role>" using the settings api
When user "Alice" tries to get list of assignment using the settings API
When user "Alice" tries to get the assigned role of user "Alice" using the Graph API
Then the HTTP status code should be "<http-status-code>"
Examples:
| user-role | http-status-code |
| Admin | 201 |
| Space Admin | 401 |
| User | 401 |
| Admin | 200 |
| Space Admin | 403 |
| User | 403 |


Scenario Outline: a user cannot change own role
Given user "Alice" has been created with default attributes
And the administrator has given "Alice" the role "<user-role>" using the settings api
When user "Alice" changes his own role to "<desired-role>"
Then the HTTP status code should be "400"
When user "Alice" tries to change the role of user "Alice" to role "<desired-role>" using the Graph API
Then the HTTP status code should be "403"
And user "Alice" should have the role "<user-role>"
Examples:
| user-role | desired-role |
Expand All @@ -50,15 +50,15 @@ Feature: assign role
| Alice |
| Brian |
And the administrator has given "Alice" the role "<user-role>" using the settings api
When user "Alice" changes the role "<desired-role>" for user "Brian"
When user "Alice" changes the role of user "Brian" to role "<desired-role>" using the Graph API
Then the HTTP status code should be "<http-status-code>"
And user "Brian" should have the role "<expected-role>"
Examples:
| user-role | desired-role | http-status-code | expected-role |
| Admin | User | 201 | User |
| Admin | Space Admin | 201 | Space Admin |
| Admin | Admin | 201 | Admin |
| Space Admin | Admin | 400 | User |
| Space Admin | Space Admin | 400 | User |
| User | Admin | 400 | User |
| User | Space Admin | 400 | User |
| Space Admin | Admin | 403 | User |
| Space Admin | Space Admin | 403 | User |
| User | Admin | 403 | User |
| User | Space Admin | 403 | User |
10 changes: 0 additions & 10 deletions tests/acceptance/features/apiCors/cors.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,16 +98,6 @@ Feature: CORS headers
| new |
| spaces |


Scenario: CORS headers should be returned when setting CORS domain sending origin header in the settings api
When user "Alice" lists values-list with headers using the Settings API
| header | value |
| Origin | https://aphno.badal |
Then the HTTP status code should be "201"
And the following headers should be set
| header | value |
| Access-Control-Allow-Origin | https://aphno.badal |

@issue-8380
Scenario: CORS headers should be returned when uploading file using Tus and when CORS domain sending origin header in the Webdav api
Given user "Alice" has created a new TUS resource in the space "Personal" with the following headers:
Expand Down
13 changes: 0 additions & 13 deletions tests/acceptance/features/apiGraph/getAssignedRole.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,6 @@ Feature: assign role
| User |
| User Light |

@issue-5032
Scenario Outline: get assigned role of a user via setting api
Given the administrator has assigned the role "<user-role>" to user "Alice" using the Graph API
When user "Alice" tries to get list of assignment using the settings API
Then the HTTP status code should be "<http-status-code>"
And the setting API response should have the role "<user-role>"
Examples:
| user-role | http-status-code |
| Admin | 201 |
| Space Admin | 401 |
| User | 401 |
| User Light | 401 |


Scenario Outline: get role of a user assigned via setting api
Given the administrator has given "Alice" the role "<user-role>" using the settings api
Expand Down
24 changes: 21 additions & 3 deletions tests/acceptance/features/apiSettings/settings.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,11 @@ Feature: settings api
"""

@issue-5032
Scenario: user lists assignments
Given the administrator has assigned the role "Admin" to user "Alice" using the Graph API
Scenario Outline: user lists assignments
Given the administrator has assigned the role "<user-role>" to user "Alice" using the Graph API
When user "Alice" tries to get list of assignment using the settings API
Then the HTTP status code should be "201"
Then the HTTP status code should be "<http-status-code>"
And the setting API response should have the role "<user-role>"
And the JSON data of the response should match
"""
{
Expand All @@ -109,6 +110,12 @@ Feature: settings api
}
}
"""
Examples:
| user-role | http-status-code |
| Admin | 201 |
| Space Admin | 401 |
| User | 401 |
| User Light | 401 |


Scenario: switch language
Expand Down Expand Up @@ -275,3 +282,14 @@ Feature: settings api
| Admin |
| Space Admin |
| User |


Scenario: CORS headers should be returned when setting CORS domain sending origin header in the settings api
Given the config "OCIS_CORS_ALLOW_ORIGINS" has been set to "https://aphno.badal"
When user "Alice" lists values-list with headers using the Settings API
| header | value |
| Origin | https://aphno.badal |
Then the HTTP status code should be "201"
And the following headers should be set
| header | value |
| Access-Control-Allow-Origin | https://aphno.badal |