From 43e18e96e26ceb3767bd07aa300416970c49970f Mon Sep 17 00:00:00 2001 From: Daniel Calviño Sánchez Date: Fri, 20 Mar 2020 17:39:34 +0100 Subject: Revert (partially) "Accept incoming shares in acceptance tests" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit f402e234480cd9d18c6c90ef011968eb7abcd5dc. Since eb4c42d3d1fda02895d35a360bceb08379f328c2 now shares are accepted by default, so no notification is shown to accept them. Signed-off-by: Daniel Calviño Sánchez --- tests/acceptance/features/app-comments.feature | 9 ------ .../acceptance/features/app-files-sharing.feature | 32 ++++++++++++---------- 2 files changed, 18 insertions(+), 23 deletions(-) diff --git a/tests/acceptance/features/app-comments.feature b/tests/acceptance/features/app-comments.feature index 001d0967c18..b57883d8ba8 100644 --- a/tests/acceptance/features/app-comments.feature +++ b/tests/acceptance/features/app-comments.feature @@ -47,7 +47,6 @@ Feature: app-comments And I create a new comment with "Hello world" as message And I see a comment with "Hello world" as message When I act as Jane - And I accept the share for "shared.txt" in the notifications # The Files app is open again to reload the file list and the comments And I open the Files app And I open the details view for "shared.txt" @@ -64,7 +63,6 @@ Feature: app-comments And I share "shared.txt" with "user0" And I see that the file is shared with "user0" And I act as Jane - And I accept the share for "shared.txt" in the notifications # The Files app is open again to reload the file list And I open the Files app And I open the details view for "shared.txt" @@ -94,7 +92,6 @@ Feature: app-comments And I create a new comment with "Hello world" as message And I see a comment with "Hello world" as message When I act as Jane - And I accept the share for "shared.txt" in the notifications # The Files app is open again to reload the file list and the comments And I open the Files app Then I see that "shared.txt" has unread comments @@ -112,7 +109,6 @@ Feature: app-comments And I share "shared.txt" with "user0" And I see that the file is shared with "user0" And I act as Jane - And I accept the share for "shared.txt" in the notifications # The Files app is open again to reload the file list And I open the Files app And I open the details view for "shared.txt" @@ -141,7 +137,6 @@ Feature: app-comments And I create a new comment with "Hello world" as message And I see a comment with "Hello world" as message When I act as Jane - And I accept the share for "Folder" in the notifications # The Files app is open again to reload the file list and the comments And I open the Files app Then I see that "Folder" has unread comments @@ -159,7 +154,6 @@ Feature: app-comments And I share "Folder" with "user0" And I see that the file is shared with "user0" And I act as Jane - And I accept the share for "Folder" in the notifications # The Files app is open again to reload the file list And I open the Files app And I open the details view for "Folder" @@ -190,7 +184,6 @@ Feature: app-comments And I create a new comment with "Hello world" as message And I see a comment with "Hello world" as message When I act as Jane - And I accept the share for "Folder" in the notifications # The Files app is open again to reload the file list and the comments And I open the Files app And I enter in the folder named "Folder" @@ -209,7 +202,6 @@ Feature: app-comments And I share "Folder" with "user0" And I see that the file is shared with "user0" And I act as Jane - And I accept the share for "Folder" in the notifications # The Files app is open again to reload the file list And I open the Files app And I enter in the folder named "Folder" @@ -264,7 +256,6 @@ Feature: app-comments And I share "shared.txt" with "user0" And I see that the file is shared with "user0" And I act as Jane - And I accept the share for "shared.txt" in the notifications # The Files app is open again to reload the file list And I open the Files app And I open the details view for "shared.txt" diff --git a/tests/acceptance/features/app-files-sharing.feature b/tests/acceptance/features/app-files-sharing.feature index 15ed42aba6a..401384816e8 100644 --- a/tests/acceptance/features/app-files-sharing.feature +++ b/tests/acceptance/features/app-files-sharing.feature @@ -11,7 +11,6 @@ Feature: app-files-sharing When I share "farewell.txt" with "user0" And I see that the file is shared with "user0" And I act as Jane - And I accept the share for "farewell.txt" in the notifications # 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" @@ -30,7 +29,6 @@ Feature: app-files-sharing When I share "welcome.txt" with "user0" And I see that the file is shared with "user0" And I act as Jane - And I accept the share for "welcome.txt" in the notifications # 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" @@ -40,6 +38,24 @@ Feature: app-files-sharing 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 @@ -53,13 +69,11 @@ Feature: app-files-sharing And I share "farewell.txt" with "user0" And I see that the file is shared with "user0" And I act as Jane - And I accept the share for "farewell.txt" in the notifications # 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 - And I accept the share for "farewell.txt" in the notifications # 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" @@ -80,7 +94,6 @@ Feature: app-files-sharing And I share "farewell.txt" with "user0" And I see that the file is shared with "user0" And I act as Jane - And I accept the share for "farewell.txt" in the notifications # The Files app is open again to reload the file list And I open the Files app And I share "farewell.txt" with "user1" @@ -106,7 +119,6 @@ Feature: app-files-sharing When I share "Shared folder" with "user0" And I see that the file is shared with "user0" And I act as Jane - And I accept the share for "Shared folder" in the notifications # 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" @@ -130,7 +142,6 @@ Feature: app-files-sharing 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 - And I accept the share for "Shared folder" in the notifications # 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" @@ -147,7 +158,6 @@ Feature: app-files-sharing And I share "Shared folder" with "user0" And I see that the file is shared with "user0" And I act as Jane - And I accept the share for "Shared folder" in the notifications # 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" @@ -170,7 +180,6 @@ Feature: app-files-sharing And I share "Shared folder" with "user0" And I see that the file is shared with "user0" And I act as Jane - And I accept the share for "Shared folder" in the notifications # The Files app is open again to reload the file list And I open the Files app And I share "Shared folder" with "user1" @@ -179,7 +188,6 @@ Feature: app-files-sharing 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 - And I accept the share for "Shared folder" in the notifications # 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" @@ -198,12 +206,10 @@ Feature: app-files-sharing And I share "Shared folder" with "user0" And I see that the file is shared with "user0" And I act as Jane - And I accept the share for "Shared folder" in the notifications # 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 - And I accept the share for "Shared folder" in the notifications # 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" @@ -226,7 +232,6 @@ Feature: app-files-sharing 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 - And I accept the share for "Shared folder" in the notifications # 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" @@ -253,7 +258,6 @@ Feature: app-files-sharing 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 - And I accept the share for "Shared folder" in the notifications # 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" -- cgit v1.2.3 From 887e74043468106ec7a28b2b68e38d471696357e Mon Sep 17 00:00:00 2001 From: Daniel Calviño Sánchez Date: Fri, 20 Mar 2020 17:43:12 +0100 Subject: Fix timeout capping 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/bootstrap/NotificationsContext.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/acceptance/features/bootstrap/NotificationsContext.php b/tests/acceptance/features/bootstrap/NotificationsContext.php index 6f959f0468c..13717b0ba03 100644 --- a/tests/acceptance/features/bootstrap/NotificationsContext.php +++ b/tests/acceptance/features/bootstrap/NotificationsContext.php @@ -87,7 +87,7 @@ class NotificationsContext implements Context, ActorAwareInterface { // As the waiting is long enough already the find timeout multiplier is // capped at 2 when finding notifications. $findTimeoutMultiplier = $this->actor->getFindTimeoutMultiplier(); - $this->actor->setFindTimeoutMultiplier(max(2, $findTimeoutMultiplier)); + $this->actor->setFindTimeoutMultiplier(min(2, $findTimeoutMultiplier)); $this->actor->find(self::acceptButtonInIncomingShareNotificationForFile($fileName), 35)->click(); $this->actor->setFindTimeoutMultiplier($findTimeoutMultiplier); -- cgit v1.2.3 From 9386f24ab0a1b795f53f68ee064bde6756150217 Mon Sep 17 00:00:00 2001 From: Daniel Calviño Sánchez Date: Fri, 20 Mar 2020 19:51:09 +0100 Subject: Add acceptance test for accepting an incoming share MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Daniel Calviño Sánchez --- .../acceptance/features/app-files-sharing.feature | 27 +++++++++++++ .../features/bootstrap/SettingsContext.php | 44 ++++++++++++++++++++++ 2 files changed, 71 insertions(+) diff --git a/tests/acceptance/features/app-files-sharing.feature b/tests/acceptance/features/app-files-sharing.feature index 401384816e8..e3b0ec30cf8 100644 --- a/tests/acceptance/features/app-files-sharing.feature +++ b/tests/acceptance/features/app-files-sharing.feature @@ -20,6 +20,33 @@ Feature: app-files-sharing 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 that needs to accept shares + 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 visit the settings page + And I open the "Sharing" section + And I disable accepting the shares by default + And I see that shares are not accepted by default + 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 + And I open the Files app + And I see that the file list does not contain a file named "farewell.txt" + And I accept the share for "/farewell.txt" in the notifications + # 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 diff --git a/tests/acceptance/features/bootstrap/SettingsContext.php b/tests/acceptance/features/bootstrap/SettingsContext.php index edbb6a94d15..82b22c43338 100644 --- a/tests/acceptance/features/bootstrap/SettingsContext.php +++ b/tests/acceptance/features/bootstrap/SettingsContext.php @@ -27,6 +27,25 @@ class SettingsContext implements Context, ActorAwareInterface { use ActorAware; + /** + * @return Locator + */ + public static function acceptSharesByDefaultCheckbox() { + // forThe()->checkbox("Accept user...") 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() = 'Accept user and group shares by default']")-> + describedAs("Accept shares by default checkbox in Sharing section in Personal Sharing Settings"); + } + + /** + * @return Locator + */ + public static function acceptSharesByDefaultCheckboxInput() { + return Locator::forThe()->checkbox("Accept user and group shares by default")-> + describedAs("Accept shares by default checkbox input in Sharing section in Personal Sharing Settings"); + } + /** * @return Locator */ @@ -84,6 +103,15 @@ class SettingsContext implements Context, ActorAwareInterface { describedAs("Reset button in system tags section in Administration Settings"); } + /** + * @When I disable accepting the shares by default + */ + public function iDisableAcceptingTheSharesByDefault() { + $this->iSeeThatSharesAreAcceptedByDefault(); + + $this->actor->find(self::acceptSharesByDefaultCheckbox(), 2)->click(); + } + /** * @When I create the tag :tag in the settings */ @@ -93,6 +121,22 @@ class SettingsContext implements Context, ActorAwareInterface { $this->actor->find(self::systemTagsCreateOrUpdateButton())->click(); } + /** + * @Then I see that shares are accepted by default + */ + public function iSeeThatSharesAreAcceptedByDefault() { + PHPUnit_Framework_Assert::assertTrue( + $this->actor->find(self::acceptSharesByDefaultCheckboxInput(), 10)->isChecked()); + } + + /** + * @Then I see that shares are not accepted by default + */ + public function iSeeThatSharesAreNotAcceptedByDefault() { + PHPUnit_Framework_Assert::assertFalse( + $this->actor->find(self::acceptSharesByDefaultCheckboxInput(), 10)->isChecked()); + } + /** * @Then I see that the button to select tags is shown */ -- cgit v1.2.3