diff --git a/tests/acceptance/features/apiGraph/createUser.feature b/tests/acceptance/features/apiGraph/createUser.feature index 5e471eec8b..23b9529c4f 100644 --- a/tests/acceptance/features/apiGraph/createUser.feature +++ b/tests/acceptance/features/apiGraph/createUser.feature @@ -12,7 +12,7 @@ Feature: create user @issue-3516 Scenario Outline: admin creates a user Given the administrator has assigned the role "Admin" to user "Alice" using the Graph API - When the user "Alice" creates a new user using GraphAPI with the following settings: + When the user "Alice" creates a new user with the following attributes using the Graph API: | userName | | | displayName | | | email | | @@ -39,7 +39,7 @@ Feature: create user Scenario: user cannot be created with empty name Given the administrator has assigned the role "Admin" to user "Alice" using the Graph API - When the user "Alice" creates a new user using GraphAPI with the following settings: + When the user "Alice" creates a new user with the following attributes using the Graph API: | userName | | | displayName | emptyName | | email | @example.org | @@ -50,7 +50,7 @@ Feature: create user Scenario Outline: user without admin right cannot create a user Given the administrator has assigned the role "" to user "Alice" using the Graph API - When the user "Alice" creates a new user using GraphAPI with the following settings: + When the user "Alice" creates a new user with the following attributes using the Graph API: | userName | user | | displayName | user | | email | @example.org | @@ -69,7 +69,7 @@ Feature: create user Given user "Brian" has been created with default attributes and without skeleton files And the administrator has assigned the role "Admin" to user "Alice" using the Graph API And the user "Alice" has disabled user "Brian" using the Graph API - When the user "Alice" creates a new user using GraphAPI with the following settings: + When the user "Alice" creates a new user with the following attributes using the Graph API: | userName | Brian | | displayName | This is another Brian | | email | brian@example.com | @@ -82,7 +82,7 @@ Feature: create user Given user "Brian" has been created with default attributes and without skeleton files And the administrator has assigned the role "Admin" to user "Alice" using the Graph API And the user "Alice" has deleted a user "Brian" using the Graph API - When the user "Alice" creates a new user using GraphAPI with the following settings: + When the user "Alice" creates a new user with the following attributes using the Graph API: | userName | Brian | | displayName | This is another Brian | | email | brian@example.com | @@ -96,7 +96,7 @@ Feature: create user Scenario Outline: create user with setting OCIS no restriction on the user name Given the config "GRAPH_USERNAME_MATCH" has been set to "none" And the administrator has assigned the role "Admin" to user "Alice" using the Graph API - When the user "Alice" creates a new user using GraphAPI with the following settings: + When the user "Alice" creates a new user with the following attributes using the Graph API: | userName | | | displayName | test user | | email | new@example.org | @@ -113,7 +113,7 @@ Feature: create user @env-config Scenario: create user with setting OCIS not to assign the default user role Given the config "GRAPH_ASSIGN_DEFAULT_USER_ROLE" has been set to "false" - When the user "admin" creates a new user using GraphAPI with the following settings: + When the user "admin" creates a new user with the following attributes using the Graph API: | userName | sam | | displayName | test user | | email | new@example.org | @@ -129,7 +129,7 @@ Feature: create user @env-config Scenario: create user with setting OCIS assign the default user role Given the config "GRAPH_ASSIGN_DEFAULT_USER_ROLE" has been set to "true" - When the user "admin" creates a new user using GraphAPI with the following settings: + When the user "admin" creates a new user with the following attributes using the Graph API: | userName | sam | | displayName | test user | | email | new@example.org | @@ -141,7 +141,7 @@ Feature: create user Scenario: user is created with the default User role - When the user "admin" creates a new user using GraphAPI with the following settings: + When the user "admin" creates a new user with the following attributes using the Graph API: | userName | sam | | displayName | test user | | email | new@example.org | diff --git a/tests/acceptance/features/apiGraph/deleteUser.feature b/tests/acceptance/features/apiGraph/deleteUser.feature index 3579c887b1..95787bbb9d 100644 --- a/tests/acceptance/features/apiGraph/deleteUser.feature +++ b/tests/acceptance/features/apiGraph/deleteUser.feature @@ -12,7 +12,7 @@ Feature: delete user Scenario Outline: admin user deletes a user Given the administrator has assigned the role "Admin" to user "Alice" using the Graph API - And the user "Alice" has created a new user using the Graph API with the following settings: + And the user "Alice" has created a new user with the following attributes: | userName | | | displayName | | | email | | diff --git a/tests/acceptance/features/apiGraph/editUser.feature b/tests/acceptance/features/apiGraph/editUser.feature index 7168269ed5..1446fb8981 100644 --- a/tests/acceptance/features/apiGraph/editUser.feature +++ b/tests/acceptance/features/apiGraph/editUser.feature @@ -9,7 +9,7 @@ Feature: edit user Background: Given user "Alice" has been created with default attributes and without skeleton files And the administrator has assigned the role "Admin" to user "Alice" using the Graph API - And the user "Alice" has created a new user using the Graph API with the following settings: + And the user "Alice" has created a new user with the following attributes: | userName | Brian | | displayName | Brian Murphy | | email | brian@example.com | @@ -71,7 +71,7 @@ Feature: edit user Scenario: admin user changes the name of a user to the name of an existing disabled user - Given the user "Alice" has created a new user using the Graph API with the following settings: + Given the user "Alice" has created a new user with the following attributes: | userName | sam | | displayName | sam | | email | sam@example.com | @@ -97,7 +97,7 @@ Feature: edit user Scenario: admin user changes the name of a user to the name of a previously deleted user - Given the user "Alice" has created a new user using the Graph API with the following settings: + Given the user "Alice" has created a new user with the following attributes: | userName | sam | | displayName | sam | | email | sam@example.com | @@ -150,7 +150,7 @@ Feature: edit user Scenario Outline: normal user should not be able to edit another user's email Given the administrator has assigned the role "" to user "Brian" using the Graph API - And the user "Alice" has created a new user using the Graph API with the following settings: + And the user "Alice" has created a new user with the following attributes: | userName | Carol | | displayName | Carol King | | email | carol@example.com | @@ -243,7 +243,7 @@ Feature: edit user Scenario Outline: normal user should not be able to edit another user's display name Given the administrator has assigned the role "" to user "Brian" using the Graph API - And the user "Alice" has created a new user using the Graph API with the following settings: + And the user "Alice" has created a new user with the following attributes: | userName | Carol | | displayName | Carol King | | email | carol@example.com | @@ -291,7 +291,7 @@ Feature: edit user Scenario Outline: normal user should not be able to reset the password of another user Given the administrator has assigned the role "" to user "Brian" using the Graph API - And the user "Alice" has created a new user using the Graph API with the following settings: + And the user "Alice" has created a new user with the following attributes: | userName | Carol | | displayName | Carol King | | email | carol@example.com | diff --git a/tests/acceptance/features/bootstrap/GraphContext.php b/tests/acceptance/features/bootstrap/GraphContext.php index 13a8344e0a..9cda27ea32 100644 --- a/tests/acceptance/features/bootstrap/GraphContext.php +++ b/tests/acceptance/features/bootstrap/GraphContext.php @@ -725,7 +725,7 @@ class GraphContext implements Context { } /** - * @When /^the user "([^"]*)" creates a new user using GraphAPI with the following settings:$/ + * @When /^the user "([^"]*)" creates a new user with the following attributes using the Graph API:$/ * * @param string $user * @param TableNode $table diff --git a/tests/acceptance/features/bootstrap/Provisioning.php b/tests/acceptance/features/bootstrap/Provisioning.php index 3ab6aa6d26..5508abff0e 100644 --- a/tests/acceptance/features/bootstrap/Provisioning.php +++ b/tests/acceptance/features/bootstrap/Provisioning.php @@ -405,7 +405,7 @@ trait Provisioning { } /** - * @Given the user :byUser has created a new user using the Graph API with the following settings: + * @Given the user :byUser has created a new user with the following attributes: * * @param string $byUser * @param TableNode $table