mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-01-10 06:10:05 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
Viktor Scharf
2024-08-19 11:11:17 +02:00
parent 5a958dfb92
commit 60eaef5f75
5 changed files with 8 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/acceptance/expected-failures-localAPI-on-OCIS-storage.md
View File

@@ -297,7 +297,7 @@ The expected failures in this file are from features in the owncloud/ocis repo.
### [OCM. admin cannot get federated users if he hasn't connection with them ](https://github.com/owncloud/ocis/issues/9829)
tests/acceptance/features/apiOcm/searchFederationUsers.feature
- [apiOcm/searchFederationUsers.feature:434](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiOcm/searchFederationUsers.feature#L434)
- [apiOcm/searchFederationUsers.feature:611](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiOcm/searchFederationUsers.feature#L611)
- [apiOcm/searchFederationUsers.feature:429](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiOcm/searchFederationUsers.feature#L429)
- [apiOcm/searchFederationUsers.feature:601](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiOcm/searchFederationUsers.feature#L601)
- Note: always have an empty line at the end of this file.
The bash script that processes this file requires that the last line has a newline on the end.

4
tests/acceptance/features/apiOcm/createInvitation.feature
View File

@@ -84,11 +84,9 @@ Feature: create invitation
"pattern": "^%fed_invitation_token_pattern%$"
},
"description": {
"type": "string",
"const": "a share invitation from Alice"
},
"recipient": {
"type": "string",
"const": "brian@example.com"
}
}
@@ -117,11 +115,9 @@ Feature: create invitation
"pattern": "^%fed_invitation_token_pattern%$"
},
"description": {
"type": "string",
"const": "a share invitation from Alice"
},
"recipient": {
"type": "string",
"const": "brian@example.com"
}
}

20
tests/acceptance/features/apiOcm/searchFederationUsers.feature
View File

@@ -382,15 +382,12 @@ Feature: search federation users
],
"properties": {
"display_name": {
"type": "string",
"const": "Alice Hansen"
},
"idp": {
"type": "string",
"const": "https://ocis-server:9200"
},
"mail": {
"type": "string",
"pattern": "alice@example.org"
},
"user_id": {
@@ -409,15 +406,12 @@ Feature: search federation users
],
"properties": {
"display_name": {
"type": "string",
"const": "Carol King"
},
"idp": {
"type": "string",
"const": "https://ocis-server:9200"
},
"mail": {
"type": "string",
"pattern": "carol@example.org"
},
"user_id": {
@@ -469,11 +463,9 @@ Feature: search federation users
"pattern": "^%user_id_pattern%$"
},
"mail": {
"type": "string",
"const": "alice@example.org"
},
"userType": {
"type": "string",
"const": "Federated"
},
"identities": {
@@ -536,11 +528,9 @@ Feature: search federation users
"pattern": "^%user_id_pattern%$"
},
"mail": {
"type": "string",
"const": "brian@example.org"
},
"userType": {
"type": "string",
"const": "Federated"
},
"identities": {
@@ -596,11 +586,9 @@ Feature: search federation users
],
"properties": {
"code": {
"type": "string",
"const": "accessDenied"
},
"message": {
"type": "string",
"const": "search term too short"
}
}
@@ -610,13 +598,13 @@ Feature: search federation users
"""
@issue-9829
Scenario: admin gets federated and member users
Scenario: admin gets federated and local users
Given using server "LOCAL"
And "Alice" has created the federation share invitation
And using server "REMOTE"
And "Brian" has accepted invitation
And using server "LOCAL"
When the administrator gets federated and member users using the Graph API
When the administrator gets federated and local users using the Graph API
Then the HTTP status code should be "200"
And the JSON data of the response should match
"""
@@ -656,7 +644,6 @@ Feature: search federation users
"pattern": "^%user_id_pattern%$"
},
"mail": {
"type": "string",
"const": "carol@example.org"
},
"onPremisesSamAccountName": {
@@ -666,7 +653,6 @@ Feature: search federation users
"const": "Carol"
},
"userType": {
"type": "string",
"const": "Member"
}
}
@@ -689,11 +675,9 @@ Feature: search federation users
"pattern": "^%user_id_pattern%$"
},
"mail": {
"type": "string",
"const": "brian@example.org"
},
"userType": {
"type": "string",
"const": "Federated"
},
"identities": {

7
tests/acceptance/features/apiOcm/share.feature
View File

@@ -126,12 +126,10 @@ Feature: an user shares resources usin ScienceMesh application
],
"properties": {
"@UI.Hidden":{
"type": "boolean",
"enum": [false]
"const": "false"
},
"@client.synchronize":{
"type": "boolean",
"enum": [true]
"const": "true"
},
"createdBy": {
"type": "object",
@@ -144,7 +142,6 @@ Feature: an user shares resources usin ScienceMesh application
"required": ["displayName", "id"],
"properties": {
"displayName": {
"type": "string",
"const": "Brian Murphy"
},
"id": {

4
tests/acceptance/features/bootstrap/GraphContext.php
View File

@@ -2861,8 +2861,8 @@ class GraphContext implements Context {
}
/**
* @When the administrator gets federated and member users using the Graph API
* @When user :user tries to get federated and member users using the Graph API
* @When the administrator gets federated and local users using the Graph API
* @When user :user tries to get federated and local users using the Graph API
*
* @param ?string $user
*