Merge pull request #10044 from owncloud/tests-report-request

[tests-only][full-ci] refactor userSearchesUsingWebDavAPI function to update davPath for new and spaces dav versions

tests/acceptance/bootstrap/SearchContext.php

@@ -25,6 +25,7 @@ use Behat\Behat\Hook\Scope\BeforeScenarioScope;
 use Behat\Gherkin\Node\TableNode;
 use PHPUnit\Framework\Assert;
 use TestHelpers\WebDavHelper;
+use TestHelpers\HttpRequestHelper;
 
 require_once 'bootstrap.php';
 
@@ -102,16 +103,24 @@ class SearchContext implements Context {
 			$body .= "	</a:prop>";
 		}
 		$body .= "	</oc:search-files>";
-		$response = WebDavHelper::makeDavRequest(
+		$davPathVersionToUse = $this->featureContext->getDavPathVersion();
-			$baseUrl,
+		$davPath = WebDavHelper::getDavPath($doDavRequestAsUser ?? $user, $davPathVersionToUse, 'files');
+
+		if ($davPathVersionToUse == WebDavHelper::DAV_VERSION_NEW) {
+			// Removes the last component('username' in this case) from the WebDAV path by going up one level in the directory structure.
+			// e.g. remote.php/dav/files/Alice ==> remote.php/dav/files/
+			$davPath = \dirname($davPath, 1);
+		}
+
+		$fullUrl = WebDavHelper::sanitizeUrl("$baseUrl/$davPath");
+		$response = HttpRequestHelper::sendRequest(
+			$fullUrl,
+			$this->featureContext->getStepLineRef(),
+			'REPORT',
 			$user,
 			$password,
-			"REPORT",
-			"/",
 			null,
-			$this->featureContext->getStepLineRef(),
+			$body
-			$body,
-			$this->featureContext->getDavPathVersion()
 		);
 		$this->featureContext->setResponse($response);
 	}