owncloud · saw-jan · Sep 11, 2023 · Sep 6, 2023
diff --git a/tests/acceptance/expected-failures-localAPI-on-OCIS-storage.md b/tests/acceptance/expected-failures-localAPI-on-OCIS-storage.md
@@ -71,7 +71,6 @@ The expected failures in this file are from features in the owncloud/ocis repo.
 - [apiGraph/getUser.feature:91](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiGraph/getUser.feature#L91)
 - [apiGraph/getUser.feature:92](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiGraph/getUser.feature#L92)
 - [apiGraph/getUser.feature:93](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiGraph/getUser.feature#L93)
-- [apiGraph/getUser.feature:606](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiGraph/getUser.feature#L606)
 - [apiGraph/getUser.feature:607](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiGraph/getUser.feature#L607)
 - [apiGraph/getUser.feature:608](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiGraph/getUser.feature#L608)
 - [apiGraph/getUser.feature:609](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiGraph/getUser.feature#L609)
@@ -83,14 +82,15 @@ The expected failures in this file are from features in the owncloud/ocis repo.
 - [apiGraph/getUser.feature:615](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiGraph/getUser.feature#L615)
 - [apiGraph/getUser.feature:616](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiGraph/getUser.feature#L616)
 - [apiGraph/getUser.feature:617](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiGraph/getUser.feature#L617)
+- [apiGraph/getUser.feature:618](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiGraph/getUser.feature#L618)
 
 #### [Normal user can get expanded members information of a group](https://github.com/owncloud/ocis/issues/5604)
 
 - [apiGraph/getGroup.feature:381](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiGraph/getGroup.feature#L381)
 - [apiGraph/getGroup.feature:382](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiGraph/getGroup.feature#L382)
 - [apiGraph/getGroup.feature:383](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiGraph/getGroup.feature#L383)
 
-#### [Changing user with an uppercase name gives 404 error](https://github.com/owncloud/ocis/issues/5763)
+#### [Changing user with an uppercase name gives 404 error](https://github.com/owncloud/ocis/issues/7044)
 
 - [apiGraph/editUser.feature:67](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiGraph/editUser.feature#L67)
 

diff --git a/tests/acceptance/features/apiGraph/editUser.feature b/tests/acceptance/features/apiGraph/editUser.feature
@@ -42,7 +42,7 @@ Feature: edit user
       | empty mail                |                      | 400  | brian@example.com    |
       | change to a invalid email | invalidEmail         | 400  | brian@example.com    |
 
-   @issue-5763
+  @issue-7044
   Scenario Outline: admin user can edit another user's name
     Given user "Carol" has been created with default attributes and without skeleton files
     When the user "Alice" changes the user name of user "Carol" to "<userName>" using the Graph API

diff --git a/tests/acceptance/features/apiGraph/getUser.feature b/tests/acceptance/features/apiGraph/getUser.feature
@@ -381,7 +381,7 @@ Feature: get users
     """
 
 
-  Scenario Outline: non-admin user gets his/her own drive information
+  Scenario Outline: user gets his/her own information along with drive information
     Given the administrator has assigned the role "<userRole>" to user "Brian" using the Graph API
     When the user "Brian" gets his drive information using Graph API
     Then the HTTP status code should be "200"
@@ -504,6 +504,7 @@ Feature: get users
     """
     Examples:
       | userRole    |
+      | Admin       |
       | Space Admin |
       | User        |
       | User Light  |
@@ -750,7 +751,6 @@ Feature: get users
     And the JSON data of the response should not contain the user "Alice Hansen" in the item 'value'
 
 
-
   Scenario: admin user gets all users of two groups
     Given the administrator has assigned the role "Admin" to user "Alice" using the Graph API
     And user "Carol" has been created with default attributes and without skeleton files

diff --git a/tests/acceptance/features/bootstrap/AppConfigurationContext.php b/tests/acceptance/features/bootstrap/AppConfigurationContext.php
@@ -171,7 +171,7 @@ public function theUserGetsCapabilitiesCheckResponse():void {
 
 	/**
 	 * @return string
-	 * @throws Exception
+	 * @throws Exception|GuzzleException
 	 */
 	public function getAdminUsernameForCapabilitiesCheck():string {
 		if (\TestHelpers\OcisHelper::isTestingOnReva()) {
@@ -182,7 +182,7 @@ public function getAdminUsernameForCapabilitiesCheck():string {
 			$adminUsername = "PseudoAdminForRevaTest";
 			$createdUsers = $this->featureContext->getCreatedUsers();
 			if (!\array_key_exists($adminUsername, $createdUsers)) {
-				$this->featureContext->createUser($adminUsername);
+				$this->featureContext->userHasBeenCreated(["userName" => $adminUsername]);
 			}
 		} else {
 			$adminUsername = $this->featureContext->getAdminUsername();

diff --git a/tests/acceptance/features/bootstrap/GraphContext.php b/tests/acceptance/features/bootstrap/GraphContext.php
@@ -724,41 +724,6 @@ public function theAdminHasRetrievedMembersListOfGroupUsingTheGraphApi(string $g
 		return $this->getArrayOfUsersResponded($this->listGroupMembers($group));
 	}
 
-	/**
-	 * creates a user with provided data
-	 * actor: the administrator
-	 *
-	 * @param string $user
-	 * @param string $password
-	 * @param string $email
-	 * @param string $displayName
-	 *
-	 * @return void
-	 * @throws Exception|GuzzleException
-	 */
-	public function theAdminHasCreatedUser(
-		string $user,
-		string $password,
-		string $email,
-		string $displayName
-	): void {
-		$response = GraphHelper::createUser(
-			$this->featureContext->getBaseUrl(),
-			$this->featureContext->getStepLineRef(),
-			$this->featureContext->getAdminUsername(),
-			$this->featureContext->getAdminPassword(),
-			$user,
-			$password,
-			$email,
-			$displayName
-		);
-		if ($response->getStatusCode() !== 200) {
-			$this->throwHttpException($response, "Could not create user $user");
-		} else {
-			$this->featureContext->setResponse($response);
-		}
-	}
-
 	/**
 	 * @When /^the user "([^"]*)" creates a new user using GraphAPI with the following settings:$/
 	 *
@@ -795,28 +760,6 @@ public function theUserCreatesNewUser(string $user, TableNode $table): void {
 		$this->featureContext->setResponse($response);
 	}
 
-	/**
-	 * @Given /^the user "([^"]*)" has created a new user using the Graph API with the following settings:$/
-	 *
-	 * @param string $user
-	 * @param TableNode $table
-	 *
-	 * @return void
-	 * @throws Exception|GuzzleException
-	 */
-	public function theUserHasCreatedANewUserUsingGraphapiWithTheFollowingSettings(string $user, TableNode $table): void {
-		$this->theUserCreatesNewUser(
-			$user,
-			$table
-		);
-		$rows = $table->getRowsHash();
-		$response = $this->featureContext->getResponse();
-
-		if ($response->getStatusCode() !== 200) {
-			$this->throwHttpException($response, "Could not create user '$rows[userName]'");
-		}
-	}
-
 	/**
 	 * adds a user to a group
 	 *