From a23ac76034c176d50148d14295fe8990fc48230d Mon Sep 17 00:00:00 2001 From: Sabin Date: Fri, 5 Apr 2024 12:39:57 +0545 Subject: [PATCH] changed wording of mount unmount to enable and disable sync --- tests/TestHelpers/GraphHelper.php | 4 +-- ...feature => enableDisableShareSync.feature} | 14 ++++---- .../features/bootstrap/SharingNgContext.php | 35 +++++++------------ 3 files changed, 21 insertions(+), 32 deletions(-) rename tests/acceptance/features/apiSharingNg/{mountOrUnmountShare.feature => enableDisableShareSync.feature} (89%) diff --git a/tests/TestHelpers/GraphHelper.php b/tests/TestHelpers/GraphHelper.php index 8e6ee0d5922..1f7cd7c69a2 100644 --- a/tests/TestHelpers/GraphHelper.php +++ b/tests/TestHelpers/GraphHelper.php @@ -1905,7 +1905,7 @@ public static function getSharesSharedByMe( * @return ResponseInterface * @throws GuzzleException */ - public static function unmountShare( + public static function disableShareSync( string $baseUrl, string $xRequestId, string $user, @@ -1934,7 +1934,7 @@ public static function unmountShare( * @return ResponseInterface * @throws GuzzleException */ - public static function mountShare( + public static function enableShareSync( string $baseUrl, string $xRequestId, string $user, diff --git a/tests/acceptance/features/apiSharingNg/mountOrUnmountShare.feature b/tests/acceptance/features/apiSharingNg/enableDisableShareSync.feature similarity index 89% rename from tests/acceptance/features/apiSharingNg/mountOrUnmountShare.feature rename to tests/acceptance/features/apiSharingNg/enableDisableShareSync.feature index 9439ffd4615..3dc198b10bd 100644 --- a/tests/acceptance/features/apiSharingNg/mountOrUnmountShare.feature +++ b/tests/acceptance/features/apiSharingNg/enableDisableShareSync.feature @@ -1,4 +1,4 @@ -Feature: mount or unmount incoming share +Feature: enable or disable sync of incoming shares As a user I want to have control over the share received So that I can filter out the files and folder shared with Me @@ -11,7 +11,7 @@ Feature: mount or unmount incoming share And using spaces DAV path - Scenario Outline: unmount shared resource + Scenario Outline: disable sync of shared resource And user "Alice" has created folder "FolderToShare" And user "Alice" has uploaded file with content "hello world" to "/textfile0.txt" And user "Alice" has sent the following share invitation: @@ -20,7 +20,7 @@ Feature: mount or unmount incoming share | sharee | Brian | | shareType | user | | permissionsRole | Viewer | - When user "Brian" unmounts share "" using the Graph API + When user "Brian" disables sync of share "" using the Graph API And user "Brian" lists the shares shared with him using the Graph API Then the HTTP status code of responses on all endpoints should be "200" And the JSON data of the response should match @@ -56,7 +56,7 @@ Feature: mount or unmount incoming share | FolderToShare | - Scenario Outline: mount shared resource when auto-sync is disabled + Scenario Outline: enable sync of shared resource when auto-sync is disabled Given user "Brian" has disabled the auto-sync share And user "Alice" has uploaded file with content "hello world" to "/textfile0.txt" And user "Alice" has created folder "folder" @@ -66,7 +66,7 @@ Feature: mount or unmount incoming share | sharee | Brian | | shareType | user | | permissionsRole | Viewer | - When user "Brian" mounts share "" offered by "Alice" from "Personal" space using the Graph API + When user "Brian" enables sync of share "" offered by "Alice" from "Personal" space using the Graph API Then the HTTP status code should be "201" And the JSON data of the response should match """ @@ -103,7 +103,7 @@ Feature: mount or unmount incoming share | sharee | grp1 | | shareType | group | | permissionsRole | Viewer | - When user "Alice" mounts share "" offered by "Carol" from "Personal" space using the Graph API + When user "Alice" enables sync of share "" offered by "Carol" from "Personal" space using the Graph API Then the HTTP status code should be "201" And the JSON data of the response should match """ @@ -140,7 +140,7 @@ Feature: mount or unmount incoming share | sharee | grp1 | | shareType | group | | permissionsRole | Viewer | - When user "Alice" unmounts share "" using the Graph API + When user "Alice" disables sync of share "" using the Graph API Then the HTTP status code should be "200" And user "Alice" should have sync disabled for share "" And user "Brian" should have sync enabled for share "" diff --git a/tests/acceptance/features/bootstrap/SharingNgContext.php b/tests/acceptance/features/bootstrap/SharingNgContext.php index a860d9fe48d..81e8185ad3a 100644 --- a/tests/acceptance/features/bootstrap/SharingNgContext.php +++ b/tests/acceptance/features/bootstrap/SharingNgContext.php @@ -561,15 +561,18 @@ public function forUserTheSpaceSharesShouldContainTheseEntries(string $user, str } /** + * @When user :user disables sync of share :share using the Graph API * * @param string $user - * @param string $itemId - * @param string $shareSpaceId * - * @return ResponseInterface + * @return void + * @throws Exception */ - public function unmountShare(string $user, string $itemId, string $shareSpaceId): ResponseInterface { - return GraphHelper::unmountShare( + public function userDisablesSyncOfShareUsingTheGraphApi(string $user):void { + $shareItemId = $this->featureContext->shareNgGetLastCreatedUserGroupShareID(); + $shareSpaceId = FeatureContext::SHARES_SPACE_ID; + $itemId = $shareSpaceId . '!' . $shareItemId; + $response = GraphHelper::disableShareSync( $this->featureContext->getBaseUrl(), $this->featureContext->getStepLineRef(), $this->featureContext->getActualUsername($user), @@ -577,26 +580,12 @@ public function unmountShare(string $user, string $itemId, string $shareSpaceId) $itemId, $shareSpaceId, ); - } - - /** - * @When user :user unmounts share :share using the Graph API - * - * @param string $user - * - * @return void - * @throws Exception - */ - public function userUnmountsShareUsingTheGraphApi(string $user):void { - $shareItemId = $this->featureContext->shareNgGetLastCreatedUserGroupShareID(); - $shareSpaceId = FeatureContext::SHARES_SPACE_ID; - $itemId = $shareSpaceId . '!' . $shareItemId; - $this->featureContext->setResponse($this->unmountShare($user, $itemId, $shareSpaceId)); + $this->featureContext->setResponse($response); $this->featureContext->pushToLastStatusCodesArrays(); } /** - * @When user :user mounts share :share offered by :offeredBy from :space space using the Graph API + * @When user :user enables sync of share :share offered by :offeredBy from :space space using the Graph API * * @param string $user * @param string $share @@ -606,11 +595,11 @@ public function userUnmountsShareUsingTheGraphApi(string $user):void { * @return void * @throws Exception */ - public function userMountsShareOfferedByFromSpaceUsingTheGraphApi(string $user, string $share, string $offeredBy, string $space):void { + public function userEnablesSyncOfShareUsingTheGraphApi(string $user, string $share, string $offeredBy, string $space):void { $share = ltrim($share, '/'); $itemId = $this->spacesContext->getResourceId($offeredBy, $space, $share); $shareSpaceId = FeatureContext::SHARES_SPACE_ID; - $response = GraphHelper::mountShare( + $response = GraphHelper::enableShareSync( $this->featureContext->getBaseUrl(), $this->featureContext->getStepLineRef(), $this->featureContext->getActualUsername($user),