From 280947365be008d8e8ecb3619f63c3ad5735453a Mon Sep 17 00:00:00 2001
From: Viktor Scharf <scharf.vi@gmail.com>
Date: Wed, 31 Aug 2022 09:57:44 +0200
Subject: [PATCH 1/3] part1

---
 tests/TestHelpers/GraphHelper.php             |  55 ++++++
 .../features/bootstrap/SpacesContext.php      | 166 ++++++------------
 2 files changed, 108 insertions(+), 113 deletions(-)

diff --git a/tests/TestHelpers/GraphHelper.php b/tests/TestHelpers/GraphHelper.php
index e815fb2feff..0086cf52a55 100644
--- a/tests/TestHelpers/GraphHelper.php
+++ b/tests/TestHelpers/GraphHelper.php
@@ -523,4 +523,59 @@ public static function preparePatchUserPayload(
 		}
 		return \json_encode($payload);
 	}
+	
+	/**
+	 * Send Graph Create Space Request
+	 *
+	 * @param string $baseUrl
+	 * @param  string $user
+	 * @param  string $password
+	 * @param  string $body
+	 * @param  string $xRequestId
+	 * @param  array  $headers
+	 *
+	 * @return ResponseInterface
+	 * @throws GuzzleException
+	 */
+	public static function createSpace(
+		string $baseUrl,
+		string $user,
+		string $password,
+		string $body,
+		string $xRequestId = '',
+		array $headers = []
+	): ResponseInterface {
+		$url = self::getFullUrl($baseUrl, 'drives');
+
+		return HttpRequestHelper::post($url, $xRequestId, $user, $password, $headers, $body);
+	}
+
+	/**
+	 * Send Graph Update Space Request
+	 *
+	 * @param  string $baseUrl
+	 * @param  string $user
+	 * @param  string $password
+	 * @param  mixed $body
+	 * @param  string $spaceId
+	 * @param  string $xRequestId
+	 * @param  array  $headers
+	 *
+	 * @return ResponseInterface
+	 * @throws GuzzleException
+	 */
+	public static function updateSpace(
+		string $baseUrl,
+		string $user,
+		string $password,
+		$body,
+		string $spaceId,
+		string $xRequestId = '',
+		array $headers = []
+	): ResponseInterface {
+		$url = self::getFullUrl($baseUrl, 'drives/' . $spaceId);
+		$method = 'PATCH';
+
+		return HttpRequestHelper::sendRequest($url, $xRequestId, $method, $user, $password, $headers, $body);
+	}
 }
diff --git a/tests/acceptance/features/bootstrap/SpacesContext.php b/tests/acceptance/features/bootstrap/SpacesContext.php
index a498656b54e..d1b68b3d897 100644
--- a/tests/acceptance/features/bootstrap/SpacesContext.php
+++ b/tests/acceptance/features/bootstrap/SpacesContext.php
@@ -571,31 +571,6 @@ public function listSingleSpaceRequest(
 		return HttpRequestHelper::get($fullUrl, $xRequestId, $user, $password, $headers, $body);
 	}
 
-	/**
-	 * Send Graph Create Space Request
-	 *
-	 * @param  string $user
-	 * @param  string $password
-	 * @param  string $body
-	 * @param  string $xRequestId
-	 * @param  array  $headers
-	 *
-	 * @return ResponseInterface
-	 *
-	 * @throws GuzzleException
-	 */
-	public function sendCreateSpaceRequest(
-		string $user,
-		string $password,
-		string $body,
-		string $xRequestId = '',
-		array $headers = []
-	): ResponseInterface {
-		$fullUrl = $this->baseUrl . "/graph/v1.0/drives/";
-
-		return HttpRequestHelper::post($fullUrl, $xRequestId, $user, $password, $headers, $body);
-	}
-
 	/**
 	 * Send Propfind Request to Url
 	 *
@@ -782,13 +757,13 @@ public function theUserCreatesASpaceUsingTheGraphApi(
 	): void {
 		$space = ["Name" => $spaceName, "driveType" => $spaceType];
 		$body = json_encode($space, JSON_THROW_ON_ERROR);
-		$this->featureContext->setResponse(
-			$this->sendCreateSpaceRequest(
-				$user,
-				$this->featureContext->getPasswordForUser($user),
-				$body
-			)
-		);
+		$this->featureContext->setResponse(GraphHelper::createSpace(
+			$this->featureContext->getBaseUrl(),
+			$user,
+			$this->featureContext->getPasswordForUser($user),
+			$body
+		));
+
 		$this->setSpaceCreator($spaceName, $user);
 	}
 
@@ -813,13 +788,12 @@ public function theUserCreatesASpaceWithQuotaUsingTheGraphApi(
 	): void {
 		$space = ["Name" => $spaceName, "driveType" => $spaceType, "quota" => ["total" => $quota]];
 		$body = json_encode($space);
-		$this->featureContext->setResponse(
-			$this->sendCreateSpaceRequest(
-				$user,
-				$this->featureContext->getPasswordForUser($user),
-				$body
-			)
-		);
+		$this->featureContext->setResponse(GraphHelper::createSpace(
+			$this->featureContext->getBaseUrl(),
+			$user,
+			$this->featureContext->getPasswordForUser($user),
+			$body
+		));
 		$this->setSpaceCreator($spaceName, $user);
 	}
 
@@ -1584,14 +1558,13 @@ public function updateSpaceName(
 		$bodyData = ["Name" => $newName];
 		$body = json_encode($bodyData, JSON_THROW_ON_ERROR);
 
-		$this->featureContext->setResponse(
-			$this->sendUpdateSpaceRequest(
-				$user,
-				$this->featureContext->getPasswordForUser($user),
-				$body,
-				$spaceId
-			)
-		);
+		$this->featureContext->setResponse(GraphHelper::updateSpace(
+			$this->featureContext->getBaseUrl(),
+			$user,
+			$this->featureContext->getPasswordForUser($user),
+			$body,
+			$spaceId
+		));
 	}
 
 	/**
@@ -1615,14 +1588,13 @@ public function updateSpaceDescription(
 		$bodyData = ["description" => $newDescription];
 		$body = json_encode($bodyData, JSON_THROW_ON_ERROR);
 
-		$this->featureContext->setResponse(
-			$this->sendUpdateSpaceRequest(
-				$user,
-				$this->featureContext->getPasswordForUser($user),
-				$body,
-				$spaceId
-			)
-		);
+		$this->featureContext->setResponse(GraphHelper::updateSpace(
+			$this->featureContext->getBaseUrl(),
+			$user,
+			$this->featureContext->getPasswordForUser($user),
+			$body,
+			$spaceId
+		));
 	}
 
 	/**
@@ -1647,14 +1619,13 @@ public function updateSpaceQuota(
 		$bodyData = ["quota" => ["total" => $newQuota]];
 		$body = json_encode($bodyData, JSON_THROW_ON_ERROR);
 
-		$this->featureContext->setResponse(
-			$this->sendUpdateSpaceRequest(
-				$user,
-				$this->featureContext->getPasswordForUser($user),
-				$body,
-				$spaceId
-			)
-		);
+		$this->featureContext->setResponse(GraphHelper::updateSpace(
+			$this->featureContext->getBaseUrl(),
+			$user,
+			$this->featureContext->getPasswordForUser($user),
+			$body,
+			$spaceId
+		));
 	}
 
 	/**
@@ -1688,14 +1659,13 @@ public function updateSpaceSpecialSection(
 		$bodyData = ["special" => [["specialFolder" => ["name" => "$type"], "id" => "$fileId"]]];
 		$body = json_encode($bodyData, JSON_THROW_ON_ERROR);
 
-		$this->featureContext->setResponse(
-			$this->sendUpdateSpaceRequest(
-				$user,
-				$this->featureContext->getPasswordForUser($user),
-				$body,
-				$spaceId
-			)
-		);
+		$this->featureContext->setResponse(GraphHelper::updateSpace(
+			$this->featureContext->getBaseUrl(),
+			$user,
+			$this->featureContext->getPasswordForUser($user),
+			$body,
+			$spaceId
+		));
 	}
 
 	/**
@@ -1723,34 +1693,6 @@ public function userHasUpdatedSpaceSpecialSection(
 		);
 	}
 
-	/**
-	 * Send Graph Update Space Request
-	 *
-	 * @param  string $user
-	 * @param  string $password
-	 * @param  mixed $body
-	 * @param  string $spaceId
-	 * @param  string $xRequestId
-	 * @param  array  $headers
-	 *
-	 * @return ResponseInterface
-	 *
-	 * @throws GuzzleException
-	 */
-	public function sendUpdateSpaceRequest(
-		string $user,
-		string $password,
-		$body,
-		string $spaceId,
-		string $xRequestId = '',
-		array $headers = []
-	): ResponseInterface {
-		$fullUrl = $this->baseUrl . "/graph/v1.0/drives/$spaceId";
-		$method = 'PATCH';
-
-		return HttpRequestHelper::sendRequest($fullUrl, $xRequestId, $method, $user, $password, $headers, $body);
-	}
-
 	/**
 	 * @Given /^user "([^"]*)" has created a space "([^"]*)" of type "([^"]*)" with quota "([^"]*)"$/
 	 *
@@ -1770,13 +1712,12 @@ public function userHasCreatedSpace(
 	): void {
 		$space = ["Name" => $spaceName, "driveType" => $spaceType, "quota" => ["total" => $quota]];
 		$body = json_encode($space);
-		$this->featureContext->setResponse(
-			$this->sendCreateSpaceRequest(
-				$user,
-				$this->featureContext->getPasswordForUser($user),
-				$body
-			)
-		);
+		$this->featureContext->setResponse(GraphHelper::createSpace(
+			$this->featureContext->getBaseUrl(),
+			$user,
+			$this->featureContext->getPasswordForUser($user),
+			$body
+		));
 		$this->featureContext->theHTTPStatusCodeShouldBe(
 			201,
 			"Expected response status code should be 201 (Created)"
@@ -1800,13 +1741,12 @@ public function theUserHasCreatedASpaceByDefaultUsingTheGraphApi(
 	): void {
 		$space = ["Name" => $spaceName];
 		$body = json_encode($space, JSON_THROW_ON_ERROR);
-		$this->featureContext->setResponse(
-			$this->sendCreateSpaceRequest(
-				$user,
-				$this->featureContext->getPasswordForUser($user),
-				$body
-			)
-		);
+		$this->featureContext->setResponse(GraphHelper::createSpace(
+			$this->featureContext->getBaseUrl(),
+			$user,
+			$this->featureContext->getPasswordForUser($user),
+			$body
+		));
 		$this->featureContext->theHTTPStatusCodeShouldBe(
 			201,
 			"Expected response status code should be 201 (Created)"

From 2a51a3f96c92d645599c17da492e151b7b121079 Mon Sep 17 00:00:00 2001
From: Viktor Scharf <scharf.vi@gmail.com>
Date: Wed, 31 Aug 2022 15:11:31 +0200
Subject: [PATCH 2/3] move graph api methods from Space context to GraphHelper

---
 tests/TestHelpers/GraphHelper.php             | 178 ++++++++++++-
 .../features/bootstrap/SpacesContext.php      | 241 ++++++------------
 2 files changed, 260 insertions(+), 159 deletions(-)

diff --git a/tests/TestHelpers/GraphHelper.php b/tests/TestHelpers/GraphHelper.php
index 0086cf52a55..60946b9eb45 100644
--- a/tests/TestHelpers/GraphHelper.php
+++ b/tests/TestHelpers/GraphHelper.php
@@ -14,7 +14,7 @@
 use Psr\Http\Message\ResponseInterface;
 
 /**
- * A helper class for managing users and groups using the Graph API
+ * A helper class for managing Graph API requests
  */
 class GraphHelper {
 	/**
@@ -574,8 +574,180 @@ public static function updateSpace(
 		array $headers = []
 	): ResponseInterface {
 		$url = self::getFullUrl($baseUrl, 'drives/' . $spaceId);
-		$method = 'PATCH';
 
-		return HttpRequestHelper::sendRequest($url, $xRequestId, $method, $user, $password, $headers, $body);
+		return HttpRequestHelper::sendRequest($url, $xRequestId, 'PATCH', $user, $password, $headers, $body);
+	}
+
+	/**
+	 * Send Graph List My Spaces Request
+	 *
+	 * @param  string $baseUrl
+	 * @param  string $user
+	 * @param  string $password
+	 * @param  string $urlArguments
+	 * @param  string $xRequestId
+	 * @param  array  $body
+	 * @param  array  $headers
+	 *
+	 * @return ResponseInterface
+	 *
+	 * @throws GuzzleException
+	 */
+	public static function getMySpaces(
+		string $baseUrl,
+		string $user,
+		string $password,
+		string $urlArguments = '',
+		string $xRequestId = '',
+		array  $body = [],
+		array  $headers = []
+	): ResponseInterface {
+		$url = self::getFullUrl($baseUrl, 'me/drives/' . $urlArguments);
+
+		return HttpRequestHelper::get($url, $xRequestId, $user, $password, $headers, $body);
+	}
+
+	/**
+	 * Send Graph List All Spaces Request
+	 *
+	 * @param  string $baseUrl
+	 * @param  string $user
+	 * @param  string $password
+	 * @param  string $urlArguments
+	 * @param  string $xRequestId
+	 * @param  array  $body
+	 * @param  array  $headers
+	 *
+	 * @return ResponseInterface
+	 *
+	 * @throws GuzzleException
+	 */
+	public static function getAllSpaces(
+		string $baseUrl,
+		string $user,
+		string $password,
+		string $urlArguments = '',
+		string $xRequestId = '',
+		array  $body = [],
+		array  $headers = []
+	): ResponseInterface {
+		$url = self::getFullUrl($baseUrl, 'drives/' . $urlArguments);
+
+		return HttpRequestHelper::get($url, $xRequestId, $user, $password, $headers, $body);
+	}
+
+	/**
+	 * Send Graph List Single Space Request
+	 *
+	 * @param string $baseUrl
+	 * @param string $user
+	 * @param string $password
+	 * @param string $spaceId
+	 * @param string $urlArguments
+	 * @param string $xRequestId
+	 * @param array $body
+	 * @param array $headers
+	 *
+	 * @return ResponseInterface
+	 *
+	 */
+	public static function getSingleSpace(
+		string $baseUrl,
+		string $user,
+		string $password,
+		string $spaceId,
+		string $urlArguments = '',
+		string $xRequestId = '',
+		array  $body = [],
+		array  $headers = []
+	): ResponseInterface {
+		$url = self::getFullUrl($baseUrl, 'drives/' . $spaceId . "/" . $urlArguments);
+
+		return HttpRequestHelper::get($url, $xRequestId, $user, $password, $headers, $body);
+	}
+
+	/**
+	 * send disable space request
+	 * 
+	 * @param string $baseUrl
+	 * @param string $user
+	 * @param string $password
+	 * @param string $spaceId
+	 * @param string $xRequestId
+	 * 
+	 * @return ResponseInterface
+	 * @throws GuzzleException
+	 */
+	public static function disableSpace(
+		string $baseUrl,
+		string $user,
+		string $password,
+		string $spaceId,
+		string $xRequestId = ''
+	): ResponseInterface {
+		$url = self::getFullUrl($baseUrl, 'drives/' . $spaceId);
+		
+		return HttpRequestHelper::delete(
+			$url,
+			$xRequestId,
+			$user,
+			$password
+		);
+	}
+
+	/**
+	 * send delete space request
+	 * 
+	 * @param string $baseUrl
+	 * @param string $user
+	 * @param string $password
+	 * @param string $spaceId
+	 * @param array  $header
+	 * @param string $xRequestId
+	 * 
+	 * @return ResponseInterface
+	 * @throws GuzzleException
+	 */
+	public static function deleteSpace(
+		string $baseUrl,
+		string $user,
+		string $password,
+		string $spaceId,
+		array $header,
+		string $xRequestId = ''
+	): ResponseInterface {
+		$url = self::getFullUrl($baseUrl, 'drives/' . $spaceId);
+		
+		return HttpRequestHelper::delete(
+			$url,
+			$xRequestId,
+			$user,
+			$password,
+			$header
+		);
+	}
+
+	/**
+	 * Send restore Space Request
+	 *
+	 * @param  string $baseUrl
+	 * @param  string $user
+	 * @param  string $password
+	 * @param  string $spaceId
+	 *
+	 * @return ResponseInterface
+	 * @throws GuzzleException
+	 */
+	public static function restoreSpace(
+		string $baseUrl,
+		string $user,
+		string $password,
+		string $spaceId
+	): ResponseInterface {
+		$url = self::getFullUrl($baseUrl, 'drives/' . $spaceId);
+		$header = ["restore" => true];
+		$body = '{}';
+
+		return HttpRequestHelper::sendRequest($url, '', 'PATCH', $user, $password, $header, $body);
 	}
 }
diff --git a/tests/acceptance/features/bootstrap/SpacesContext.php b/tests/acceptance/features/bootstrap/SpacesContext.php
index d1b68b3d897..d3c4710029e 100644
--- a/tests/acceptance/features/bootstrap/SpacesContext.php
+++ b/tests/acceptance/features/bootstrap/SpacesContext.php
@@ -489,88 +489,6 @@ public function deleteAllPersonalSpaces(): void {
 		}
 	}
 
-	/**
-	 * Send Graph List My Spaces Request
-	 *
-	 * @param  string $user
-	 * @param  string $password
-	 * @param  string $urlArguments
-	 * @param  string $xRequestId
-	 * @param  array  $body
-	 * @param  array  $headers
-	 *
-	 * @return ResponseInterface
-	 *
-	 * @throws GuzzleException
-	 */
-	public function listMySpacesRequest(
-		string $user,
-		string $password,
-		string $urlArguments = '',
-		string $xRequestId = '',
-		array  $body = [],
-		array  $headers = []
-	): ResponseInterface {
-		$fullUrl = $this->baseUrl . "/graph/v1.0/me/drives/" . $urlArguments;
-
-		return HttpRequestHelper::get($fullUrl, $xRequestId, $user, $password, $headers, $body);
-	}
-
-	/**
-	 * Send Graph List All Spaces Request
-	 *
-	 * @param  string $user
-	 * @param  string $password
-	 * @param  string $urlArguments
-	 * @param  string $xRequestId
-	 * @param  array  $body
-	 * @param  array  $headers
-	 *
-	 * @return ResponseInterface
-	 *
-	 * @throws GuzzleException
-	 */
-	public function listAllSpacesRequest(
-		string $user,
-		string $password,
-		string $urlArguments = '',
-		string $xRequestId = '',
-		array  $body = [],
-		array  $headers = []
-	): ResponseInterface {
-		$fullUrl = $this->baseUrl . "/graph/v1.0/drives/" . $urlArguments;
-
-		return HttpRequestHelper::get($fullUrl, $xRequestId, $user, $password, $headers, $body);
-	}
-
-	/**
-	 * Send Graph List Single Space Request
-	 *
-	 * @param string $user
-	 * @param string $password
-	 * @param string $spaceId
-	 * @param string $urlArguments
-	 * @param string $xRequestId
-	 * @param array $body
-	 * @param array $headers
-	 *
-	 * @return ResponseInterface
-	 *
-	 */
-	public function listSingleSpaceRequest(
-		string $user,
-		string $password,
-		string $spaceId,
-		string $urlArguments = '',
-		string $xRequestId = '',
-		array  $body = [],
-		array  $headers = []
-	): ResponseInterface {
-		$fullUrl = $this->baseUrl . "/graph/v1.0/drives/" . $spaceId . "/" . $urlArguments;
-
-		return HttpRequestHelper::get($fullUrl, $xRequestId, $user, $password, $headers, $body);
-	}
-
 	/**
 	 * Send Propfind Request to Url
 	 *
@@ -685,7 +603,8 @@ public function sendCreateFolderRequest(
 	 */
 	public function theUserListsAllHisAvailableSpacesUsingTheGraphApi(string $user, string $query = ''): void {
 		$this->featureContext->setResponse(
-			$this->listMySpacesRequest(
+			GraphHelper::getMySpaces(
+				$this->featureContext->getBaseUrl(),
 				$user,
 				$this->featureContext->getPasswordForUser($user),
 				"?" . $query
@@ -706,7 +625,8 @@ public function theUserListsAllHisAvailableSpacesUsingTheGraphApi(string $user,
 	 */
 	public function theUserListsAllAvailableSpacesUsingTheGraphApi(string $user, string $query = ''): void {
 		$this->featureContext->setResponse(
-			$this->listAllSpacesRequest(
+			GraphHelper::getAllSpaces(
+				$this->featureContext->getBaseUrl(),
 				$user,
 				$this->featureContext->getPasswordForUser($user),
 				"?" . $query
@@ -730,7 +650,8 @@ public function theUserLooksUpTheSingleSpaceUsingTheGraphApiByUsingItsId(string
 		Assert::assertNotEmpty($spaceId = $space["id"]);
 		Assert::assertNotEmpty($space["root"]["webDavUrl"]);
 		$this->featureContext->setResponse(
-			$this->listSingleSpaceRequest(
+			GraphHelper::getSingleSpace(
+				$this->featureContext->getBaseUrl(),
 				$user,
 				$this->featureContext->getPasswordForUser($user),
 				$spaceId
@@ -757,12 +678,14 @@ public function theUserCreatesASpaceUsingTheGraphApi(
 	): void {
 		$space = ["Name" => $spaceName, "driveType" => $spaceType];
 		$body = json_encode($space, JSON_THROW_ON_ERROR);
-		$this->featureContext->setResponse(GraphHelper::createSpace(
-			$this->featureContext->getBaseUrl(),
-			$user,
-			$this->featureContext->getPasswordForUser($user),
-			$body
-		));
+		$this->featureContext->setResponse(
+			GraphHelper::createSpace(
+				$this->featureContext->getBaseUrl(),
+				$user,
+				$this->featureContext->getPasswordForUser($user),
+				$body
+			)
+		);
 
 		$this->setSpaceCreator($spaceName, $user);
 	}
@@ -788,12 +711,14 @@ public function theUserCreatesASpaceWithQuotaUsingTheGraphApi(
 	): void {
 		$space = ["Name" => $spaceName, "driveType" => $spaceType, "quota" => ["total" => $quota]];
 		$body = json_encode($space);
-		$this->featureContext->setResponse(GraphHelper::createSpace(
-			$this->featureContext->getBaseUrl(),
-			$user,
-			$this->featureContext->getPasswordForUser($user),
-			$body
-		));
+		$this->featureContext->setResponse(
+			GraphHelper::createSpace(
+				$this->featureContext->getBaseUrl(),
+				$user,
+				$this->featureContext->getPasswordForUser($user),
+				$body
+			)
+		);
 		$this->setSpaceCreator($spaceName, $user);
 	}
 
@@ -1558,13 +1483,15 @@ public function updateSpaceName(
 		$bodyData = ["Name" => $newName];
 		$body = json_encode($bodyData, JSON_THROW_ON_ERROR);
 
-		$this->featureContext->setResponse(GraphHelper::updateSpace(
-			$this->featureContext->getBaseUrl(),
-			$user,
-			$this->featureContext->getPasswordForUser($user),
-			$body,
-			$spaceId
-		));
+		$this->featureContext->setResponse(
+			GraphHelper::updateSpace(
+				$this->featureContext->getBaseUrl(),
+				$user,
+				$this->featureContext->getPasswordForUser($user),
+				$body,
+				$spaceId
+			)
+		);
 	}
 
 	/**
@@ -1588,13 +1515,15 @@ public function updateSpaceDescription(
 		$bodyData = ["description" => $newDescription];
 		$body = json_encode($bodyData, JSON_THROW_ON_ERROR);
 
-		$this->featureContext->setResponse(GraphHelper::updateSpace(
-			$this->featureContext->getBaseUrl(),
-			$user,
-			$this->featureContext->getPasswordForUser($user),
-			$body,
-			$spaceId
-		));
+		$this->featureContext->setResponse(
+			GraphHelper::updateSpace(
+				$this->featureContext->getBaseUrl(),
+				$user,
+				$this->featureContext->getPasswordForUser($user),
+				$body,
+				$spaceId
+			)
+		);
 	}
 
 	/**
@@ -1619,13 +1548,15 @@ public function updateSpaceQuota(
 		$bodyData = ["quota" => ["total" => $newQuota]];
 		$body = json_encode($bodyData, JSON_THROW_ON_ERROR);
 
-		$this->featureContext->setResponse(GraphHelper::updateSpace(
-			$this->featureContext->getBaseUrl(),
-			$user,
-			$this->featureContext->getPasswordForUser($user),
-			$body,
-			$spaceId
-		));
+		$this->featureContext->setResponse(
+			GraphHelper::updateSpace(
+				$this->featureContext->getBaseUrl(),
+				$user,
+				$this->featureContext->getPasswordForUser($user),
+				$body,
+				$spaceId
+			)
+		);
 	}
 
 	/**
@@ -1659,13 +1590,15 @@ public function updateSpaceSpecialSection(
 		$bodyData = ["special" => [["specialFolder" => ["name" => "$type"], "id" => "$fileId"]]];
 		$body = json_encode($bodyData, JSON_THROW_ON_ERROR);
 
-		$this->featureContext->setResponse(GraphHelper::updateSpace(
-			$this->featureContext->getBaseUrl(),
-			$user,
-			$this->featureContext->getPasswordForUser($user),
-			$body,
-			$spaceId
-		));
+		$this->featureContext->setResponse(
+			GraphHelper::updateSpace(
+				$this->featureContext->getBaseUrl(),
+				$user,
+				$this->featureContext->getPasswordForUser($user),
+				$body,
+				$spaceId
+			)
+		);
 	}
 
 	/**
@@ -1712,12 +1645,14 @@ public function userHasCreatedSpace(
 	): void {
 		$space = ["Name" => $spaceName, "driveType" => $spaceType, "quota" => ["total" => $quota]];
 		$body = json_encode($space);
-		$this->featureContext->setResponse(GraphHelper::createSpace(
-			$this->featureContext->getBaseUrl(),
-			$user,
-			$this->featureContext->getPasswordForUser($user),
-			$body
-		));
+		$this->featureContext->setResponse(
+			GraphHelper::createSpace(
+				$this->featureContext->getBaseUrl(),
+				$user,
+				$this->featureContext->getPasswordForUser($user),
+				$body
+			)
+		);
 		$this->featureContext->theHTTPStatusCodeShouldBe(
 			201,
 			"Expected response status code should be 201 (Created)"
@@ -1741,12 +1676,14 @@ public function theUserHasCreatedASpaceByDefaultUsingTheGraphApi(
 	): void {
 		$space = ["Name" => $spaceName];
 		$body = json_encode($space, JSON_THROW_ON_ERROR);
-		$this->featureContext->setResponse(GraphHelper::createSpace(
-			$this->featureContext->getBaseUrl(),
-			$user,
-			$this->featureContext->getPasswordForUser($user),
-			$body
-		));
+		$this->featureContext->setResponse(
+			GraphHelper::createSpace(
+				$this->featureContext->getBaseUrl(),
+				$user,
+				$this->featureContext->getPasswordForUser($user),
+				$body
+			)
+		);
 		$this->featureContext->theHTTPStatusCodeShouldBe(
 			201,
 			"Expected response status code should be 201 (Created)"
@@ -2204,13 +2141,12 @@ public function sendDisableSpaceRequest(
 		string $spaceName
 	): void {
 		$space = $this->getSpaceByName($user, $spaceName);
-		$fullUrl = $this->baseUrl . "/graph/v1.0/drives/" . $space["id"];
 		$this->featureContext->setResponse(
-			HttpRequestHelper::delete(
-				$fullUrl,
-				"",
+			GraphHelper::disableSpace(
+				$this->featureContext->getBaseUrl(),
 				$user,
-				$this->featureContext->getPasswordForUser($user)
+				$this->featureContext->getPasswordForUser($user),
+				$space["id"]
 			)
 		);
 	}
@@ -2274,14 +2210,13 @@ public function sendDeleteSpaceRequest(
 	): void {
 		$header = ["Purge" => "T"];
 		$space = $this->getSpaceByName($user, $spaceName);
-		$fullUrl = $this->baseUrl . "/graph/v1.0/drives/" . $space["id"];
-
+		
 		$this->featureContext->setResponse(
-			HttpRequestHelper::delete(
-				$fullUrl,
-				"",
+			GraphHelper::deleteSpace(
+				$this->featureContext->getBaseUrl(),
 				$user,
 				$this->featureContext->getPasswordForUser($user),
+				$space["id"],
 				$header
 			)
 		);
@@ -2307,18 +2242,12 @@ public function sendRestoreSpaceRequest(
 		} else {
 			$space = $this->getSpaceByName($user, $spaceName);
 		}
-		$header = ["restore" => true];
-		$body = '{}';
-		$fullUrl = $this->baseUrl . "/graph/v1.0/drives/" . $space["id"];
 		$this->featureContext->setResponse(
-			HttpRequestHelper::sendRequest(
-				$fullUrl,
-				"",
-				'PATCH',
+			GraphHelper::restoreSpace(
+				$this->featureContext->getBaseUrl(),
 				$user,
 				$this->featureContext->getPasswordForUser($user),
-				$header,
-				$body
+				$space["id"]
 			)
 		);
 	}

From 8178c40049826dca4075f4b26f5c843c0b10cf59 Mon Sep 17 00:00:00 2001
From: Viktor Scharf <scharf.vi@gmail.com>
Date: Wed, 31 Aug 2022 18:09:36 +0200
Subject: [PATCH 3/3] fix after rebase

---
 tests/TestHelpers/GraphHelper.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/TestHelpers/GraphHelper.php b/tests/TestHelpers/GraphHelper.php
index ce7d51f64e0..aa8dc20f296 100644
--- a/tests/TestHelpers/GraphHelper.php
+++ b/tests/TestHelpers/GraphHelper.php
@@ -751,6 +751,7 @@ public static function restoreSpace(
 		return HttpRequestHelper::sendRequest($url, '', 'PATCH', $user, $password, $header, $body);
 	}
   
+	/**
 	 * @param string $baseUrl
 	 * @param string $xRequestId
 	 * @param string $user