[Tests-only] Adjust public link tests

Enabled some tests and tagged others that are not working yet. In some feature files, the "old" and "new" public webdav API tests were split into separate scenarios, as OCIS doesn't support the old public webdav API.
owncloud · Jun 24, 2020 · cc8730b · cc8730b
1 parent 40f6c38
commit cc8730b
Show file tree

Hide file tree

Showing 9 changed files with 519 additions and 156 deletions.
diff --git a/tests/acceptance/features/apiSharePublicLink1/accessToPublicLinkShare.feature b/tests/acceptance/features/apiSharePublicLink1/accessToPublicLinkShare.feature
@@ -1,4 +1,4 @@
-@api @TestAlsoOnExternalUserBackend @public_link_share-feature-required @files_sharing-app-required @skipOnOcis @issue-ocis-reva-49
+@api @TestAlsoOnExternalUserBackend @public_link_share-feature-required @files_sharing-app-required @skipOnOcis @issue-ocis-reva-49 @issue-ocis-reva-282
 Feature: accessing a public link share
 
   Background:

diff --git a/tests/acceptance/features/apiSharePublicLink1/changingPublicLinkShare.feature b/tests/acceptance/features/apiSharePublicLink1/changingPublicLinkShare.feature
diff --git a/tests/acceptance/features/apiSharePublicLink1/createPublicLinkShare.feature b/tests/acceptance/features/apiSharePublicLink1/createPublicLinkShare.feature
diff --git a/tests/acceptance/features/apiSharePublicLink2/multilinkSharing.feature b/tests/acceptance/features/apiSharePublicLink2/multilinkSharing.feature
@@ -1,4 +1,4 @@
-@api @TestAlsoOnExternalUserBackend @public_link_share-feature-required @files_sharing-app-required @skipOnOcis @issue-ocis-reva-49
+@api @TestAlsoOnExternalUserBackend @public_link_share-feature-required @files_sharing-app-required @skipOnOcis @issue-ocis-reva-49 @issue-ocis-reva-288 @issue-ocis-reva-252
 Feature: multilinksharing
 
   Background:

diff --git a/tests/acceptance/features/apiSharePublicLink2/reShareAsPublicLink.feature b/tests/acceptance/features/apiSharePublicLink2/reShareAsPublicLink.feature
@@ -1,5 +1,5 @@
-@api @TestAlsoOnExternalUserBackend @files_sharing-app-required @public_link_share-feature-required @skipOnOcis @issue-ocis-reva-49
-@issue-ocis-reva-233 @issue-ocis-reva-243
+@api @TestAlsoOnExternalUserBackend @files_sharing-app-required @public_link_share-feature-required @skipOnOcis @issue-ocis-reva-49 @issue-ocis-reva-282
+@issue-ocis-reva-233 @issue-ocis-reva-243 @issue-ocis-reva-289
 Feature: reshare as public link
   As a user
   I want to create public link shares from files/folders shared with me

diff --git a/tests/acceptance/features/apiSharePublicLink2/updatePublicLinkShare.feature b/tests/acceptance/features/apiSharePublicLink2/updatePublicLinkShare.feature
@@ -1,4 +1,4 @@
-@api @TestAlsoOnExternalUserBackend @files_sharing-app-required @public_link_share-feature-required @skipOnOcis @issue-ocis-reva-49
+@api @TestAlsoOnExternalUserBackend @files_sharing-app-required @public_link_share-feature-required @skipOnOcis @issue-ocis-reva-252
 Feature: update a public link share
 
   Background:

diff --git a/tests/acceptance/features/apiSharePublicLink2/uploadToPublicLinkShare.feature b/tests/acceptance/features/apiSharePublicLink2/uploadToPublicLinkShare.feature
diff --git a/tests/acceptance/features/bootstrap/OCSContext.php b/tests/acceptance/features/bootstrap/OCSContext.php
@@ -583,19 +583,22 @@ public function userRequestsTheseEndpointsWithUsingThePasswordOfUser($asUser, $m
 	 * @throws Exception
 	 */
 	public function theOCSStatusCodeShouldBe($statusCode, $message = "") {
-		if ($message === "") {
-			$message = "OCS status code is not the expected value";
-		}
-
 		$responseStatusCode = $this->getOCSResponseStatusCode(
 			$this->featureContext->getResponse()
 		);
 		if (\is_array($statusCode)) {
+			if ($message === "") {
+				$message = "OCS status code is not any of the expected values " . \implode(",", $statusCode) . " got " . $responseStatusCode;
+			}
 			Assert::assertContainsEquals(
 				$responseStatusCode, $statusCode,
 				$message
 			);
 		} else {
+			if ($message === "") {
+				$message = "OCS status code is not the expected value " . $statusCode . " got " . $responseStatusCode;
+			}
+
 			Assert::assertEquals(
 				$statusCode, $responseStatusCode,
 				$message

diff --git a/tests/acceptance/features/bootstrap/Sharing.php b/tests/acceptance/features/bootstrap/Sharing.php
@@ -905,7 +905,7 @@ public function createShare(
 			$this->sharingApiVersion
 		);
 		$this->lastShareData = $this->getResponseXml();
-		if ($shareType === 'public_link') {
+		if ($shareType === 'public_link' && isset($this->lastShareData->data)) {
 			$linkName = (string) $this->lastShareData->data[0]->name;
 			$linkUrl = (string) $this->lastShareData->data[0]->url;
 			$this->addToListOfCreatedPublicLinks($linkName, $linkUrl);
@@ -929,6 +929,7 @@ public function doesFieldValueMatchExpectedContent(
 		if (($contentExpected === "ANY_VALUE")
 			|| (($contentExpected === "A_TOKEN") && (\strlen($value) === 15))
 			|| (($contentExpected === "A_NUMBER") && \is_numeric($value))
+			|| (($contentExpected === "A_STRING") && \is_string($value))
 			|| (($contentExpected === "AN_URL") && $this->isAPublicLinkUrl($value))
 			|| (($field === 'remote') && (\rtrim($value, "/") === $contentExpected))
 			|| ($contentExpected === $value)