From 39572a8d48e559d4ec2ec499f9a70b06b44828d7 Mon Sep 17 00:00:00 2001 From: Viktor Scharf Date: Wed, 7 Jun 2023 12:10:02 +0200 Subject: [PATCH 1/2] fix code expectation --- tests/acceptance/expected-failures-API-on-OCIS-storage.md | 4 ++-- .../expected-failures-localAPI-on-OCIS-storage.md | 4 +--- tests/acceptance/features/apiGraph/createUser.feature | 6 +++--- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/tests/acceptance/expected-failures-API-on-OCIS-storage.md b/tests/acceptance/expected-failures-API-on-OCIS-storage.md index d3d855bc40a..a7efb503aa4 100644 --- a/tests/acceptance/expected-failures-API-on-OCIS-storage.md +++ b/tests/acceptance/expected-failures-API-on-OCIS-storage.md @@ -155,9 +155,9 @@ Synchronization features like etag propagation, setting mtime and locking files File and sync features in a shared scenario -#### Contain the remotes list in response to getting sharees while searching +#### [federation share is not implement in ocis] (https://github.com/owncloud/ocis/issues/1329) -- [coreApiSharees/sharees.feature:180](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiSharees/sharees.feature#L180) +- [coreApiSharees/sharees.feature:180](https://github.com/owncloud/ocis/blob/master/test-acceptance-apr/tests/acceptance/features/coreApiSharees/sharees.feature#L180) - [coreApiSharees/sharees.feature:181](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiSharees/sharees.feature#L181) #### [accepting matching name shared resources from different users/groups sets no serial identifiers on the resource name for the receiver](https://github.com/owncloud/ocis/issues/4289) diff --git a/tests/acceptance/expected-failures-localAPI-on-OCIS-storage.md b/tests/acceptance/expected-failures-localAPI-on-OCIS-storage.md index a5508134d99..646b8aa7107 100644 --- a/tests/acceptance/expected-failures-localAPI-on-OCIS-storage.md +++ b/tests/acceptance/expected-failures-localAPI-on-OCIS-storage.md @@ -18,7 +18,7 @@ The expected failures in this file are from features in the owncloud/ocis repo. - [apiArchiver/downloadById.feature:134](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiArchiver/downloadById.feature#L134) - [apiArchiver/downloadById.feature:135](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiArchiver/downloadById.feature#L135) -### [create request for already existing user exits with status code 500 ](https://github.com/owncloud/ocis/issues/3516) +### [create request for already existing group exits with status code 500 ](https://github.com/owncloud/ocis/issues/3516) - [apiGraph/createGroupCaseSensitive.feature:20](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiGraph/createGroupCaseSensitive.feature#L20) - [apiGraph/createGroupCaseSensitive.feature:21](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiGraph/createGroupCaseSensitive.feature#L21) @@ -27,8 +27,6 @@ The expected failures in this file are from features in the owncloud/ocis repo. - [apiGraph/createGroupCaseSensitive.feature:24](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiGraph/createGroupCaseSensitive.feature#L24) - [apiGraph/createGroupCaseSensitive.feature:25](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiGraph/createGroupCaseSensitive.feature#L25) - [apiGraph/createGroup.feature:28](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiGraph/createGroup.feature#L28) -- [apiGraph/createUser.feature:41](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiGraph/createUser.feature#L41) -- [apiGraph/createUser.feature:72](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiGraph/createUser.feature#L72) ### [PROPFIND on accepted shares with identical names containing brackets exit with 404](https://github.com/owncloud/ocis/issues/4421) diff --git a/tests/acceptance/features/apiGraph/createUser.feature b/tests/acceptance/features/apiGraph/createUser.feature index a141c638970..15ab882f525 100644 --- a/tests/acceptance/features/apiGraph/createUser.feature +++ b/tests/acceptance/features/apiGraph/createUser.feature @@ -38,7 +38,7 @@ Feature: create user Examples: | userName | displayName | email | password | code | enable | shouldOrNot | | withoutEmail | without email | | 123 | 200 | true | should | - | Alice | same userName | new@example.org | 123 | 400 | true | should | + | Alice | same userName | new@example.org | 123 | 409 | true | should | Scenario: user cannot be created with empty name @@ -68,7 +68,7 @@ Feature: create user | User | | User Light | - @issue-3516 @skipOnStable2.0 + Scenario: user cannot be created with the name of the disabled user Given user "Brian" has been created with default attributes and without skeleton files And the administrator has given "Alice" the role "Admin" using the settings api @@ -79,7 +79,7 @@ Feature: create user | email | brian@example.com | | password | 123 | | accountEnabled | true | - Then the HTTP status code should be "400" + Then the HTTP status code should be "409" @skipOnStable2.0 Scenario: user can be created with the name of the deleted user From d22c33b4911627161b00469adb10b764aff0ffee Mon Sep 17 00:00:00 2001 From: Viktor Scharf Date: Wed, 7 Jun 2023 12:13:48 +0200 Subject: [PATCH 2/2] fix --- tests/acceptance/expected-failures-API-on-OCIS-storage.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/acceptance/expected-failures-API-on-OCIS-storage.md b/tests/acceptance/expected-failures-API-on-OCIS-storage.md index a7efb503aa4..7ae655931f2 100644 --- a/tests/acceptance/expected-failures-API-on-OCIS-storage.md +++ b/tests/acceptance/expected-failures-API-on-OCIS-storage.md @@ -157,7 +157,7 @@ File and sync features in a shared scenario #### [federation share is not implement in ocis] (https://github.com/owncloud/ocis/issues/1329) -- [coreApiSharees/sharees.feature:180](https://github.com/owncloud/ocis/blob/master/test-acceptance-apr/tests/acceptance/features/coreApiSharees/sharees.feature#L180) +- [coreApiSharees/sharees.feature:180](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiSharees/sharees.feature#L180) - [coreApiSharees/sharees.feature:181](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiSharees/sharees.feature#L181) #### [accepting matching name shared resources from different users/groups sets no serial identifiers on the resource name for the receiver](https://github.com/owncloud/ocis/issues/4289)