move getting share_id from response to helper

owncloud · Feb 28, 2019 · 6089f49 · 6089f49
1 parent 80027fc
commit 6089f49
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 25 deletions.
diff --git a/tests/TestHelpers/SharingHelper.php b/tests/TestHelpers/SharingHelper.php
@@ -195,4 +195,24 @@ public static function getPermissionSum($permissions) {
 		}
 		return $permissionSum;
 	}
+
+	/**
+	 *
+	 * @param \SimpleXMLElement $responseXmlObject
+	 * @param string $errorMessage
+	 *
+	 * @throws \Exception
+	 *
+	 * @return string
+	 */
+	public static function getLastShareIdFromResponse(
+		$responseXmlObject, $errorMessage = "cannot find share id in response"
+	) {
+		$xmlPart = $responseXmlObject->xpath("//data/element[last()]/id");
+
+		if (!\is_array($xmlPart) || (\count($xmlPart) === 0)) {
+			throw new \Exception($errorMessage);
+		}
+		return $xmlPart[0]->__toString();
+	}
 }
diff --git a/tests/acceptance/features/apiFederation/federated.feature b/tests/acceptance/features/apiFederation/federated.feature
@@ -66,10 +66,10 @@ Feature: federated
       | mountpoint  | {{TemporaryMountPointName#/textfile0.txt}} |
       | accepted    | 0                                          |
 
-  Scenario: Remote sharee requests informations of only one share
+  Scenario: Remote sharee requests information of only one share
     Given user "user0" from server "REMOTE" has shared "/textfile0.txt" with user "user1" from server "LOCAL"
     And user "user1" from server "LOCAL" has accepted the last pending share
-    When user "user1" gets informations of last federated cloud share using the sharing API
+    When user "user1" retrieves the information of the last federated cloud share using the sharing API
     Then the OCS status code should be "100"
     And the HTTP status code should be "200"
     And the fields of the last response should include
@@ -86,9 +86,9 @@ Feature: federated
       | permissions | 27                 |
 
   @issue-34636
-  Scenario: Remote sharee requests informations of only one share before accepting it
+  Scenario: Remote sharee requests information of only one share before accepting it
     Given user "user0" from server "REMOTE" has shared "/textfile0.txt" with user "user1" from server "LOCAL"
-    When user "user1" gets informations of last pending federated cloud share using the sharing API
+    When user "user1" retrieves the information of the last pending federated cloud share using the sharing API
     Then the HTTP status code should be "200"
     And the body of the response should be empty
     #And the OCS status code should be "100"

diff --git a/tests/acceptance/features/bootstrap/FederationContext.php b/tests/acceptance/features/bootstrap/FederationContext.php
@@ -24,6 +24,7 @@
 
 use Behat\Behat\Context\Context;
 use Behat\Behat\Hook\Scope\BeforeScenarioScope;
+use TestHelpers\SharingHelper;
 
 require_once 'bootstrap.php';
 
@@ -105,7 +106,9 @@ public function userFromServerAcceptsLastPendingShareUsingTheSharingAPI($user, $
 		$this->userGetsTheListOfPendingFederatedCloudShares($user);
 		$this->featureContext->theHTTPStatusCodeShouldBe('200');
 		$this->featureContext->theOCSStatusCodeShouldBe('100');
-		$share_id = $this->featureContext->getResponseXml()->data[0]->element[0]->id;
+		$share_id = SharingHelper::getLastShareIdFromResponse(
+			$this->featureContext->getResponseXml()
+		);
 		$this->featureContext->theUserSendsToOcsApiEndpointWithBody(
 			'POST',
 			"/apps/files_sharing/api/v1/remote_shares/pending/{$share_id}",
@@ -131,13 +134,13 @@ public function userFromServerHasAcceptedLastPendingShare($user, $server) {
 	}
 
 	/**
-	 * @When /^user "([^"]*)" gets informations of last federated cloud share using the sharing API$/
+	 * @When /^user "([^"]*)" retrieves the information of the last federated cloud share using the sharing API$/
 	 *
 	 * @param string $user
 	 *
 	 * @return void
 	 */
-	public function userGetsInformationOfLastFederatedCloudShare($user) {
+	public function userRetrievesInformationOfLastFederatedShare($user) {
 		$this->featureContext->userSendsHTTPMethodToOcsApiEndpointWithBody(
 			$user,
 			'GET',
@@ -146,13 +149,9 @@ public function userGetsInformationOfLastFederatedCloudShare($user) {
 		);
 		$this->featureContext->theHTTPStatusCodeShouldBe('200');
 		$this->featureContext->theOCSStatusCodeShouldBe('100');
-		$xmlObject = $this->featureContext->getResponseXml();
-		$xmlPart = $xmlObject->xpath("//data/element[last()]/id");
-
-		if (!\is_array($xmlPart) || (\count($xmlPart) === 0)) {
-			throw new \Exception("cannot find share id in remote shares response");
-		}
-		$share_id = $xmlPart[0]->__toString();
+		$share_id = SharingHelper::getLastShareIdFromResponse(
+			$this->featureContext->getResponseXml()
+		);
 		$this->featureContext->userSendsHTTPMethodToOcsApiEndpointWithBody(
 			$user,
 			'GET',
@@ -162,25 +161,19 @@ public function userGetsInformationOfLastFederatedCloudShare($user) {
 	}
 
 	/**
-	 * @When /^user "([^"]*)" gets informations of last pending federated cloud share using the sharing API$/
+	 * @When /^user "([^"]*)" retrieves the information of the last pending federated cloud share using the sharing API$/
 	 *
 	 * @param string $user
 	 *
 	 * @return void
 	 */
-	public function userGetsInformationOfLastPendingFederatedCloudShare($user) {
+	public function userRetrievesInformationOfLastPendingFederatedShare($user) {
 		$this->userGetsTheListOfPendingFederatedCloudShares($user);
 		$this->featureContext->theHTTPStatusCodeShouldBe('200');
 		$this->featureContext->theOCSStatusCodeShouldBe('100');
-		$xmlObject = $this->featureContext->getResponseXml();
-		$xmlPart = $xmlObject->xpath("//data/element[last()]/id");
-
-		if (!\is_array($xmlPart) || (\count($xmlPart) === 0)) {
-			throw new \Exception(
-				"cannot find share id in pending remote shares response"
-			);
-		}
-		$share_id = $xmlPart[0]->__toString();
+		$share_id = SharingHelper::getLastShareIdFromResponse(
+			$this->featureContext->getResponseXml()
+		);
 		$this->featureContext->userSendsHTTPMethodToOcsApiEndpointWithBody(
 			$user,
 			'GET',