Merge pull request #40168 from owncloud/webdav-changes-fix

[tests-only][full-ci] Make webdav changes made in PR40159 only for oCIS
owncloud · Jun 24, 2022 · 9801edd · 9801edd
2 parents a52a6b4 + 20db296
commit 9801edd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/tests/acceptance/features/bootstrap/SearchContext.php b/tests/acceptance/features/bootstrap/SearchContext.php
@@ -60,7 +60,7 @@ public function userSearchesUsingWebDavAPI(
 		TableNode $properties = null
 	):void {
 		// Because indexing of newly uploaded files or directories with ocis is decoupled and occurs asynchronously, a 1 second wait is necessary while searching files or folders.
-		if (OcisHelper::isTestingOnOcisOrReva()) {
+		if (OcisHelper::isTestingOnOcis()) {
 			sleep(1);
 		}
 		$user = $this->featureContext->getActualUsername($user);

diff --git a/tests/acceptance/features/bootstrap/WebDav.php b/tests/acceptance/features/bootstrap/WebDav.php
@@ -5280,15 +5280,15 @@ public function findEntryFromPropfindResponse(
 		// topWebDavPath should be something like /remote.php/webdav/ or
 		// /remote.php/dav/files/alice/
 		$topWebDavPath = "/" . $this->getFullDavFilesPath($user) . "/";
-		if (OcisHelper::isTestingOnOcisOrReva() && $method === "REPORT") {
+		if (OcisHelper::isTestingOnOcis() && $method === "REPORT") {
 			$spaceId = WebDavHelper::getPersonalSpaceIdForUser(
 				$this->getBaseUrl(),
 				$user,
 				$this->getPasswordForUser($user),
 				$this->getStepLineRef()
 			);
-			$splitSpaceID = explode("$", $spaceId);
-			$topWebDavPath = "/dav/spaces/" . $spaceId . "%21" . "$splitSpaceID[1]" . "/";
+			$userId = $this->getAttributeOfCreatedUser($user, "id");
+			$topWebDavPath = "/dav/spaces/" . $spaceId . "%21" . $userId . "/";
 		}
 
 		switch ($type) {