Merge pull request #11213 from owncloud/test/directly-use-current-scenario-ref-in-guzzle-req

[tests-only][full-ci] Remove `xRequestId` and directly use current scenario ref in guzzle req

Author: saw-jan

tests/acceptance/TestHelpers/AuthAppHelper.php

@@ -50,7 +50,6 @@ public static function listAllAppAuthTokensForUser(
 		$url = $baseUrl . self::getAuthAppEndpoint();
 		return HttpRequestHelper::sendRequest(
 			$url,
-			null,
 			"GET",
 			$user,
 			$password,
@@ -75,7 +74,6 @@ public static function createAppAuthToken(
 		. http_build_query($params);
 		return HttpRequestHelper::sendRequest(
 			$url,
-			null,
 			"POST",
 			$user,
 			$password,
@@ -99,7 +97,6 @@ public static function deleteAppAuthToken(
 		$url = $baseUrl . self::getAuthAppEndpoint() . "?token=$token";
 		return HttpRequestHelper::sendRequest(
 			$url,
-			null,
 			"DELETE",
 			$user,
 			$password,

tests/acceptance/TestHelpers/CollaborationHelper.php

@@ -35,7 +35,6 @@ class CollaborationHelper {
 	 * @param string $username
 	 * @param string $password
 	 * @param string $baseUrl
-	 * @param string $xRequestId
 	 * @param string|null $viewMode
 	 *
 	 * @return ResponseInterface
@@ -47,7 +46,6 @@ public static function sendPOSTRequestToAppOpen(
 		string $username,
 		string $password,
 		string $baseUrl,
-		string $xRequestId,
 		?string $viewMode = null,
 	): ResponseInterface {
 		$url = $baseUrl . "/app/open?app_name=$app&file_id=$fileId";
@@ -57,7 +55,6 @@ public static function sendPOSTRequestToAppOpen(
 
 		return HttpRequestHelper::post(
 			$url,
-			$xRequestId,
 			$username,
 			$password,
 			['Content-Type' => 'application/json']
@@ -66,7 +63,6 @@ public static function sendPOSTRequestToAppOpen(
 
 	/**
 	 * @param string $baseUrl
-	 * @param string $xRequestId
 	 * @param string $user
 	 * @param string $password
 	 * @param string $parentContainerId
@@ -78,7 +74,6 @@ public static function sendPOSTRequestToAppOpen(
 	 */
 	public static function createFile(
 		string $baseUrl,
-		string $xRequestId,
 		string $user,
 		string $password,
 		string $parentContainerId,
@@ -88,7 +83,6 @@ public static function createFile(
 		$url = $baseUrl . "/app/new?parent_container_id=$parentContainerId&filename=$file";
 		return HttpRequestHelper::post(
 			$url,
-			$xRequestId,
 			$user,
 			$password,
 			$headers

tests/acceptance/TestHelpers/EmailHelper.php

@@ -64,17 +64,12 @@ public static function getEmailHost(): string {
 	/**
 	 * list all email
 	 *
-	 * @param string|null $xRequestId
-	 *
 	 * @return ResponseInterface
 	 * @throws GuzzleException
 	 */
-	public static function listAllEmails(
-		?string $xRequestId,
-	): ResponseInterface {
+	public static function listAllEmails(): ResponseInterface {
 		return HttpRequestHelper::get(
 			self::getEmailAPIUrl("messages"),
-			$xRequestId,
 			null,
 			null,
 			['Content-Type' => 'application/json']
@@ -84,19 +79,16 @@ public static function listAllEmails(
 	/**
 	 * @param string $id when $id set to 'latest' returns the latest message.
 	 * @param string $query
-	 * @param string|null $xRequestId
 	 *
 	 * @return ResponseInterface
 	 * @throws GuzzleException
 	 */
 	public static function getEmailById(
 		string $id,
 		string $query,
-		?string $xRequestId,
 	): ResponseInterface {
 		return HttpRequestHelper::get(
 			self::getEmailAPIUrl("message/$id") . "?query=$query",
-			$xRequestId,
 			null,
 			null,
 			['Content-Type' => 'application/json']
@@ -107,19 +99,16 @@ public static function getEmailById(
 	 * search email
 	 *
 	 * @param string $query
-	 * @param string|null $xRequestId
 	 *
 	 * @return ResponseInterface
 	 * @throws GuzzleException
 	 */
 	public static function searchEmails(
 		string $query,
-		?string $xRequestId,
 	): ResponseInterface {
 		$url = self::getEmailAPIUrl("search") . "?query=$query";
 		return HttpRequestHelper::get(
 			$url,
-			$xRequestId,
 			null,
 			null,
 			['Content-Type' => 'application/json']
@@ -129,17 +118,12 @@ public static function searchEmails(
 	/**
 	 * Deletes all email
 	 *
-	 * @param string|null $xRequestId
-	 *
 	 * @return ResponseInterface
 	 * @throws GuzzleException
 	 */
-	public static function deleteAllEmails(
-		?string $xRequestId,
-	): ResponseInterface {
+	public static function deleteAllEmails(): ResponseInterface {
 		return HttpRequestHelper::delete(
 			self::getEmailAPIUrl("messages"),
-			$xRequestId,
 			null,
 			null,
 			['Content-Type' => 'application/json']