Merge pull request #11472 from owncloud/test/check-trashbin-restore

[full-ci][tests-only] add step to try to restore trashed file

Author: saw-jan

tests/acceptance/bootstrap/SpacesContext.php

@@ -3232,6 +3232,7 @@ public function listAllDeletedFilesFromTrash(
 
 	/**
 	 * @When /^user "([^"]*)" lists all deleted files in the trash bin of the space "([^"]*)"$/
+	 * @When /^user "([^"]*)" tries to list all deleted files in the trash bin of the space "([^"]*)"$/
 	 *
 	 * @param  string $user
 	 * @param  string $spaceName
@@ -3314,6 +3315,23 @@ public function getObjectsInTrashbin(
 		);
 	}
 
+	/**
+	 * @param string $user
+	 * @param string $spaceName
+	 * @param string $resource
+	 *
+	 * @return string
+	 * @throws GuzzleException
+	 */
+	public function getTrashbinItemHref(string $user, string $spaceName, string $resource): string {
+		$items = $this->getObjectsInTrashbin($user, $spaceName);
+		foreach ($items as $item) {
+			if ($item["name"] === $resource) {
+				return $item["href"];
+			}
+		}
+	}
+
 	/**
 	 * @Then /^as "([^"]*)" (?:file|folder|entry) "([^"]*)" should (not|)\s?exist in the trashbin of the space "([^"]*)"$/
 	 *
@@ -3348,9 +3366,10 @@ public function checkExistenceOfObjectsInTrashbin(
 
 	/**
 	 * @When /^user "([^"]*)" restores the (?:file|folder) "([^"]*)" from the trash of the space "([^"]*)" to "([^"]*)"$/
+	 * @When /^user "([^"]*)" tries to restore the (?:file|folder) "([^"]*)" from the trash of the space "([^"]*)" to "([^"]*)"$/
 	 *
 	 * @param string $user
-	 * @param string $object
+	 * @param string $trashResource
 	 * @param string $spaceName
 	 * @param string $destination
 	 *
@@ -3360,33 +3379,22 @@ public function checkExistenceOfObjectsInTrashbin(
 	 */
 	public function userRestoresSpaceObjectsFromTrashRequest(
 		string $user,
-		string $object,
+		string $trashResource,
 		string $spaceName,
 		string $destination,
 	): void {
+		$destination = \ltrim($destination, "/");
 		$space = $this->getSpaceByName($user, $spaceName);
-
-		// find object in trash
-		$objectsInTrash = $this->getObjectsInTrashbin($user, $spaceName);
-		$pathToDeletedObject = "";
-		foreach ($objectsInTrash as $objectInTrash) {
-			if ($objectInTrash["name"] === $object) {
-				$pathToDeletedObject = $objectInTrash["href"];
-			}
-		}
-
-		if ($pathToDeletedObject === "") {
-			throw new Exception(
-				__METHOD__ . " Object '$object' was not found in the trashbin of space '$spaceName' by user '$user'",
-			);
-		}
+		$spaceId = $space["id"];
+		$spaceOwner = $space["spaceCreator"];
+		$itemHref = $this->getTrashbinItemHref($spaceOwner, $spaceName, $trashResource);
 
 		$baseUrl = $this->featureContext->getBaseUrl();
-		$davPath = WebDavHelper::getDavPath(WebDavHelper::DAV_VERSION_SPACES, $space["id"]);
+		$davPath = WebDavHelper::getDavPath(WebDavHelper::DAV_VERSION_SPACES, $spaceId);
 		$destination = "$baseUrl/$davPath/$destination";
 		$header = ["Destination" => $destination, "Overwrite" => "F"];
 
-		$fullUrl = $baseUrl . $pathToDeletedObject;
+		$fullUrl = $baseUrl . $itemHref;
 		$this->featureContext->setResponse(
 			HttpRequestHelper::sendRequest(
 				$fullUrl,

tests/acceptance/features/apiSharingNgAdditionalShareRole/SpaceEditorWithoutTrashbin.feature

@@ -21,6 +21,8 @@ Feature: an user shares resources
       | shareType       | user                          |
       | permissionsRole | Space Editor Without Trashbin |
     And user "Brian" has removed the file "textfile.txt" from space "new-space"
-    When user "Brian" lists all deleted files in the trash bin of the space "new-space"
+    When user "Brian" tries to list all deleted files in the trash bin of the space "new-space"
+    Then the HTTP status code should be "403"
+    When user "Brian" tries to restore the file "textfile.txt" from the trash of the space "new-space" to "/textfile.txt"
     Then the HTTP status code should be "403"
     And as "Alice" file "textfile.txt" should exist in the trashbin of the space "new-space"