From 971c5482566e029c45b7c7ef9735a7f73a7eb702 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Calvi=C3=B1o=20S=C3=A1nchez?= Date: Thu, 22 Nov 2018 18:56:15 +0100 Subject: [PATCH 1/9] Add acceptance tests for sharing a file with another user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Daniel Calviño Sánchez --- tests/acceptance/features/app-files.feature | 56 ++++++++++++ .../features/bootstrap/FilesAppContext.php | 87 +++++++++++++++++++ 2 files changed, 143 insertions(+) diff --git a/tests/acceptance/features/app-files.feature b/tests/acceptance/features/app-files.feature index 89d622493c0bc..8c2339079105f 100644 --- a/tests/acceptance/features/app-files.feature +++ b/tests/acceptance/features/app-files.feature @@ -265,6 +265,62 @@ Feature: app-files # download starts no page redirection And I see that the current page is the Authenticate page for the direct download shared link I wrote down + Scenario: share a file with another user + Given I act as John + And I am logged in as the admin + And I act as Jane + And I am logged in + And I act as John + And I rename "welcome.txt" to "farewell.txt" + And I see that the file list contains a file named "farewell.txt" + When I share "farewell.txt" with "user0" + And I see that the file is shared with "user0" + And I act as Jane + # The Files app is open again to reload the file list + And I open the Files app + Then I see that the file list contains a file named "farewell.txt" + And I open the details view for "farewell.txt" + And I see that the details view is open + And I open the "Sharing" tab in the details view + And I see that the "Sharing" tab in the details view is eventually loaded + And I see that the file is shared with me by "admin" + + Scenario: share a file with another user who already has a file with that name + Given I act as John + And I am logged in as the admin + And I act as Jane + And I am logged in + And I act as John + When I share "welcome.txt" with "user0" + And I see that the file is shared with "user0" + And I act as Jane + # The Files app is open again to reload the file list + And I open the Files app + Then I see that the file list contains a file named "welcome (2).txt" + And I open the details view for "welcome (2).txt" + And I see that the details view is open + And I open the "Sharing" tab in the details view + And I see that the "Sharing" tab in the details view is eventually loaded + And I see that the file is shared with me by "admin" + + Scenario: share a skeleton file with another user before first login + # If a file is shared with a user before her first login the skeleton would + # not have been created, so if the shared file has the same name as one from + # the skeleton the shared file will take its place and the skeleton file + # will not be added. + Given I act as John + And I am logged in as the admin + When I share "welcome.txt" with "user0" + And I see that the file is shared with "user0" + And I act as Jane + And I am logged in + Then I see that the file list contains a file named "welcome.txt" + And I open the details view for "welcome.txt" + And I see that the details view is open + And I open the "Sharing" tab in the details view + And I see that the "Sharing" tab in the details view is eventually loaded + And I see that the file is shared with me by "admin" + Scenario: marking a file as favorite causes the file list to be sorted again Given I am logged in And I create a new folder named "A name alphabetically lower than welcome.txt" diff --git a/tests/acceptance/features/bootstrap/FilesAppContext.php b/tests/acceptance/features/bootstrap/FilesAppContext.php index 8758678494128..d67bcc51400b2 100644 --- a/tests/acceptance/features/bootstrap/FilesAppContext.php +++ b/tests/acceptance/features/bootstrap/FilesAppContext.php @@ -42,6 +42,23 @@ public static function sections() { "Deleted files" => "trashbin" ]; } + /** + * @return Locator + */ + private static function appMenu() { + return Locator::forThe()->id("appmenu")-> + describedAs("App menu in header"); + } + + /** + * @return Locator + */ + public static function filesItemInAppMenu() { + return Locator::forThe()->xpath("/li[@data-id = 'files']")-> + descendantOf(self::appMenu())-> + describedAs("Files item in app menu in header"); + } + /** * @return Locator */ @@ -211,6 +228,44 @@ public static function loadingIconForTabInDetailsViewNamed($tabName) { describedAs("Loading icon for tab named $tabName in details view in Files app"); } + /** + * @return Locator + */ + public static function sharedByLabel() { + return Locator::forThe()->css(".reshare")-> + descendantOf(self::detailsView())-> + describedAs("Shared by label in the details view in Files app"); + } + + /** + * @return Locator + */ + public static function shareWithInput() { + return Locator::forThe()->css(".shareWithField")-> + descendantOf(self::detailsView())-> + describedAs("Share with input in the details view in Files app"); + } + + /** + * @return Locator + */ + public static function shareeList() { + return Locator::forThe()->css(".shareeListView")-> + descendantOf(self::detailsView())-> + describedAs("Sharee list in the details view in Files app"); + } + + /** + * @return Locator + */ + public static function sharedWithRow($sharedWithName) { + // "username" class is used for any type of share, not only for shares + // with users. + return Locator::forThe()->xpath("//span[contains(concat(' ', normalize-space(@class), ' '), ' username ') and normalize-space() = '$sharedWithName']/ancestor::li")-> + descendantOf(self::shareeList())-> + describedAs("Shared with $sharedWithName row in the details view in Files app"); + } + /** * @return Locator */ @@ -299,6 +354,13 @@ public static function passwordProtectWorkingIcon() { describedAs("Password protect working icon in the details view in Files app"); } + /** + * @Given I open the Files app + */ + public function iOpenTheFilesApp() { + $this->actor->find(self::filesItemInAppMenu(), 10)->click(); + } + /** * @Given I close the details view */ @@ -329,6 +391,15 @@ public function iShareTheLinkFor($fileName) { $this->actor->find(self::shareLinkCheckbox(), 5)->click(); } + /** + * @Given I share :fileName with :shareWithName + */ + public function iShareWith($fileName, $shareWithName) { + $this->actor->find(FileListContext::shareActionForFile(self::currentSectionMainView(), $fileName), 10)->click(); + + $this->actor->find(self::shareWithInput(), 5)->setValue($shareWithName . "\r"); + } + /** * @Given I write down the shared link */ @@ -521,6 +592,22 @@ public function iSeeThatTheTabInTheDetailsViewIsEventuallyLoaded($tabName) { } } + /** + * @Then I see that the file is shared with me by :sharedByName + */ + public function iSeeThatTheFileIsSharedWithMeBy($sharedByName) { + PHPUnit_Framework_Assert::assertEquals( + $this->actor->find(self::sharedByLabel(), 10)->getText(), "Shared with you by $sharedByName"); + } + + /** + * @Then I see that the file is shared with :sharedWithName + */ + public function iSeeThatTheFileIsSharedWith($sharedWithName) { + PHPUnit_Framework_Assert::assertTrue( + $this->actor->find(self::sharedWithRow($sharedWithName), 10)->isVisible()); + } + /** * @Then I see that the working icon for password protect is shown */ From 2a27481e2fdc313589227356d1179063037a617f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Calvi=C3=B1o=20S=C3=A1nchez?= Date: Fri, 23 Nov 2018 12:24:38 +0100 Subject: [PATCH 2/9] Add acceptance tests for sharing a folder with another user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Daniel Calviño Sánchez --- tests/acceptance/features/app-files.feature | 59 +++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/tests/acceptance/features/app-files.feature b/tests/acceptance/features/app-files.feature index 8c2339079105f..3c7c64cef27e6 100644 --- a/tests/acceptance/features/app-files.feature +++ b/tests/acceptance/features/app-files.feature @@ -321,6 +321,65 @@ Feature: app-files And I see that the "Sharing" tab in the details view is eventually loaded And I see that the file is shared with me by "admin" + Scenario: share an empty folder with another user + Given I act as John + And I am logged in as the admin + And I act as Jane + And I am logged in + And I act as John + And I create a new folder named "Shared folder" + And I see that the file list contains a file named "Shared folder" + When I share "Shared folder" with "user0" + And I see that the file is shared with "user0" + And I act as Jane + # The Files app is open again to reload the file list + And I open the Files app + Then I see that the file list contains a file named "Shared folder" + And I open the details view for "Shared folder" + And I see that the details view is open + And I open the "Sharing" tab in the details view + And I see that the "Sharing" tab in the details view is eventually loaded + And I see that the file is shared with me by "admin" + + Scenario: sharee sees a folder created by the owner in a shared folder + Given I act as John + And I am logged in as the admin + And I act as Jane + And I am logged in + And I act as John + And I create a new folder named "Shared folder" + And I see that the file list contains a file named "Shared folder" + And I share "Shared folder" with "user0" + And I see that the file is shared with "user0" + And I enter in the folder named "Shared folder" + And I create a new folder named "Subfolder" + And I see that the file list contains a file named "Subfolder" + When I act as Jane + # The Files app is open again to reload the file list + And I open the Files app + And I enter in the folder named "Shared folder" + Then I see that the file list contains a file named "Subfolder" + + Scenario: owner sees a folder created by the sharee in a shared folder + Given I act as John + And I am logged in as the admin + And I act as Jane + And I am logged in + And I act as John + And I create a new folder named "Shared folder" + And I see that the file list contains a file named "Shared folder" + And I share "Shared folder" with "user0" + And I see that the file is shared with "user0" + And I act as Jane + # The Files app is open again to reload the file list + And I open the Files app + And I enter in the folder named "Shared folder" + And I create a new folder named "Subfolder" + And I see that the file list contains a file named "Subfolder" + When I act as John + And I enter in the folder named "Shared folder" + Then I see that the file list contains a file named "Subfolder" + Scenario: marking a file as favorite causes the file list to be sorted again Given I am logged in And I create a new folder named "A name alphabetically lower than welcome.txt" From fd4e10e056299d0590f7025fa2030ad7c60b9b54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Calvi=C3=B1o=20S=C3=A1nchez?= Date: Fri, 23 Nov 2018 12:29:30 +0100 Subject: [PATCH 3/9] Add acceptance test for resharing a file with another user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit To reshare a file there must be at least three enabled users in the system; although it would be possible to run the steps to create a third user in the scenarios that need it for convenience a third enabled user besides "admin" and "user0" was added to the default setup. In a similar way, a new step was added too to login as a given user name, similar to the steps to log in as "user0" and as "admin". Finally, another actor, "Jim", was introduced for those scenarios which should be played by three standard actors (that is, without a special configuration like "Rubeus"). Signed-off-by: Daniel Calviño Sánchez --- tests/acceptance/config/behat.yml | 3 +++ tests/acceptance/features/app-files.feature | 27 +++++++++++++++++++ .../features/bootstrap/LoginPageContext.php | 9 +++++++ tests/acceptance/installAndConfigureServer.sh | 1 + 4 files changed, 40 insertions(+) diff --git a/tests/acceptance/config/behat.yml b/tests/acceptance/config/behat.yml index d1489a00864a0..3108ea41407ee 100644 --- a/tests/acceptance/config/behat.yml +++ b/tests/acceptance/config/behat.yml @@ -63,6 +63,9 @@ default: Jane: selenium2: wd_host: %selenium.server% + Jim: + selenium2: + wd_host: %selenium.server% Rubeus: # Rubeus uses a browser that has CSS grid support. selenium2: diff --git a/tests/acceptance/features/app-files.feature b/tests/acceptance/features/app-files.feature index 3c7c64cef27e6..ab4131357ed85 100644 --- a/tests/acceptance/features/app-files.feature +++ b/tests/acceptance/features/app-files.feature @@ -321,6 +321,33 @@ Feature: app-files And I see that the "Sharing" tab in the details view is eventually loaded And I see that the file is shared with me by "admin" + Scenario: reshare a file with another user + Given I act as John + And I am logged in as the admin + And I act as Jane + And I am logged in + And I act as Jim + And I am logged in as "user1" + And I act as John + And I rename "welcome.txt" to "farewell.txt" + And I see that the file list contains a file named "farewell.txt" + And I share "farewell.txt" with "user0" + And I see that the file is shared with "user0" + And I act as Jane + # The Files app is open again to reload the file list + And I open the Files app + When I share "farewell.txt" with "user1" + And I see that the file is shared with "user1" + And I act as Jim + # The Files app is open again to reload the file list + And I open the Files app + Then I see that the file list contains a file named "farewell.txt" + And I open the details view for "farewell.txt" + And I see that the details view is open + And I open the "Sharing" tab in the details view + And I see that the "Sharing" tab in the details view is eventually loaded + And I see that the file is shared with me by "user0" + Scenario: share an empty folder with another user Given I act as John And I am logged in as the admin diff --git a/tests/acceptance/features/bootstrap/LoginPageContext.php b/tests/acceptance/features/bootstrap/LoginPageContext.php index df7944aa912f9..048d23d92953d 100644 --- a/tests/acceptance/features/bootstrap/LoginPageContext.php +++ b/tests/acceptance/features/bootstrap/LoginPageContext.php @@ -131,6 +131,15 @@ public function iAmLoggedIn() { $this->filesAppContext->iSeeThatTheCurrentPageIsTheFilesApp(); } + /** + * @Given I am logged in as :userName + */ + public function iAmLoggedInAs($userName) { + $this->featureContext->iVisitTheHomePage(); + $this->iLogInWithUserAndPassword($userName, "123456acb"); + $this->filesAppContext->iSeeThatTheCurrentPageIsTheFilesApp(); + } + /** * @Given I am logged in as the admin */ diff --git a/tests/acceptance/installAndConfigureServer.sh b/tests/acceptance/installAndConfigureServer.sh index 98de72bf45ef2..d24405fa448f7 100755 --- a/tests/acceptance/installAndConfigureServer.sh +++ b/tests/acceptance/installAndConfigureServer.sh @@ -35,6 +35,7 @@ fi php occ maintenance:install --admin-pass=admin OC_PASS=123456acb php occ user:add --password-from-env user0 +OC_PASS=123456acb php occ user:add --password-from-env user1 OC_PASS=123456acb php occ user:add --password-from-env disabledUser php occ user:disable disabledUser From 792863ed104b8f3d5a994d42ed0773eb9bb3e8d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Calvi=C3=B1o=20S=C3=A1nchez?= Date: Fri, 23 Nov 2018 12:30:30 +0100 Subject: [PATCH 4/9] Add acceptance test for checking that the owner can see reshares MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Daniel Calviño Sánchez --- tests/acceptance/features/app-files.feature | 25 +++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/tests/acceptance/features/app-files.feature b/tests/acceptance/features/app-files.feature index ab4131357ed85..b95e3360115f1 100644 --- a/tests/acceptance/features/app-files.feature +++ b/tests/acceptance/features/app-files.feature @@ -348,6 +348,31 @@ Feature: app-files And I see that the "Sharing" tab in the details view is eventually loaded And I see that the file is shared with me by "user0" + Scenario: owner sees reshares with other users + Given I act as John + And I am logged in as the admin + And I act as Jane + And I am logged in + And I act as John + And I rename "welcome.txt" to "farewell.txt" + And I see that the file list contains a file named "farewell.txt" + And I share "farewell.txt" with "user0" + And I see that the file is shared with "user0" + And I act as Jane + # The Files app is open again to reload the file list + And I open the Files app + And I share "farewell.txt" with "user1" + And I see that the file is shared with "user1" + When I act as John + # The Files app is open again to reload the file list and the shares + And I open the Files app + And I open the details view for "farewell.txt" + And I see that the details view is open + And I open the "Sharing" tab in the details view + And I see that the "Sharing" tab in the details view is eventually loaded + Then I see that the file is shared with "user0" + And I see that the file is shared with "user1" + Scenario: share an empty folder with another user Given I act as John And I am logged in as the admin From 708e40e303bbde5965abbe67df9e6073ef49e12a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Calvi=C3=B1o=20S=C3=A1nchez?= Date: Fri, 23 Nov 2018 12:52:07 +0100 Subject: [PATCH 5/9] Add acceptance tests for resharing a folder with another user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Daniel Calviño Sánchez --- tests/acceptance/features/app-files.feature | 52 +++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/tests/acceptance/features/app-files.feature b/tests/acceptance/features/app-files.feature index b95e3360115f1..0854cc524fbc0 100644 --- a/tests/acceptance/features/app-files.feature +++ b/tests/acceptance/features/app-files.feature @@ -432,6 +432,58 @@ Feature: app-files And I enter in the folder named "Shared folder" Then I see that the file list contains a file named "Subfolder" + Scenario: resharee sees a folder created by the owner in a shared folder + Given I act as John + And I am logged in as the admin + And I act as Jane + And I am logged in + And I act as Jim + And I am logged in as "user1" + And I act as John + And I create a new folder named "Shared folder" + And I see that the file list contains a file named "Shared folder" + And I share "Shared folder" with "user0" + And I see that the file is shared with "user0" + And I act as Jane + # The Files app is open again to reload the file list + And I open the Files app + And I share "Shared folder" with "user1" + And I act as John + And I enter in the folder named "Shared folder" + And I create a new folder named "Subfolder" + And I see that the file list contains a file named "Subfolder" + When I act as Jim + # The Files app is open again to reload the file list + And I open the Files app + And I enter in the folder named "Shared folder" + Then I see that the file list contains a file named "Subfolder" + + Scenario: owner sees a folder created by the resharee in a shared folder + Given I act as John + And I am logged in as the admin + And I act as Jane + And I am logged in + And I act as Jim + And I am logged in as "user1" + And I act as John + And I create a new folder named "Shared folder" + And I see that the file list contains a file named "Shared folder" + And I share "Shared folder" with "user0" + And I see that the file is shared with "user0" + And I act as Jane + # The Files app is open again to reload the file list + And I open the Files app + And I share "Shared folder" with "user1" + And I act as Jim + # The Files app is open again to reload the file list + And I open the Files app + And I enter in the folder named "Shared folder" + And I create a new folder named "Subfolder" + And I see that the file list contains a file named "Subfolder" + When I act as John + And I enter in the folder named "Shared folder" + Then I see that the file list contains a file named "Subfolder" + Scenario: marking a file as favorite causes the file list to be sorted again Given I am logged in And I create a new folder named "A name alphabetically lower than welcome.txt" From fca154d1e0e2683e50bdc8ead71f407cdfd7f124 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Calvi=C3=B1o=20S=C3=A1nchez?= Date: Fri, 23 Nov 2018 12:56:52 +0100 Subject: [PATCH 6/9] Add acceptance tests for folders that can not be reshared MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Daniel Calviño Sánchez --- tests/acceptance/features/app-files.feature | 49 ++++++++++ .../features/bootstrap/FilesAppContext.php | 93 +++++++++++++++++++ 2 files changed, 142 insertions(+) diff --git a/tests/acceptance/features/app-files.feature b/tests/acceptance/features/app-files.feature index 0854cc524fbc0..863f12fc443d2 100644 --- a/tests/acceptance/features/app-files.feature +++ b/tests/acceptance/features/app-files.feature @@ -484,6 +484,55 @@ Feature: app-files And I enter in the folder named "Shared folder" Then I see that the file list contains a file named "Subfolder" + Scenario: sharee can not reshare a folder if the sharer disables it + Given I act as John + And I am logged in as the admin + And I act as Jane + And I am logged in + And I act as John + And I create a new folder named "Shared folder" + And I see that the file list contains a file named "Shared folder" + And I share "Shared folder" with "user0" + And I see that the file is shared with "user0" + And I set the share with "user0" as not reshareable + And I see that "user0" can not reshare the share + When I act as Jane + # The Files app is open again to reload the file list + And I open the Files app + Then I see that the file list contains a file named "Shared folder" + And I open the details view for "Shared folder" + And I see that the details view is open + And I open the "Sharing" tab in the details view + And I see that the "Sharing" tab in the details view is eventually loaded + And I see that the file is shared with me by "admin" + And I see that resharing the file is not allowed + + Scenario: sharee can not reshare a subfolder if the sharer disables it for the parent folder + Given I act as John + And I am logged in as the admin + And I act as Jane + And I am logged in + And I act as John + And I create a new folder named "Shared folder" + And I see that the file list contains a file named "Shared folder" + And I share "Shared folder" with "user0" + And I see that the file is shared with "user0" + And I set the share with "user0" as not reshareable + And I see that "user0" can not reshare the share + And I enter in the folder named "Shared folder" + And I create a new folder named "Subfolder" + And I see that the file list contains a file named "Subfolder" + When I act as Jane + # The Files app is open again to reload the file list + And I open the Files app + And I enter in the folder named "Shared folder" + Then I see that the file list contains a file named "Subfolder" + And I open the details view for "Subfolder" + And I see that the details view is open + And I open the "Sharing" tab in the details view + And I see that the "Sharing" tab in the details view is eventually loaded + And I see that resharing the file is not allowed + Scenario: marking a file as favorite causes the file list to be sorted again Given I am logged in And I create a new folder named "A name alphabetically lower than welcome.txt" diff --git a/tests/acceptance/features/bootstrap/FilesAppContext.php b/tests/acceptance/features/bootstrap/FilesAppContext.php index d67bcc51400b2..6555f483fe3f9 100644 --- a/tests/acceptance/features/bootstrap/FilesAppContext.php +++ b/tests/acceptance/features/bootstrap/FilesAppContext.php @@ -266,6 +266,45 @@ public static function sharedWithRow($sharedWithName) { describedAs("Shared with $sharedWithName row in the details view in Files app"); } + /** + * @return Locator + */ + public static function shareWithMenuButton($sharedWithName) { + return Locator::forThe()->css(".share-menu > .icon")-> + descendantOf(self::sharedWithRow($sharedWithName))-> + describedAs("Share with $sharedWithName menu button in the details view in Files app"); + } + + /** + * @return Locator + */ + public static function shareWithMenu($sharedWithName) { + return Locator::forThe()->css(".share-menu > .menu")-> + descendantOf(self::sharedWithRow($sharedWithName))-> + describedAs("Share with $sharedWithName menu in the details view in Files app"); + } + + /** + * @return Locator + */ + public static function canReshareCheckbox($sharedWithName) { + // forThe()->checkbox("Can reshare") can not be used here; that would + // return the checkbox itself, but the element that the user interacts + // with is the label. + return Locator::forThe()->xpath("//label[normalize-space() = 'Can reshare']")-> + descendantOf(self::shareWithMenu($sharedWithName))-> + describedAs("Can reshare checkbox in the share with $sharedWithName menu in the details view in Files app"); + } + + /** + * @return Locator + */ + public static function canReshareCheckboxInput($sharedWithName) { + return Locator::forThe()->checkbox("Can reshare")-> + descendantOf(self::shareWithMenu($sharedWithName))-> + describedAs("Can reshare checkbox input in the share with $sharedWithName menu in the details view in Files app"); + } + /** * @return Locator */ @@ -470,6 +509,17 @@ public function iProtectTheSharedLinkWithThePassword($password) { $this->actor->find(self::passwordProtectField(), 2)->setValue($password . "\r"); } + /** + * @When I set the share with :shareWithName as not reshareable + */ + public function iSetTheShareWithAsNotReshareable($shareWithName) { + $this->showShareWithMenuIfNeeded($shareWithName); + + $this->iSeeThatCanReshareTheShare($shareWithName); + + $this->actor->find(self::canReshareCheckbox($shareWithName), 2)->click(); + } + /** * @Then I see that the current page is the Files app */ @@ -608,6 +658,36 @@ public function iSeeThatTheFileIsSharedWith($sharedWithName) { $this->actor->find(self::sharedWithRow($sharedWithName), 10)->isVisible()); } + /** + * @Then I see that resharing the file is not allowed + */ + public function iSeeThatResharingTheFileIsNotAllowed() { + PHPUnit_Framework_Assert::assertEquals( + $this->actor->find(self::shareWithInput(), 10)->getWrappedElement()->getAttribute("disabled"), "disabled"); + PHPUnit_Framework_Assert::assertEquals( + $this->actor->find(self::shareWithInput(), 10)->getWrappedElement()->getAttribute("placeholder"), "Resharing is not allowed"); + } + + /** + * @Then I see that :sharedWithName can reshare the share + */ + public function iSeeThatCanReshareTheShare($sharedWithName) { + $this->showShareWithMenuIfNeeded($sharedWithName); + + PHPUnit_Framework_Assert::assertTrue( + $this->actor->find(self::canReshareCheckboxInput($sharedWithName), 10)->isChecked()); + } + + /** + * @Then I see that :sharedWithName can not reshare the share + */ + public function iSeeThatCanNotReshareTheShare($sharedWithName) { + $this->showShareWithMenuIfNeeded($sharedWithName); + + PHPUnit_Framework_Assert::assertFalse( + $this->actor->find(self::canReshareCheckboxInput($sharedWithName), 10)->isChecked()); + } + /** * @Then I see that the working icon for password protect is shown */ @@ -650,4 +730,17 @@ private function showShareLinkMenuIfNeeded() { } } + private function showShareWithMenuIfNeeded($shareWithName) { + // In some cases the share menu is hidden after clicking on an action of + // the menu. Therefore, if the menu is visible, wait a little just in + // case it is in the process of being hidden due to a previous action, + // in which case it is shown again. + if (WaitFor::elementToBeEventuallyNotShown( + $this->actor, + self::shareWithMenu($shareWithName), + $timeout = 2 * $this->actor->getFindTimeoutMultiplier())) { + $this->actor->find(self::shareWithMenuButton($shareWithName), 10)->click(); + } + } + } From 2af399f0ae1916474d6a4981b3b1ca1d3324df67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Calvi=C3=B1o=20S=C3=A1nchez?= Date: Fri, 23 Nov 2018 13:06:15 +0100 Subject: [PATCH 7/9] Extract sharing related acceptance tests to their own feature files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Daniel Calviño Sánchez --- .drone.yml | 18 + .../features/app-files-sharing-link.feature | 119 ++++++ .../features/app-files-sharing.feature | 269 ++++++++++++ tests/acceptance/features/app-files.feature | 386 ------------------ 4 files changed, 406 insertions(+), 386 deletions(-) create mode 100644 tests/acceptance/features/app-files-sharing-link.feature create mode 100644 tests/acceptance/features/app-files-sharing.feature diff --git a/.drone.yml b/.drone.yml index 5eb61a28781b4..4e56c58b03919 100644 --- a/.drone.yml +++ b/.drone.yml @@ -678,6 +678,20 @@ pipeline: when: matrix: TESTS-ACCEPTANCE: app-files + acceptance-app-files-sharing: + image: nextcloudci/acceptance-php7.1:acceptance-php7.1-2 + commands: + - tests/acceptance/run-local.sh --timeout-multiplier 10 --nextcloud-server-domain acceptance-app-files-sharing --selenium-server selenium:4444 allow-git-repository-modifications features/app-files-sharing.feature + when: + matrix: + TESTS-ACCEPTANCE: app-files-sharing + acceptance-app-files-sharing-link: + image: nextcloudci/acceptance-php7.1:acceptance-php7.1-2 + commands: + - tests/acceptance/run-local.sh --timeout-multiplier 10 --nextcloud-server-domain acceptance-app-files-sharing-link --selenium-server selenium:4444 allow-git-repository-modifications features/app-files-sharing-link.feature + when: + matrix: + TESTS-ACCEPTANCE: app-files-sharing-link acceptance-app-files-tags: image: nextcloudci/acceptance-php7.1:acceptance-php7.1-2 commands: @@ -928,6 +942,10 @@ matrix: TESTS-ACCEPTANCE: app-comments - TESTS: acceptance TESTS-ACCEPTANCE: app-files + - TESTS: acceptance + TESTS-ACCEPTANCE: app-files-sharing + - TESTS: acceptance + TESTS-ACCEPTANCE: app-files-sharing-link - TESTS: acceptance TESTS-ACCEPTANCE: app-files-tags - TESTS: acceptance diff --git a/tests/acceptance/features/app-files-sharing-link.feature b/tests/acceptance/features/app-files-sharing-link.feature new file mode 100644 index 0000000000000..1bebf7f500922 --- /dev/null +++ b/tests/acceptance/features/app-files-sharing-link.feature @@ -0,0 +1,119 @@ +Feature: app-files-sharing-link + + Scenario: open the menu in a public shared link + Given I act as John + And I am logged in + And I share the link for "welcome.txt" + And I write down the shared link + When I act as Jane + And I visit the shared link I wrote down + And I see that the current page is the shared link I wrote down + And I open the Share menu + Then I see that the Share menu is shown + + Scenario: creation is not possible by default in a public shared folder + Given I act as John + And I am logged in + And I create a new folder named "Shared folder" + # To share the link the "Share" inline action has to be clicked but, as the + # details view is opened automatically when the folder is created, clicking + # on the inline action could fail if it is covered by the details view due + # to its opening animation. Instead of ensuring that the animations of the + # contents and the details view have both finished it is easier to close the + # details view and wait until it is closed before continuing. + And I close the details view + And I see that the details view is closed + And I share the link for "Shared folder" + And I write down the shared link + When I act as Jane + And I visit the shared link I wrote down + And I see that the current page is the shared link I wrote down + And I see that the file list is eventually loaded + Then I see that it is not possible to create new files + + Scenario: create folder in a public editable shared folder + Given I act as John + And I am logged in + And I create a new folder named "Editable shared folder" + # To share the link the "Share" inline action has to be clicked but, as the + # details view is opened automatically when the folder is created, clicking + # on the inline action could fail if it is covered by the details view due + # to its opening animation. Instead of ensuring that the animations of the + # contents and the details view have both finished it is easier to close the + # details view and wait until it is closed before continuing. + And I close the details view + And I see that the details view is closed + And I share the link for "Editable shared folder" + And I set the shared link as editable + And I write down the shared link + When I act as Jane + And I visit the shared link I wrote down + And I see that the current page is the shared link I wrote down + And I create a new folder named "Subfolder" + Then I see that the file list contains a file named "Subfolder" + + Scenario: owner sees folder created in the public page of an editable shared folder + Given I act as John + And I am logged in + And I create a new folder named "Editable shared folder" + # To share the link the "Share" inline action has to be clicked but, as the + # details view is opened automatically when the folder is created, clicking + # on the inline action could fail if it is covered by the details view due + # to its opening animation. Instead of ensuring that the animations of the + # contents and the details view have both finished it is easier to close the + # details view and wait until it is closed before continuing. + And I close the details view + And I see that the details view is closed + And I share the link for "Editable shared folder" + And I set the shared link as editable + And I write down the shared link + And I act as Jane + And I visit the shared link I wrote down + And I see that the current page is the shared link I wrote down + And I create a new folder named "Subfolder" + And I see that the file list contains a file named "Subfolder" + When I act as John + And I enter in the folder named "Editable shared folder" + Then I see that the file list contains a file named "Subfolder" + + Scenario: set a password to a shared link + Given I am logged in + And I share the link for "welcome.txt" + When I protect the shared link with the password "abcdef" + Then I see that the working icon for password protect is shown + And I see that the working icon for password protect is eventually not shown + + Scenario: access a shared link protected by password with a valid password + Given I act as John + And I am logged in + And I share the link for "welcome.txt" protected by the password "abcdef" + And I write down the shared link + When I act as Jane + And I visit the shared link I wrote down + And I see that the current page is the Authenticate page for the shared link I wrote down + And I authenticate with password "abcdef" + Then I see that the current page is the shared link I wrote down + And I see that the shared file preview shows the text "Welcome to your Nextcloud account!" + + Scenario: access a shared link protected by password with an invalid password + Given I act as John + And I am logged in + And I share the link for "welcome.txt" protected by the password "abcdef" + And I write down the shared link + When I act as Jane + And I visit the shared link I wrote down + And I authenticate with password "fedcba" + Then I see that the current page is the Authenticate page for the shared link I wrote down + And I see that a wrong password for the shared file message is shown + + Scenario: access a direct download shared link protected by password with a valid password + Given I act as John + And I am logged in + And I share the link for "welcome.txt" protected by the password "abcdef" + And I write down the shared link + When I act as Jane + And I visit the direct download shared link I wrote down + And I see that the current page is the Authenticate page for the direct download shared link I wrote down + And I authenticate with password "abcdef" + # download starts no page redirection + And I see that the current page is the Authenticate page for the direct download shared link I wrote down diff --git a/tests/acceptance/features/app-files-sharing.feature b/tests/acceptance/features/app-files-sharing.feature new file mode 100644 index 0000000000000..401384816e853 --- /dev/null +++ b/tests/acceptance/features/app-files-sharing.feature @@ -0,0 +1,269 @@ +Feature: app-files-sharing + + Scenario: share a file with another user + Given I act as John + And I am logged in as the admin + And I act as Jane + And I am logged in + And I act as John + And I rename "welcome.txt" to "farewell.txt" + And I see that the file list contains a file named "farewell.txt" + When I share "farewell.txt" with "user0" + And I see that the file is shared with "user0" + And I act as Jane + # The Files app is open again to reload the file list + And I open the Files app + Then I see that the file list contains a file named "farewell.txt" + And I open the details view for "farewell.txt" + And I see that the details view is open + And I open the "Sharing" tab in the details view + And I see that the "Sharing" tab in the details view is eventually loaded + And I see that the file is shared with me by "admin" + + Scenario: share a file with another user who already has a file with that name + Given I act as John + And I am logged in as the admin + And I act as Jane + And I am logged in + And I act as John + When I share "welcome.txt" with "user0" + And I see that the file is shared with "user0" + And I act as Jane + # The Files app is open again to reload the file list + And I open the Files app + Then I see that the file list contains a file named "welcome (2).txt" + And I open the details view for "welcome (2).txt" + And I see that the details view is open + And I open the "Sharing" tab in the details view + And I see that the "Sharing" tab in the details view is eventually loaded + And I see that the file is shared with me by "admin" + + Scenario: share a skeleton file with another user before first login + # If a file is shared with a user before her first login the skeleton would + # not have been created, so if the shared file has the same name as one from + # the skeleton the shared file will take its place and the skeleton file + # will not be added. + Given I act as John + And I am logged in as the admin + When I share "welcome.txt" with "user0" + And I see that the file is shared with "user0" + And I act as Jane + And I am logged in + Then I see that the file list contains a file named "welcome.txt" + And I open the details view for "welcome.txt" + And I see that the details view is open + And I open the "Sharing" tab in the details view + And I see that the "Sharing" tab in the details view is eventually loaded + And I see that the file is shared with me by "admin" + + Scenario: reshare a file with another user + Given I act as John + And I am logged in as the admin + And I act as Jane + And I am logged in + And I act as Jim + And I am logged in as "user1" + And I act as John + And I rename "welcome.txt" to "farewell.txt" + And I see that the file list contains a file named "farewell.txt" + And I share "farewell.txt" with "user0" + And I see that the file is shared with "user0" + And I act as Jane + # The Files app is open again to reload the file list + And I open the Files app + When I share "farewell.txt" with "user1" + And I see that the file is shared with "user1" + And I act as Jim + # The Files app is open again to reload the file list + And I open the Files app + Then I see that the file list contains a file named "farewell.txt" + And I open the details view for "farewell.txt" + And I see that the details view is open + And I open the "Sharing" tab in the details view + And I see that the "Sharing" tab in the details view is eventually loaded + And I see that the file is shared with me by "user0" + + Scenario: owner sees reshares with other users + Given I act as John + And I am logged in as the admin + And I act as Jane + And I am logged in + And I act as John + And I rename "welcome.txt" to "farewell.txt" + And I see that the file list contains a file named "farewell.txt" + And I share "farewell.txt" with "user0" + And I see that the file is shared with "user0" + And I act as Jane + # The Files app is open again to reload the file list + And I open the Files app + And I share "farewell.txt" with "user1" + And I see that the file is shared with "user1" + When I act as John + # The Files app is open again to reload the file list and the shares + And I open the Files app + And I open the details view for "farewell.txt" + And I see that the details view is open + And I open the "Sharing" tab in the details view + And I see that the "Sharing" tab in the details view is eventually loaded + Then I see that the file is shared with "user0" + And I see that the file is shared with "user1" + + Scenario: share an empty folder with another user + Given I act as John + And I am logged in as the admin + And I act as Jane + And I am logged in + And I act as John + And I create a new folder named "Shared folder" + And I see that the file list contains a file named "Shared folder" + When I share "Shared folder" with "user0" + And I see that the file is shared with "user0" + And I act as Jane + # The Files app is open again to reload the file list + And I open the Files app + Then I see that the file list contains a file named "Shared folder" + And I open the details view for "Shared folder" + And I see that the details view is open + And I open the "Sharing" tab in the details view + And I see that the "Sharing" tab in the details view is eventually loaded + And I see that the file is shared with me by "admin" + + Scenario: sharee sees a folder created by the owner in a shared folder + Given I act as John + And I am logged in as the admin + And I act as Jane + And I am logged in + And I act as John + And I create a new folder named "Shared folder" + And I see that the file list contains a file named "Shared folder" + And I share "Shared folder" with "user0" + And I see that the file is shared with "user0" + And I enter in the folder named "Shared folder" + And I create a new folder named "Subfolder" + And I see that the file list contains a file named "Subfolder" + When I act as Jane + # The Files app is open again to reload the file list + And I open the Files app + And I enter in the folder named "Shared folder" + Then I see that the file list contains a file named "Subfolder" + + Scenario: owner sees a folder created by the sharee in a shared folder + Given I act as John + And I am logged in as the admin + And I act as Jane + And I am logged in + And I act as John + And I create a new folder named "Shared folder" + And I see that the file list contains a file named "Shared folder" + And I share "Shared folder" with "user0" + And I see that the file is shared with "user0" + And I act as Jane + # The Files app is open again to reload the file list + And I open the Files app + And I enter in the folder named "Shared folder" + And I create a new folder named "Subfolder" + And I see that the file list contains a file named "Subfolder" + When I act as John + And I enter in the folder named "Shared folder" + Then I see that the file list contains a file named "Subfolder" + + Scenario: resharee sees a folder created by the owner in a shared folder + Given I act as John + And I am logged in as the admin + And I act as Jane + And I am logged in + And I act as Jim + And I am logged in as "user1" + And I act as John + And I create a new folder named "Shared folder" + And I see that the file list contains a file named "Shared folder" + And I share "Shared folder" with "user0" + And I see that the file is shared with "user0" + And I act as Jane + # The Files app is open again to reload the file list + And I open the Files app + And I share "Shared folder" with "user1" + And I act as John + And I enter in the folder named "Shared folder" + And I create a new folder named "Subfolder" + And I see that the file list contains a file named "Subfolder" + When I act as Jim + # The Files app is open again to reload the file list + And I open the Files app + And I enter in the folder named "Shared folder" + Then I see that the file list contains a file named "Subfolder" + + Scenario: owner sees a folder created by the resharee in a shared folder + Given I act as John + And I am logged in as the admin + And I act as Jane + And I am logged in + And I act as Jim + And I am logged in as "user1" + And I act as John + And I create a new folder named "Shared folder" + And I see that the file list contains a file named "Shared folder" + And I share "Shared folder" with "user0" + And I see that the file is shared with "user0" + And I act as Jane + # The Files app is open again to reload the file list + And I open the Files app + And I share "Shared folder" with "user1" + And I act as Jim + # The Files app is open again to reload the file list + And I open the Files app + And I enter in the folder named "Shared folder" + And I create a new folder named "Subfolder" + And I see that the file list contains a file named "Subfolder" + When I act as John + And I enter in the folder named "Shared folder" + Then I see that the file list contains a file named "Subfolder" + + Scenario: sharee can not reshare a folder if the sharer disables it + Given I act as John + And I am logged in as the admin + And I act as Jane + And I am logged in + And I act as John + And I create a new folder named "Shared folder" + And I see that the file list contains a file named "Shared folder" + And I share "Shared folder" with "user0" + And I see that the file is shared with "user0" + And I set the share with "user0" as not reshareable + And I see that "user0" can not reshare the share + When I act as Jane + # The Files app is open again to reload the file list + And I open the Files app + Then I see that the file list contains a file named "Shared folder" + And I open the details view for "Shared folder" + And I see that the details view is open + And I open the "Sharing" tab in the details view + And I see that the "Sharing" tab in the details view is eventually loaded + And I see that the file is shared with me by "admin" + And I see that resharing the file is not allowed + + Scenario: sharee can not reshare a subfolder if the sharer disables it for the parent folder + Given I act as John + And I am logged in as the admin + And I act as Jane + And I am logged in + And I act as John + And I create a new folder named "Shared folder" + And I see that the file list contains a file named "Shared folder" + And I share "Shared folder" with "user0" + And I see that the file is shared with "user0" + And I set the share with "user0" as not reshareable + And I see that "user0" can not reshare the share + And I enter in the folder named "Shared folder" + And I create a new folder named "Subfolder" + And I see that the file list contains a file named "Subfolder" + When I act as Jane + # The Files app is open again to reload the file list + And I open the Files app + And I enter in the folder named "Shared folder" + Then I see that the file list contains a file named "Subfolder" + And I open the details view for "Subfolder" + And I see that the details view is open + And I open the "Sharing" tab in the details view + And I see that the "Sharing" tab in the details view is eventually loaded + And I see that resharing the file is not allowed diff --git a/tests/acceptance/features/app-files.feature b/tests/acceptance/features/app-files.feature index 863f12fc443d2..7d216ffc1f436 100644 --- a/tests/acceptance/features/app-files.feature +++ b/tests/acceptance/features/app-files.feature @@ -147,392 +147,6 @@ Feature: app-files Then I see that the file list contains a file named "farewell.txt" And I see that the file name shown in the details view is "farewell.txt" - Scenario: open the menu in a public shared link - Given I act as John - And I am logged in - And I share the link for "welcome.txt" - And I write down the shared link - When I act as Jane - And I visit the shared link I wrote down - And I see that the current page is the shared link I wrote down - And I open the Share menu - Then I see that the Share menu is shown - - Scenario: creation is not possible by default in a public shared folder - Given I act as John - And I am logged in - And I create a new folder named "Shared folder" - # To share the link the "Share" inline action has to be clicked but, as the - # details view is opened automatically when the folder is created, clicking - # on the inline action could fail if it is covered by the details view due - # to its opening animation. Instead of ensuring that the animations of the - # contents and the details view have both finished it is easier to close the - # details view and wait until it is closed before continuing. - And I close the details view - And I see that the details view is closed - And I share the link for "Shared folder" - And I write down the shared link - When I act as Jane - And I visit the shared link I wrote down - And I see that the current page is the shared link I wrote down - And I see that the file list is eventually loaded - Then I see that it is not possible to create new files - - Scenario: create folder in a public editable shared folder - Given I act as John - And I am logged in - And I create a new folder named "Editable shared folder" - # To share the link the "Share" inline action has to be clicked but, as the - # details view is opened automatically when the folder is created, clicking - # on the inline action could fail if it is covered by the details view due - # to its opening animation. Instead of ensuring that the animations of the - # contents and the details view have both finished it is easier to close the - # details view and wait until it is closed before continuing. - And I close the details view - And I see that the details view is closed - And I share the link for "Editable shared folder" - And I set the shared link as editable - And I write down the shared link - When I act as Jane - And I visit the shared link I wrote down - And I see that the current page is the shared link I wrote down - And I create a new folder named "Subfolder" - Then I see that the file list contains a file named "Subfolder" - - Scenario: owner sees folder created in the public page of an editable shared folder - Given I act as John - And I am logged in - And I create a new folder named "Editable shared folder" - # To share the link the "Share" inline action has to be clicked but, as the - # details view is opened automatically when the folder is created, clicking - # on the inline action could fail if it is covered by the details view due - # to its opening animation. Instead of ensuring that the animations of the - # contents and the details view have both finished it is easier to close the - # details view and wait until it is closed before continuing. - And I close the details view - And I see that the details view is closed - And I share the link for "Editable shared folder" - And I set the shared link as editable - And I write down the shared link - And I act as Jane - And I visit the shared link I wrote down - And I see that the current page is the shared link I wrote down - And I create a new folder named "Subfolder" - And I see that the file list contains a file named "Subfolder" - When I act as John - And I enter in the folder named "Editable shared folder" - Then I see that the file list contains a file named "Subfolder" - - Scenario: set a password to a shared link - Given I am logged in - And I share the link for "welcome.txt" - When I protect the shared link with the password "abcdef" - Then I see that the working icon for password protect is shown - And I see that the working icon for password protect is eventually not shown - - Scenario: access a shared link protected by password with a valid password - Given I act as John - And I am logged in - And I share the link for "welcome.txt" protected by the password "abcdef" - And I write down the shared link - When I act as Jane - And I visit the shared link I wrote down - And I see that the current page is the Authenticate page for the shared link I wrote down - And I authenticate with password "abcdef" - Then I see that the current page is the shared link I wrote down - And I see that the shared file preview shows the text "Welcome to your Nextcloud account!" - - Scenario: access a shared link protected by password with an invalid password - Given I act as John - And I am logged in - And I share the link for "welcome.txt" protected by the password "abcdef" - And I write down the shared link - When I act as Jane - And I visit the shared link I wrote down - And I authenticate with password "fedcba" - Then I see that the current page is the Authenticate page for the shared link I wrote down - And I see that a wrong password for the shared file message is shown - - Scenario: access a direct download shared link protected by password with a valid password - Given I act as John - And I am logged in - And I share the link for "welcome.txt" protected by the password "abcdef" - And I write down the shared link - When I act as Jane - And I visit the direct download shared link I wrote down - And I see that the current page is the Authenticate page for the direct download shared link I wrote down - And I authenticate with password "abcdef" - # download starts no page redirection - And I see that the current page is the Authenticate page for the direct download shared link I wrote down - - Scenario: share a file with another user - Given I act as John - And I am logged in as the admin - And I act as Jane - And I am logged in - And I act as John - And I rename "welcome.txt" to "farewell.txt" - And I see that the file list contains a file named "farewell.txt" - When I share "farewell.txt" with "user0" - And I see that the file is shared with "user0" - And I act as Jane - # The Files app is open again to reload the file list - And I open the Files app - Then I see that the file list contains a file named "farewell.txt" - And I open the details view for "farewell.txt" - And I see that the details view is open - And I open the "Sharing" tab in the details view - And I see that the "Sharing" tab in the details view is eventually loaded - And I see that the file is shared with me by "admin" - - Scenario: share a file with another user who already has a file with that name - Given I act as John - And I am logged in as the admin - And I act as Jane - And I am logged in - And I act as John - When I share "welcome.txt" with "user0" - And I see that the file is shared with "user0" - And I act as Jane - # The Files app is open again to reload the file list - And I open the Files app - Then I see that the file list contains a file named "welcome (2).txt" - And I open the details view for "welcome (2).txt" - And I see that the details view is open - And I open the "Sharing" tab in the details view - And I see that the "Sharing" tab in the details view is eventually loaded - And I see that the file is shared with me by "admin" - - Scenario: share a skeleton file with another user before first login - # If a file is shared with a user before her first login the skeleton would - # not have been created, so if the shared file has the same name as one from - # the skeleton the shared file will take its place and the skeleton file - # will not be added. - Given I act as John - And I am logged in as the admin - When I share "welcome.txt" with "user0" - And I see that the file is shared with "user0" - And I act as Jane - And I am logged in - Then I see that the file list contains a file named "welcome.txt" - And I open the details view for "welcome.txt" - And I see that the details view is open - And I open the "Sharing" tab in the details view - And I see that the "Sharing" tab in the details view is eventually loaded - And I see that the file is shared with me by "admin" - - Scenario: reshare a file with another user - Given I act as John - And I am logged in as the admin - And I act as Jane - And I am logged in - And I act as Jim - And I am logged in as "user1" - And I act as John - And I rename "welcome.txt" to "farewell.txt" - And I see that the file list contains a file named "farewell.txt" - And I share "farewell.txt" with "user0" - And I see that the file is shared with "user0" - And I act as Jane - # The Files app is open again to reload the file list - And I open the Files app - When I share "farewell.txt" with "user1" - And I see that the file is shared with "user1" - And I act as Jim - # The Files app is open again to reload the file list - And I open the Files app - Then I see that the file list contains a file named "farewell.txt" - And I open the details view for "farewell.txt" - And I see that the details view is open - And I open the "Sharing" tab in the details view - And I see that the "Sharing" tab in the details view is eventually loaded - And I see that the file is shared with me by "user0" - - Scenario: owner sees reshares with other users - Given I act as John - And I am logged in as the admin - And I act as Jane - And I am logged in - And I act as John - And I rename "welcome.txt" to "farewell.txt" - And I see that the file list contains a file named "farewell.txt" - And I share "farewell.txt" with "user0" - And I see that the file is shared with "user0" - And I act as Jane - # The Files app is open again to reload the file list - And I open the Files app - And I share "farewell.txt" with "user1" - And I see that the file is shared with "user1" - When I act as John - # The Files app is open again to reload the file list and the shares - And I open the Files app - And I open the details view for "farewell.txt" - And I see that the details view is open - And I open the "Sharing" tab in the details view - And I see that the "Sharing" tab in the details view is eventually loaded - Then I see that the file is shared with "user0" - And I see that the file is shared with "user1" - - Scenario: share an empty folder with another user - Given I act as John - And I am logged in as the admin - And I act as Jane - And I am logged in - And I act as John - And I create a new folder named "Shared folder" - And I see that the file list contains a file named "Shared folder" - When I share "Shared folder" with "user0" - And I see that the file is shared with "user0" - And I act as Jane - # The Files app is open again to reload the file list - And I open the Files app - Then I see that the file list contains a file named "Shared folder" - And I open the details view for "Shared folder" - And I see that the details view is open - And I open the "Sharing" tab in the details view - And I see that the "Sharing" tab in the details view is eventually loaded - And I see that the file is shared with me by "admin" - - Scenario: sharee sees a folder created by the owner in a shared folder - Given I act as John - And I am logged in as the admin - And I act as Jane - And I am logged in - And I act as John - And I create a new folder named "Shared folder" - And I see that the file list contains a file named "Shared folder" - And I share "Shared folder" with "user0" - And I see that the file is shared with "user0" - And I enter in the folder named "Shared folder" - And I create a new folder named "Subfolder" - And I see that the file list contains a file named "Subfolder" - When I act as Jane - # The Files app is open again to reload the file list - And I open the Files app - And I enter in the folder named "Shared folder" - Then I see that the file list contains a file named "Subfolder" - - Scenario: owner sees a folder created by the sharee in a shared folder - Given I act as John - And I am logged in as the admin - And I act as Jane - And I am logged in - And I act as John - And I create a new folder named "Shared folder" - And I see that the file list contains a file named "Shared folder" - And I share "Shared folder" with "user0" - And I see that the file is shared with "user0" - And I act as Jane - # The Files app is open again to reload the file list - And I open the Files app - And I enter in the folder named "Shared folder" - And I create a new folder named "Subfolder" - And I see that the file list contains a file named "Subfolder" - When I act as John - And I enter in the folder named "Shared folder" - Then I see that the file list contains a file named "Subfolder" - - Scenario: resharee sees a folder created by the owner in a shared folder - Given I act as John - And I am logged in as the admin - And I act as Jane - And I am logged in - And I act as Jim - And I am logged in as "user1" - And I act as John - And I create a new folder named "Shared folder" - And I see that the file list contains a file named "Shared folder" - And I share "Shared folder" with "user0" - And I see that the file is shared with "user0" - And I act as Jane - # The Files app is open again to reload the file list - And I open the Files app - And I share "Shared folder" with "user1" - And I act as John - And I enter in the folder named "Shared folder" - And I create a new folder named "Subfolder" - And I see that the file list contains a file named "Subfolder" - When I act as Jim - # The Files app is open again to reload the file list - And I open the Files app - And I enter in the folder named "Shared folder" - Then I see that the file list contains a file named "Subfolder" - - Scenario: owner sees a folder created by the resharee in a shared folder - Given I act as John - And I am logged in as the admin - And I act as Jane - And I am logged in - And I act as Jim - And I am logged in as "user1" - And I act as John - And I create a new folder named "Shared folder" - And I see that the file list contains a file named "Shared folder" - And I share "Shared folder" with "user0" - And I see that the file is shared with "user0" - And I act as Jane - # The Files app is open again to reload the file list - And I open the Files app - And I share "Shared folder" with "user1" - And I act as Jim - # The Files app is open again to reload the file list - And I open the Files app - And I enter in the folder named "Shared folder" - And I create a new folder named "Subfolder" - And I see that the file list contains a file named "Subfolder" - When I act as John - And I enter in the folder named "Shared folder" - Then I see that the file list contains a file named "Subfolder" - - Scenario: sharee can not reshare a folder if the sharer disables it - Given I act as John - And I am logged in as the admin - And I act as Jane - And I am logged in - And I act as John - And I create a new folder named "Shared folder" - And I see that the file list contains a file named "Shared folder" - And I share "Shared folder" with "user0" - And I see that the file is shared with "user0" - And I set the share with "user0" as not reshareable - And I see that "user0" can not reshare the share - When I act as Jane - # The Files app is open again to reload the file list - And I open the Files app - Then I see that the file list contains a file named "Shared folder" - And I open the details view for "Shared folder" - And I see that the details view is open - And I open the "Sharing" tab in the details view - And I see that the "Sharing" tab in the details view is eventually loaded - And I see that the file is shared with me by "admin" - And I see that resharing the file is not allowed - - Scenario: sharee can not reshare a subfolder if the sharer disables it for the parent folder - Given I act as John - And I am logged in as the admin - And I act as Jane - And I am logged in - And I act as John - And I create a new folder named "Shared folder" - And I see that the file list contains a file named "Shared folder" - And I share "Shared folder" with "user0" - And I see that the file is shared with "user0" - And I set the share with "user0" as not reshareable - And I see that "user0" can not reshare the share - And I enter in the folder named "Shared folder" - And I create a new folder named "Subfolder" - And I see that the file list contains a file named "Subfolder" - When I act as Jane - # The Files app is open again to reload the file list - And I open the Files app - And I enter in the folder named "Shared folder" - Then I see that the file list contains a file named "Subfolder" - And I open the details view for "Subfolder" - And I see that the details view is open - And I open the "Sharing" tab in the details view - And I see that the "Sharing" tab in the details view is eventually loaded - And I see that resharing the file is not allowed - Scenario: marking a file as favorite causes the file list to be sorted again Given I am logged in And I create a new folder named "A name alphabetically lower than welcome.txt" From 6be19a5ca3de404dd16b584d622cd5075313f072 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Calvi=C3=B1o=20S=C3=A1nchez?= Date: Fri, 23 Nov 2018 13:22:08 +0100 Subject: [PATCH 8/9] Extract locators and steps for sharing in Files app to their own context MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Daniel Calviño Sánchez --- tests/acceptance/config/behat.yml | 2 + .../features/bootstrap/FilesAppContext.php | 330 ---------------- .../bootstrap/FilesAppSharingContext.php | 358 ++++++++++++++++++ 3 files changed, 360 insertions(+), 330 deletions(-) create mode 100644 tests/acceptance/features/bootstrap/FilesAppSharingContext.php diff --git a/tests/acceptance/config/behat.yml b/tests/acceptance/config/behat.yml index 3108ea41407ee..7d64e6a207c95 100644 --- a/tests/acceptance/config/behat.yml +++ b/tests/acceptance/config/behat.yml @@ -16,6 +16,7 @@ default: - FeatureContext - FileListContext - FilesAppContext + - FilesAppSharingContext - FilesSharingAppContext - LoginPageContext - NotificationContext @@ -42,6 +43,7 @@ default: - FeatureContext - FileListContext - FilesAppContext + - FilesAppSharingContext - FilesSharingAppContext - LoginPageContext - NotificationContext diff --git a/tests/acceptance/features/bootstrap/FilesAppContext.php b/tests/acceptance/features/bootstrap/FilesAppContext.php index 6555f483fe3f9..880303fe1d6c5 100644 --- a/tests/acceptance/features/bootstrap/FilesAppContext.php +++ b/tests/acceptance/features/bootstrap/FilesAppContext.php @@ -228,171 +228,6 @@ public static function loadingIconForTabInDetailsViewNamed($tabName) { describedAs("Loading icon for tab named $tabName in details view in Files app"); } - /** - * @return Locator - */ - public static function sharedByLabel() { - return Locator::forThe()->css(".reshare")-> - descendantOf(self::detailsView())-> - describedAs("Shared by label in the details view in Files app"); - } - - /** - * @return Locator - */ - public static function shareWithInput() { - return Locator::forThe()->css(".shareWithField")-> - descendantOf(self::detailsView())-> - describedAs("Share with input in the details view in Files app"); - } - - /** - * @return Locator - */ - public static function shareeList() { - return Locator::forThe()->css(".shareeListView")-> - descendantOf(self::detailsView())-> - describedAs("Sharee list in the details view in Files app"); - } - - /** - * @return Locator - */ - public static function sharedWithRow($sharedWithName) { - // "username" class is used for any type of share, not only for shares - // with users. - return Locator::forThe()->xpath("//span[contains(concat(' ', normalize-space(@class), ' '), ' username ') and normalize-space() = '$sharedWithName']/ancestor::li")-> - descendantOf(self::shareeList())-> - describedAs("Shared with $sharedWithName row in the details view in Files app"); - } - - /** - * @return Locator - */ - public static function shareWithMenuButton($sharedWithName) { - return Locator::forThe()->css(".share-menu > .icon")-> - descendantOf(self::sharedWithRow($sharedWithName))-> - describedAs("Share with $sharedWithName menu button in the details view in Files app"); - } - - /** - * @return Locator - */ - public static function shareWithMenu($sharedWithName) { - return Locator::forThe()->css(".share-menu > .menu")-> - descendantOf(self::sharedWithRow($sharedWithName))-> - describedAs("Share with $sharedWithName menu in the details view in Files app"); - } - - /** - * @return Locator - */ - public static function canReshareCheckbox($sharedWithName) { - // forThe()->checkbox("Can reshare") can not be used here; that would - // return the checkbox itself, but the element that the user interacts - // with is the label. - return Locator::forThe()->xpath("//label[normalize-space() = 'Can reshare']")-> - descendantOf(self::shareWithMenu($sharedWithName))-> - describedAs("Can reshare checkbox in the share with $sharedWithName menu in the details view in Files app"); - } - - /** - * @return Locator - */ - public static function canReshareCheckboxInput($sharedWithName) { - return Locator::forThe()->checkbox("Can reshare")-> - descendantOf(self::shareWithMenu($sharedWithName))-> - describedAs("Can reshare checkbox input in the share with $sharedWithName menu in the details view in Files app"); - } - - /** - * @return Locator - */ - public static function shareLinkRow() { - return Locator::forThe()->id("shareLink")-> - descendantOf(self::detailsView())-> - describedAs("Share link row in the details view in Files app"); - } - - /** - * @return Locator - */ - public static function shareLinkCheckbox() { - // forThe()->checkbox("Enable") can not be used here; that would return - // the checkbox itself, but the element that the user interacts with is - // the label. - return Locator::forThe()->xpath("//label[normalize-space() = 'Enable']")-> - descendantOf(self::shareLinkRow())-> - describedAs("Share link checkbox in the details view in Files app"); - } - - /** - * @return Locator - */ - public static function shareLinkMenuButton() { - return Locator::forThe()->css(".share-menu > .icon")-> - descendantOf(self::shareLinkRow())-> - describedAs("Share link menu button in the details view in Files app"); - } - - /** - * @return Locator - */ - public static function shareLinkMenu() { - return Locator::forThe()->css(".share-menu > .menu")-> - descendantOf(self::shareLinkRow())-> - describedAs("Share link menu in the details view in Files app"); - } - - /** - * @return Locator - */ - public static function copyUrlMenuItem() { - return Locator::forThe()->xpath("//a[normalize-space() = 'Copy URL']")-> - descendantOf(self::shareLinkMenu())-> - describedAs("Copy URL menu item in the share link menu in the details view in Files app"); - } - - /** - * @return Locator - */ - public static function allowUploadAndEditingRadioButton() { - // forThe()->radio("Allow upload and editing") can not be used here; - // that would return the radio button itself, but the element that the - // user interacts with is the label. - return Locator::forThe()->xpath("//label[normalize-space() = 'Allow upload and editing']")-> - descendantOf(self::shareLinkMenu())-> - describedAs("Allow upload and editing radio button in the details view in Files app"); - } - - /** - * @return Locator - */ - public static function passwordProtectCheckbox() { - // forThe()->checkbox("Password protect") can not be used here; that - // would return the checkbox itself, but the element that the user - // interacts with is the label. - return Locator::forThe()->xpath("//label[normalize-space() = 'Password protect']")-> - descendantOf(self::shareLinkMenu())-> - describedAs("Password protect checkbox in the details view in Files app"); - } - - /** - * @return Locator - */ - public static function passwordProtectField() { - return Locator::forThe()->css(".linkPassText")->descendantOf(self::shareLinkMenu())-> - describedAs("Password protect field in the details view in Files app"); - } - - /** - * @return Locator - */ - public static function passwordProtectWorkingIcon() { - return Locator::forThe()->css(".linkPassMenu .icon-loading-small")->descendantOf(self::shareLinkMenu())-> - describedAs("Password protect working icon in the details view in Files app"); - } - /** * @Given I open the Files app */ @@ -421,38 +256,6 @@ public function iOpenTheTabInTheDetailsView($tabName) { $this->actor->find(self::tabHeaderInDetailsViewNamed($tabName), 10)->click(); } - /** - * @Given I share the link for :fileName - */ - public function iShareTheLinkFor($fileName) { - $this->actor->find(FileListContext::shareActionForFile(self::currentSectionMainView(), $fileName), 10)->click(); - - $this->actor->find(self::shareLinkCheckbox(), 5)->click(); - } - - /** - * @Given I share :fileName with :shareWithName - */ - public function iShareWith($fileName, $shareWithName) { - $this->actor->find(FileListContext::shareActionForFile(self::currentSectionMainView(), $fileName), 10)->click(); - - $this->actor->find(self::shareWithInput(), 5)->setValue($shareWithName . "\r"); - } - - /** - * @Given I write down the shared link - */ - public function iWriteDownTheSharedLink() { - $this->showShareLinkMenuIfNeeded(); - - $this->actor->find(self::copyUrlMenuItem(), 2)->click(); - - // Clicking on the menu item copies the link to the clipboard, but it is - // not possible to access that value from the acceptance tests. Due to - // this the value of the attribute that holds the URL is used instead. - $this->actor->getSharedNotebook()["shared link"] = $this->actor->find(self::copyUrlMenuItem(), 2)->getWrappedElement()->getAttribute("data-clipboard-text"); - } - /** * @When I mark the file as favorite in the details view */ @@ -489,37 +292,6 @@ public function iUncheckTheTagInTheDropdownForTagsInTheDetailsView($tag) { $this->actor->find(self::itemInDropdownForTag($tag), 10)->click(); } - /** - * @When I set the shared link as editable - */ - public function iSetTheSharedLinkAsEditable() { - $this->showShareLinkMenuIfNeeded(); - - $this->actor->find(self::allowUploadAndEditingRadioButton(), 2)->click(); - } - - /** - * @When I protect the shared link with the password :password - */ - public function iProtectTheSharedLinkWithThePassword($password) { - $this->showShareLinkMenuIfNeeded(); - - $this->actor->find(self::passwordProtectCheckbox(), 2)->click(); - - $this->actor->find(self::passwordProtectField(), 2)->setValue($password . "\r"); - } - - /** - * @When I set the share with :shareWithName as not reshareable - */ - public function iSetTheShareWithAsNotReshareable($shareWithName) { - $this->showShareWithMenuIfNeeded($shareWithName); - - $this->iSeeThatCanReshareTheShare($shareWithName); - - $this->actor->find(self::canReshareCheckbox($shareWithName), 2)->click(); - } - /** * @Then I see that the current page is the Files app */ @@ -641,106 +413,4 @@ public function iSeeThatTheTabInTheDetailsViewIsEventuallyLoaded($tabName) { PHPUnit_Framework_Assert::fail("The $tabName tab in the details view has not been loaded after $timeout seconds"); } } - - /** - * @Then I see that the file is shared with me by :sharedByName - */ - public function iSeeThatTheFileIsSharedWithMeBy($sharedByName) { - PHPUnit_Framework_Assert::assertEquals( - $this->actor->find(self::sharedByLabel(), 10)->getText(), "Shared with you by $sharedByName"); - } - - /** - * @Then I see that the file is shared with :sharedWithName - */ - public function iSeeThatTheFileIsSharedWith($sharedWithName) { - PHPUnit_Framework_Assert::assertTrue( - $this->actor->find(self::sharedWithRow($sharedWithName), 10)->isVisible()); - } - - /** - * @Then I see that resharing the file is not allowed - */ - public function iSeeThatResharingTheFileIsNotAllowed() { - PHPUnit_Framework_Assert::assertEquals( - $this->actor->find(self::shareWithInput(), 10)->getWrappedElement()->getAttribute("disabled"), "disabled"); - PHPUnit_Framework_Assert::assertEquals( - $this->actor->find(self::shareWithInput(), 10)->getWrappedElement()->getAttribute("placeholder"), "Resharing is not allowed"); - } - - /** - * @Then I see that :sharedWithName can reshare the share - */ - public function iSeeThatCanReshareTheShare($sharedWithName) { - $this->showShareWithMenuIfNeeded($sharedWithName); - - PHPUnit_Framework_Assert::assertTrue( - $this->actor->find(self::canReshareCheckboxInput($sharedWithName), 10)->isChecked()); - } - - /** - * @Then I see that :sharedWithName can not reshare the share - */ - public function iSeeThatCanNotReshareTheShare($sharedWithName) { - $this->showShareWithMenuIfNeeded($sharedWithName); - - PHPUnit_Framework_Assert::assertFalse( - $this->actor->find(self::canReshareCheckboxInput($sharedWithName), 10)->isChecked()); - } - - /** - * @Then I see that the working icon for password protect is shown - */ - public function iSeeThatTheWorkingIconForPasswordProtectIsShown() { - PHPUnit_Framework_Assert::assertNotNull($this->actor->find(self::passwordProtectWorkingIcon(), 10)); - } - - /** - * @Then I see that the working icon for password protect is eventually not shown - */ - public function iSeeThatTheWorkingIconForPasswordProtectIsEventuallyNotShown() { - if (!WaitFor::elementToBeEventuallyNotShown( - $this->actor, - self::passwordProtectWorkingIcon(), - $timeout = 10 * $this->actor->getFindTimeoutMultiplier())) { - PHPUnit_Framework_Assert::fail("The working icon for password protect is still shown after $timeout seconds"); - } - } - - /** - * @Given I share the link for :fileName protected by the password :password - */ - public function iShareTheLinkForProtectedByThePassword($fileName, $password) { - $this->iShareTheLinkFor($fileName); - $this->iProtectTheSharedLinkWithThePassword($password); - $this->iSeeThatTheWorkingIconForPasswordProtectIsShown(); - $this->iSeeThatTheWorkingIconForPasswordProtectIsEventuallyNotShown(); - } - - private function showShareLinkMenuIfNeeded() { - // In some cases the share menu is hidden after clicking on an action of - // the menu. Therefore, if the menu is visible, wait a little just in - // case it is in the process of being hidden due to a previous action, - // in which case it is shown again. - if (WaitFor::elementToBeEventuallyNotShown( - $this->actor, - self::shareLinkMenu(), - $timeout = 2 * $this->actor->getFindTimeoutMultiplier())) { - $this->actor->find(self::shareLinkMenuButton(), 10)->click(); - } - } - - private function showShareWithMenuIfNeeded($shareWithName) { - // In some cases the share menu is hidden after clicking on an action of - // the menu. Therefore, if the menu is visible, wait a little just in - // case it is in the process of being hidden due to a previous action, - // in which case it is shown again. - if (WaitFor::elementToBeEventuallyNotShown( - $this->actor, - self::shareWithMenu($shareWithName), - $timeout = 2 * $this->actor->getFindTimeoutMultiplier())) { - $this->actor->find(self::shareWithMenuButton($shareWithName), 10)->click(); - } - } - } diff --git a/tests/acceptance/features/bootstrap/FilesAppSharingContext.php b/tests/acceptance/features/bootstrap/FilesAppSharingContext.php new file mode 100644 index 0000000000000..b510faff88932 --- /dev/null +++ b/tests/acceptance/features/bootstrap/FilesAppSharingContext.php @@ -0,0 +1,358 @@ +. + * + */ + +use Behat\Behat\Context\Context; + +class FilesAppSharingContext implements Context, ActorAwareInterface { + + use ActorAware; + + /** + * @return Locator + */ + public static function sharedByLabel() { + return Locator::forThe()->css(".reshare")-> + descendantOf(FilesAppContext::detailsView())-> + describedAs("Shared by label in the details view in Files app"); + } + + /** + * @return Locator + */ + public static function shareWithInput() { + return Locator::forThe()->css(".shareWithField")-> + descendantOf(FilesAppContext::detailsView())-> + describedAs("Share with input in the details view in Files app"); + } + + /** + * @return Locator + */ + public static function shareeList() { + return Locator::forThe()->css(".shareeListView")-> + descendantOf(FilesAppContext::detailsView())-> + describedAs("Sharee list in the details view in Files app"); + } + + /** + * @return Locator + */ + public static function sharedWithRow($sharedWithName) { + // "username" class is used for any type of share, not only for shares + // with users. + return Locator::forThe()->xpath("//span[contains(concat(' ', normalize-space(@class), ' '), ' username ') and normalize-space() = '$sharedWithName']/ancestor::li")-> + descendantOf(self::shareeList())-> + describedAs("Shared with $sharedWithName row in the details view in Files app"); + } + + /** + * @return Locator + */ + public static function shareWithMenuButton($sharedWithName) { + return Locator::forThe()->css(".share-menu > .icon")-> + descendantOf(self::sharedWithRow($sharedWithName))-> + describedAs("Share with $sharedWithName menu button in the details view in Files app"); + } + + /** + * @return Locator + */ + public static function shareWithMenu($sharedWithName) { + return Locator::forThe()->css(".share-menu > .menu")-> + descendantOf(self::sharedWithRow($sharedWithName))-> + describedAs("Share with $sharedWithName menu in the details view in Files app"); + } + + /** + * @return Locator + */ + public static function canReshareCheckbox($sharedWithName) { + // forThe()->checkbox("Can reshare") can not be used here; that would + // return the checkbox itself, but the element that the user interacts + // with is the label. + return Locator::forThe()->xpath("//label[normalize-space() = 'Can reshare']")-> + descendantOf(self::shareWithMenu($sharedWithName))-> + describedAs("Can reshare checkbox in the share with $sharedWithName menu in the details view in Files app"); + } + + /** + * @return Locator + */ + public static function canReshareCheckboxInput($sharedWithName) { + return Locator::forThe()->checkbox("Can reshare")-> + descendantOf(self::shareWithMenu($sharedWithName))-> + describedAs("Can reshare checkbox input in the share with $sharedWithName menu in the details view in Files app"); + } + + /** + * @return Locator + */ + public static function shareLinkRow() { + return Locator::forThe()->id("shareLink")-> + descendantOf(FilesAppContext::detailsView())-> + describedAs("Share link row in the details view in Files app"); + } + + /** + * @return Locator + */ + public static function shareLinkCheckbox() { + // forThe()->checkbox("Enable") can not be used here; that would return + // the checkbox itself, but the element that the user interacts with is + // the label. + return Locator::forThe()->xpath("//label[normalize-space() = 'Enable']")-> + descendantOf(self::shareLinkRow())-> + describedAs("Share link checkbox in the details view in Files app"); + } + + /** + * @return Locator + */ + public static function shareLinkMenuButton() { + return Locator::forThe()->css(".share-menu > .icon")-> + descendantOf(self::shareLinkRow())-> + describedAs("Share link menu button in the details view in Files app"); + } + + /** + * @return Locator + */ + public static function shareLinkMenu() { + return Locator::forThe()->css(".share-menu > .menu")-> + descendantOf(self::shareLinkRow())-> + describedAs("Share link menu in the details view in Files app"); + } + + /** + * @return Locator + */ + public static function copyUrlMenuItem() { + return Locator::forThe()->xpath("//a[normalize-space() = 'Copy URL']")-> + descendantOf(self::shareLinkMenu())-> + describedAs("Copy URL menu item in the share link menu in the details view in Files app"); + } + + /** + * @return Locator + */ + public static function allowUploadAndEditingRadioButton() { + // forThe()->radio("Allow upload and editing") can not be used here; + // that would return the radio button itself, but the element that the + // user interacts with is the label. + return Locator::forThe()->xpath("//label[normalize-space() = 'Allow upload and editing']")-> + descendantOf(self::shareLinkMenu())-> + describedAs("Allow upload and editing radio button in the details view in Files app"); + } + + /** + * @return Locator + */ + public static function passwordProtectCheckbox() { + // forThe()->checkbox("Password protect") can not be used here; that + // would return the checkbox itself, but the element that the user + // interacts with is the label. + return Locator::forThe()->xpath("//label[normalize-space() = 'Password protect']")-> + descendantOf(self::shareLinkMenu())-> + describedAs("Password protect checkbox in the details view in Files app"); + } + + /** + * @return Locator + */ + public static function passwordProtectField() { + return Locator::forThe()->css(".linkPassText")->descendantOf(self::shareLinkMenu())-> + describedAs("Password protect field in the details view in Files app"); + } + + /** + * @return Locator + */ + public static function passwordProtectWorkingIcon() { + return Locator::forThe()->css(".linkPassMenu .icon-loading-small")->descendantOf(self::shareLinkMenu())-> + describedAs("Password protect working icon in the details view in Files app"); + } + + /** + * @Given I share the link for :fileName + */ + public function iShareTheLinkFor($fileName) { + $this->actor->find(FileListContext::shareActionForFile(FilesAppContext::currentSectionMainView(), $fileName), 10)->click(); + + $this->actor->find(self::shareLinkCheckbox(), 5)->click(); + } + + /** + * @Given I share :fileName with :shareWithName + */ + public function iShareWith($fileName, $shareWithName) { + $this->actor->find(FileListContext::shareActionForFile(FilesAppContext::currentSectionMainView(), $fileName), 10)->click(); + + $this->actor->find(self::shareWithInput(), 5)->setValue($shareWithName . "\r"); + } + + /** + * @Given I write down the shared link + */ + public function iWriteDownTheSharedLink() { + $this->showShareLinkMenuIfNeeded(); + + $this->actor->find(self::copyUrlMenuItem(), 2)->click(); + + // Clicking on the menu item copies the link to the clipboard, but it is + // not possible to access that value from the acceptance tests. Due to + // this the value of the attribute that holds the URL is used instead. + $this->actor->getSharedNotebook()["shared link"] = $this->actor->find(self::copyUrlMenuItem(), 2)->getWrappedElement()->getAttribute("data-clipboard-text"); + } + + /** + * @When I set the shared link as editable + */ + public function iSetTheSharedLinkAsEditable() { + $this->showShareLinkMenuIfNeeded(); + + $this->actor->find(self::allowUploadAndEditingRadioButton(), 2)->click(); + } + + /** + * @When I protect the shared link with the password :password + */ + public function iProtectTheSharedLinkWithThePassword($password) { + $this->showShareLinkMenuIfNeeded(); + + $this->actor->find(self::passwordProtectCheckbox(), 2)->click(); + + $this->actor->find(self::passwordProtectField(), 2)->setValue($password . "\r"); + } + + /** + * @When I set the share with :shareWithName as not reshareable + */ + public function iSetTheShareWithAsNotReshareable($shareWithName) { + $this->showShareWithMenuIfNeeded($shareWithName); + + $this->iSeeThatCanReshareTheShare($shareWithName); + + $this->actor->find(self::canReshareCheckbox($shareWithName), 2)->click(); + } + + /** + * @Then I see that the file is shared with me by :sharedByName + */ + public function iSeeThatTheFileIsSharedWithMeBy($sharedByName) { + PHPUnit_Framework_Assert::assertEquals( + $this->actor->find(self::sharedByLabel(), 10)->getText(), "Shared with you by $sharedByName"); + } + + /** + * @Then I see that the file is shared with :sharedWithName + */ + public function iSeeThatTheFileIsSharedWith($sharedWithName) { + PHPUnit_Framework_Assert::assertTrue( + $this->actor->find(self::sharedWithRow($sharedWithName), 10)->isVisible()); + } + + /** + * @Then I see that resharing the file is not allowed + */ + public function iSeeThatResharingTheFileIsNotAllowed() { + PHPUnit_Framework_Assert::assertEquals( + $this->actor->find(self::shareWithInput(), 10)->getWrappedElement()->getAttribute("disabled"), "disabled"); + PHPUnit_Framework_Assert::assertEquals( + $this->actor->find(self::shareWithInput(), 10)->getWrappedElement()->getAttribute("placeholder"), "Resharing is not allowed"); + } + + /** + * @Then I see that :sharedWithName can reshare the share + */ + public function iSeeThatCanReshareTheShare($sharedWithName) { + $this->showShareWithMenuIfNeeded($sharedWithName); + + PHPUnit_Framework_Assert::assertTrue( + $this->actor->find(self::canReshareCheckboxInput($sharedWithName), 10)->isChecked()); + } + + /** + * @Then I see that :sharedWithName can not reshare the share + */ + public function iSeeThatCanNotReshareTheShare($sharedWithName) { + $this->showShareWithMenuIfNeeded($sharedWithName); + + PHPUnit_Framework_Assert::assertFalse( + $this->actor->find(self::canReshareCheckboxInput($sharedWithName), 10)->isChecked()); + } + + /** + * @Then I see that the working icon for password protect is shown + */ + public function iSeeThatTheWorkingIconForPasswordProtectIsShown() { + PHPUnit_Framework_Assert::assertNotNull($this->actor->find(self::passwordProtectWorkingIcon(), 10)); + } + + /** + * @Then I see that the working icon for password protect is eventually not shown + */ + public function iSeeThatTheWorkingIconForPasswordProtectIsEventuallyNotShown() { + if (!WaitFor::elementToBeEventuallyNotShown( + $this->actor, + self::passwordProtectWorkingIcon(), + $timeout = 10 * $this->actor->getFindTimeoutMultiplier())) { + PHPUnit_Framework_Assert::fail("The working icon for password protect is still shown after $timeout seconds"); + } + } + + /** + * @Given I share the link for :fileName protected by the password :password + */ + public function iShareTheLinkForProtectedByThePassword($fileName, $password) { + $this->iShareTheLinkFor($fileName); + $this->iProtectTheSharedLinkWithThePassword($password); + $this->iSeeThatTheWorkingIconForPasswordProtectIsShown(); + $this->iSeeThatTheWorkingIconForPasswordProtectIsEventuallyNotShown(); + } + + private function showShareLinkMenuIfNeeded() { + // In some cases the share menu is hidden after clicking on an action of + // the menu. Therefore, if the menu is visible, wait a little just in + // case it is in the process of being hidden due to a previous action, + // in which case it is shown again. + if (WaitFor::elementToBeEventuallyNotShown( + $this->actor, + self::shareLinkMenu(), + $timeout = 2 * $this->actor->getFindTimeoutMultiplier())) { + $this->actor->find(self::shareLinkMenuButton(), 10)->click(); + } + } + + private function showShareWithMenuIfNeeded($shareWithName) { + // In some cases the share menu is hidden after clicking on an action of + // the menu. Therefore, if the menu is visible, wait a little just in + // case it is in the process of being hidden due to a previous action, + // in which case it is shown again. + if (WaitFor::elementToBeEventuallyNotShown( + $this->actor, + self::shareWithMenu($shareWithName), + $timeout = 2 * $this->actor->getFindTimeoutMultiplier())) { + $this->actor->find(self::shareWithMenuButton($shareWithName), 10)->click(); + } + } +} From c55054e2a512c99807998bd134779176f81f9fbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Calvi=C3=B1o=20S=C3=A1nchez?= Date: Fri, 23 Nov 2018 13:32:27 +0100 Subject: [PATCH 9/9] Rename "FilesSharingAppContext" to "PublicShareContext" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Having both "FilesAppSharingContext" and "FilesSharingAppContext" was confusing, so "FilesSharingAppContext" was renamed to a more descriptive name. Signed-off-by: Daniel Calviño Sánchez --- tests/acceptance/config/behat.yml | 4 ++-- .../{FilesSharingAppContext.php => PublicShareContext.php} | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) rename tests/acceptance/features/bootstrap/{FilesSharingAppContext.php => PublicShareContext.php} (98%) diff --git a/tests/acceptance/config/behat.yml b/tests/acceptance/config/behat.yml index 7d64e6a207c95..5149180d9bd93 100644 --- a/tests/acceptance/config/behat.yml +++ b/tests/acceptance/config/behat.yml @@ -17,9 +17,9 @@ default: - FileListContext - FilesAppContext - FilesAppSharingContext - - FilesSharingAppContext - LoginPageContext - NotificationContext + - PublicShareContext - SettingsContext - SettingsMenuContext - ThemingAppContext @@ -44,9 +44,9 @@ default: - FileListContext - FilesAppContext - FilesAppSharingContext - - FilesSharingAppContext - LoginPageContext - NotificationContext + - PublicShareContext - SettingsContext - SettingsMenuContext - ThemingAppContext diff --git a/tests/acceptance/features/bootstrap/FilesSharingAppContext.php b/tests/acceptance/features/bootstrap/PublicShareContext.php similarity index 98% rename from tests/acceptance/features/bootstrap/FilesSharingAppContext.php rename to tests/acceptance/features/bootstrap/PublicShareContext.php index 1fe12d5f42dcb..d475f1c6a1753 100644 --- a/tests/acceptance/features/bootstrap/FilesSharingAppContext.php +++ b/tests/acceptance/features/bootstrap/PublicShareContext.php @@ -23,7 +23,7 @@ use Behat\Behat\Context\Context; -class FilesSharingAppContext implements Context, ActorAwareInterface { +class PublicShareContext implements Context, ActorAwareInterface { use ActorAware; use FileListAncestorSetter;