From c3e7687cd24c54d6a5b69076f6d79efb08d9d6b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Wed, 9 Jun 2021 10:43:50 +0200 Subject: [PATCH] Handle single action unshare MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- .../bootstrap/FilesAppSharingContext.php | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/tests/acceptance/features/bootstrap/FilesAppSharingContext.php b/tests/acceptance/features/bootstrap/FilesAppSharingContext.php index 07ebbba1a36..d8611ea5c05 100644 --- a/tests/acceptance/features/bootstrap/FilesAppSharingContext.php +++ b/tests/acceptance/features/bootstrap/FilesAppSharingContext.php @@ -218,6 +218,15 @@ class FilesAppSharingContext implements Context, ActorAwareInterface { describedAs("Share link menu trigger in the details view in Files app"); } + /** + * @return Locator + */ + public static function shareLinkSingleUnshareAction() { + return Locator::forThe()->css(".sharing-entry__actions.icon-close")-> + descendantOf(self::shareLinkRow())-> + describedAs("Unshare link single action in the details view in Files app"); + } + /** * @return Locator */ @@ -503,10 +512,13 @@ class FilesAppSharingContext implements Context, ActorAwareInterface { * @When I unshare the link share */ public function iUnshareTheLink() { - $this->showShareLinkMenuIfNeeded(); - - $shareLinkMenuTriggerElement = $this->actor->find(self::shareLinkMenuTrigger(), 2); - $this->actor->find(self::unshareLinkButton($shareLinkMenuTriggerElement), 2)->click(); + try { + $this->actor->find(self::shareLinkSingleUnshareAction(), 2)->click(); + } catch (NoSuchElementException $e) { + $this->showShareLinkMenuIfNeeded(); + $shareLinkMenuTriggerElement = $this->actor->find(self::shareLinkMenuTrigger(), 2); + $this->actor->find(self::unshareLinkButton($shareLinkMenuTriggerElement), 2)->click(); + } } /**