Merge pull request #40392 from owncloud/refactorExpectedFailureClosed…

…Issue [tests-only][full-ci]Refactor closed issue related scenarios
owncloud · Oct 18, 2022 · f969b50 · f969b50
2 parents 832d043 + eab5338
commit f969b50
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 18 deletions.
diff --git a/tests/acceptance/features/apiMain/main.feature b/tests/acceptance/features/apiMain/main.feature
@@ -5,4 +5,9 @@ Feature: Other tests related to api
   Scenario: robots.txt file should be accessible
     When a user requests "/robots.txt" with "GET" and no authentication
     Then the HTTP status code should be "200"
-    And the content in the response should match with the content of file "robots.txt" in the server root
+    And the content in the response should match the following content:
+      """
+      User-agent: *
+      Disallow: /
+
+      """
diff --git a/tests/acceptance/features/apiWebdavOperations/listFiles.feature b/tests/acceptance/features/apiWebdavOperations/listFiles.feature
@@ -212,11 +212,6 @@ Feature: list files
       | dav_version |
       | new         |
 
-    @skipOnOcV10 @personalSpace
-    Examples:
-      | dav_version |
-      | spaces      |
-
 
   Scenario Outline: Get the list of resources in a folder shared through public link with depth 1
     Given using <dav_version> DAV path
@@ -250,10 +245,6 @@ Feature: list files
       | dav_version |
       | new         |
 
-    @skipOnOcV10 @personalSpace
-    Examples:
-      | dav_version |
-      | spaces      |
 
   @depthInfinityPropfindEnabled
   Scenario Outline: Get the list of resources in a folder shared through public link with depth infinity
@@ -287,11 +278,6 @@ Feature: list files
       | dav_version |
       | new         |
 
-    @skipOnOcV10 @personalSpace
-    Examples:
-      | dav_version |
-      | spaces      |
-
 
   Scenario Outline: Get the list of files in the trashbin with depth 0
     Given using <dav_version> DAV path

diff --git a/tests/acceptance/features/bootstrap/FeatureContext.php b/tests/acceptance/features/bootstrap/FeatureContext.php
@@ -2841,7 +2841,7 @@ public function readFileInServerRootForOCIS(string $path):string {
 		$pathToOcis = \getenv("PATH_TO_OCIS");
 		$targetFile = \rtrim($pathToOcis, "/") . "/" . "services/web/assets" . "/" . ltrim($path, '/');
 		if (!\file_exists($targetFile)) {
-			throw new Exception('Target File' . $targetFile . 'could not be found');
+			throw new Exception('Target File ' . $targetFile . ' could not be found');
 		}
 		return \file_get_contents($targetFile);
 	}

diff --git a/tests/acceptance/features/bootstrap/SearchContext.php b/tests/acceptance/features/bootstrap/SearchContext.php
@@ -119,7 +119,8 @@ public function fileOrFolderInTheSearchResultShouldContainProperties(
 		$properties = $properties->getHash();
 		$fileResult = $this->featureContext->findEntryFromPropfindResponse(
 			$path,
-			$user
+			$user,
+			"REPORT",
 		);
 		Assert::assertNotFalse(
 			$fileResult,

diff --git a/tests/acceptance/features/bootstrap/WebDav.php b/tests/acceptance/features/bootstrap/WebDav.php
@@ -1182,10 +1182,21 @@ public function checkDownloadedContentMatches(
 		Assert::assertEquals(
 			$expectedContent,
 			$actualContent,
-			$extraErrorText . "The downloaded content was expected to be '$expectedContent', but actually is '$actualContent'. HTTP status was $actualStatus"
+			$extraErrorText . "The content was expected to be '$expectedContent', but actually is '$actualContent'. HTTP status was $actualStatus"
 		);
 	}
 
+	/**
+	 * @Then the content in the response should match the following content:
+	 *
+	 * @param PyStringNode $content
+	 *
+	 * @return void
+	 */
+	public function theContentInTheResponseShouldMatchTheFollowingContent(PyStringNode $content): void {
+		$this->checkDownloadedContentMatches($content->getRaw());
+	}
+
 	/**
 	 * @Then /^if the HTTP status code was "([^"]*)" then the downloaded content for multipart byterange should be:$/
 	 *