From bbe4c75951b417fae5fc90ab048b73297a7f4711 Mon Sep 17 00:00:00 2001 From: "sagargurung1001@gmail.com" Date: Thu, 1 Sep 2022 14:28:53 +0545 Subject: [PATCH] Add commit and branch related to this PR to work --- .drone.env | 2 +- tests/acceptance/config/behat.yml | 1 + .../features/bootstrap/SpacesContext.php | 19 +++++++++++++++++-- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/.drone.env b/.drone.env index a80f33a3e07..40dc6e21642 100644 --- a/.drone.env +++ b/.drone.env @@ -1,5 +1,5 @@ # The test runner source for API tests -CORE_COMMITID=d8ed82769fc422c38d6f6bc21253a052eef5e239 +CORE_COMMITID=b51fb4c01f08763e023aece4f90308e07a7ac73f CORE_BRANCH=master # The test runner source for UI tests diff --git a/tests/acceptance/config/behat.yml b/tests/acceptance/config/behat.yml index 218518da225..2ec0d263056 100644 --- a/tests/acceptance/config/behat.yml +++ b/tests/acceptance/config/behat.yml @@ -61,6 +61,7 @@ default: - FilesVersionsContext: - OCSContext: - PublicWebDavContext: + - FavoritesContext: - TrashbinContext: - WebDavPropertiesContext: diff --git a/tests/acceptance/features/bootstrap/SpacesContext.php b/tests/acceptance/features/bootstrap/SpacesContext.php index c491c582ac9..ba0f0142464 100644 --- a/tests/acceptance/features/bootstrap/SpacesContext.php +++ b/tests/acceptance/features/bootstrap/SpacesContext.php @@ -269,6 +269,21 @@ public function getSpaceByName(string $user, string $spaceName): array { return $spaces[$spaceName]; } + /** + * This method sets space id by Space Name + * This is currently used to set space id from ocis in core so that we can reuse available resource (code) and avoid duplication + * + * @param string $user + * @param string $spaceName + * + * @return void + * @throws GuzzleException + */ + public function setSpaceIDByName(string $user, string $spaceName): void { + $space = $this->getSpaceByName($user,$spaceName); + WebDavHelper::$SPACE_ID_FROM_OCIS = $space['id']; + } + /** * The method finds available spaces to the manager user and returns the space by spaceName * @@ -3259,7 +3274,7 @@ public function asUserFileInsideSpaceShouldContainAPropertyWithValue( * @throws GuzzleException */ public function userFavoritesElementInSpaceUsingTheWebdavApi(string $user, string $path, string $spaceName): void { - $space = $this->getSpaceByName($user, $spaceName); - $this->favoritesContext->userFavoritesElement($user, $path, $space['id']); + $this->setSpaceIDByName($user, $spaceName); + $this->favoritesContext->userFavoritesElement($user, $path); } }