remove ocs endpoint

owncloud · Dec 19, 2023 · 51bdc46 · 51bdc46
1 parent d85aaab
commit 51bdc46
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 46 deletions.
diff --git a/tests/acceptance/features/bootstrap/GraphContext.php b/tests/acceptance/features/bootstrap/GraphContext.php
@@ -943,24 +943,6 @@ public function userHasCreatedGroupUsingTheGraphApi(string $group, ?string $user
 		}
 	}
 
-	/**
-	 * create group with provided data
-	 *
-	 * @param string $group
-	 *
-	 * @return array
-	 * @throws Exception
-	 * @throws GuzzleException
-	 */
-	public function adminHasCreatedGroupUsingTheGraphApi(string $group): array {
-		$result = $this->createGroup($group);
-		if ($result->getStatusCode() === 201) {
-			return $this->featureContext->getJsonDecodedResponse($result);
-		} else {
-			$this->throwHttpException($result, "Could not create group '$group'.");
-		}
-	}
-
 	/**
 	 * @param ResponseInterface $response
 	 * @param string $errorMsg

diff --git a/tests/acceptance/features/bootstrap/Provisioning.php b/tests/acceptance/features/bootstrap/Provisioning.php
@@ -3011,7 +3011,10 @@ public function adminCreatesGroupUsingTheProvisioningApi(string $group):void {
 	 */
 	public function groupHasBeenCreated(string $group):void {
 		$this->createTheGroup($group);
-		$this->groupShouldExist($group);
+		Assert::assertTrue(
+			$this->groupExists($group),
+			"Group '$group' should exist but does not exist"
+		);
 	}
 
 	/**
@@ -3123,34 +3126,15 @@ public function createTheGroup(string $group, ?string $method = null):void {
 		if ($method === null) {
 			if ($this->isTestingWithLdap()) {
 				$method = "ldap";
-			} elseif (OcisHelper::isTestingWithGraphApi()) {
-				$method = "graph";
 			} else {
-				$method = "api";
+				$method = "graph";
 			}
 		}
 		$group = \trim($group);
 		$method = \trim(\strtolower($method));
 		$groupCanBeDeleted = false;
 		$groupId = null;
 		switch ($method) {
-			case "api":
-				$result = UserHelper::createGroup(
-					$this->getBaseUrl(),
-					$group,
-					$this->getAdminUsername(),
-					$this->getAdminPassword(),
-					$this->getStepLineRef()
-				);
-				if ($result->getStatusCode() === 200) {
-					$groupCanBeDeleted = true;
-				} else {
-					throw new Exception(
-						"could not create group '$group'. "
-						. $result->getStatusCode() . " " . $result->getBody()
-					);
-				}
-				break;
 			case "ldap":
 				try {
 					$this->createLdapGroup($group);
@@ -3161,7 +3145,10 @@ public function createTheGroup(string $group, ?string $method = null):void {
 				}
 				break;
 			case "graph":
-				$newGroup = $this->graphContext->adminHasCreatedGroupUsingTheGraphApi($group);
+				$newGroup = $this->graphContext->createGroup($group);
+				if ($newGroup->getStatusCode() === 201) {
+					$newGroup = $this->getJsonDecodedResponse($newGroup);
+				}
 				$groupCanBeDeleted = true;
 				$groupId = $newGroup["id"];
 				break;
@@ -3616,13 +3603,8 @@ public function groupExists(string $group):bool {
 			}
 			return false;
 		}
-		if (OcisHelper::isTestingWithGraphApi()) {
-			$base = '/graph/v1.0';
-		} else {
-			$base = '/ocs/v2.php/cloud';
-		}
 		$group = \rawurlencode($group);
-		$fullUrl = $this->getBaseUrl() . "$base/groups/$group";
+		$fullUrl = $this->getBaseUrl() . "/graph/v1.0/groups/$group";
 		$this->response = HttpRequestHelper::get(
 			$fullUrl,
 			$this->getStepLineRef(),