Accept incoming shares in acceptance tests
Incoming shares are no longer automatically added to the file list of the sharee. Instead, the user now needs to explictly accept the share. Currently shares can be accepted only from the Notifications app, so it must be explicitly cloned before installing Nextcloud if it is not found in the "apps" directory. Note that the development branches are already built, so there is no need to explicitly build the app. With the new sharing behaviour the "share a skeleton file with another user before first login" scenario is no longer valid (as the user will need to log in to accept the share, so at that point the skeleton is already created), so it was removed. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
This commit is contained in:
parent
0abff19aa9
commit
f402e23448
|
@ -19,6 +19,7 @@ default:
|
||||||
- FilesAppContext
|
- FilesAppContext
|
||||||
- FilesAppSharingContext
|
- FilesAppSharingContext
|
||||||
- LoginPageContext
|
- LoginPageContext
|
||||||
|
- NotificationsContext
|
||||||
- PublicShareContext
|
- PublicShareContext
|
||||||
- SearchContext
|
- SearchContext
|
||||||
- SettingsContext
|
- SettingsContext
|
||||||
|
@ -48,6 +49,7 @@ default:
|
||||||
- FilesAppContext
|
- FilesAppContext
|
||||||
- FilesAppSharingContext
|
- FilesAppSharingContext
|
||||||
- LoginPageContext
|
- LoginPageContext
|
||||||
|
- NotificationsContext
|
||||||
- PublicShareContext
|
- PublicShareContext
|
||||||
- SearchContext
|
- SearchContext
|
||||||
- SettingsContext
|
- SettingsContext
|
||||||
|
|
|
@ -47,6 +47,7 @@ Feature: app-comments
|
||||||
And I create a new comment with "Hello world" as message
|
And I create a new comment with "Hello world" as message
|
||||||
And I see a comment with "Hello world" as message
|
And I see a comment with "Hello world" as message
|
||||||
When I act as Jane
|
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
|
# The Files app is open again to reload the file list and the comments
|
||||||
And I open the Files app
|
And I open the Files app
|
||||||
And I open the details view for "shared.txt"
|
And I open the details view for "shared.txt"
|
||||||
|
@ -63,6 +64,7 @@ Feature: app-comments
|
||||||
And I share "shared.txt" with "user0"
|
And I share "shared.txt" with "user0"
|
||||||
And I see that the file is shared with "user0"
|
And I see that the file is shared with "user0"
|
||||||
And I act as Jane
|
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
|
# The Files app is open again to reload the file list
|
||||||
And I open the Files app
|
And I open the Files app
|
||||||
And I open the details view for "shared.txt"
|
And I open the details view for "shared.txt"
|
||||||
|
@ -92,6 +94,7 @@ Feature: app-comments
|
||||||
And I create a new comment with "Hello world" as message
|
And I create a new comment with "Hello world" as message
|
||||||
And I see a comment with "Hello world" as message
|
And I see a comment with "Hello world" as message
|
||||||
When I act as Jane
|
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
|
# The Files app is open again to reload the file list and the comments
|
||||||
And I open the Files app
|
And I open the Files app
|
||||||
Then I see that "shared.txt" has unread comments
|
Then I see that "shared.txt" has unread comments
|
||||||
|
@ -109,6 +112,7 @@ Feature: app-comments
|
||||||
And I share "shared.txt" with "user0"
|
And I share "shared.txt" with "user0"
|
||||||
And I see that the file is shared with "user0"
|
And I see that the file is shared with "user0"
|
||||||
And I act as Jane
|
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
|
# The Files app is open again to reload the file list
|
||||||
And I open the Files app
|
And I open the Files app
|
||||||
And I open the details view for "shared.txt"
|
And I open the details view for "shared.txt"
|
||||||
|
@ -137,6 +141,7 @@ Feature: app-comments
|
||||||
And I create a new comment with "Hello world" as message
|
And I create a new comment with "Hello world" as message
|
||||||
And I see a comment with "Hello world" as message
|
And I see a comment with "Hello world" as message
|
||||||
When I act as Jane
|
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
|
# The Files app is open again to reload the file list and the comments
|
||||||
And I open the Files app
|
And I open the Files app
|
||||||
Then I see that "Folder" has unread comments
|
Then I see that "Folder" has unread comments
|
||||||
|
@ -154,6 +159,7 @@ Feature: app-comments
|
||||||
And I share "Folder" with "user0"
|
And I share "Folder" with "user0"
|
||||||
And I see that the file is shared with "user0"
|
And I see that the file is shared with "user0"
|
||||||
And I act as Jane
|
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
|
# The Files app is open again to reload the file list
|
||||||
And I open the Files app
|
And I open the Files app
|
||||||
And I open the details view for "Folder"
|
And I open the details view for "Folder"
|
||||||
|
@ -184,6 +190,7 @@ Feature: app-comments
|
||||||
And I create a new comment with "Hello world" as message
|
And I create a new comment with "Hello world" as message
|
||||||
And I see a comment with "Hello world" as message
|
And I see a comment with "Hello world" as message
|
||||||
When I act as Jane
|
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
|
# The Files app is open again to reload the file list and the comments
|
||||||
And I open the Files app
|
And I open the Files app
|
||||||
And I enter in the folder named "Folder"
|
And I enter in the folder named "Folder"
|
||||||
|
@ -202,6 +209,7 @@ Feature: app-comments
|
||||||
And I share "Folder" with "user0"
|
And I share "Folder" with "user0"
|
||||||
And I see that the file is shared with "user0"
|
And I see that the file is shared with "user0"
|
||||||
And I act as Jane
|
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
|
# The Files app is open again to reload the file list
|
||||||
And I open the Files app
|
And I open the Files app
|
||||||
And I enter in the folder named "Folder"
|
And I enter in the folder named "Folder"
|
||||||
|
@ -256,6 +264,7 @@ Feature: app-comments
|
||||||
And I share "shared.txt" with "user0"
|
And I share "shared.txt" with "user0"
|
||||||
And I see that the file is shared with "user0"
|
And I see that the file is shared with "user0"
|
||||||
And I act as Jane
|
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
|
# The Files app is open again to reload the file list
|
||||||
And I open the Files app
|
And I open the Files app
|
||||||
And I open the details view for "shared.txt"
|
And I open the details view for "shared.txt"
|
||||||
|
|
|
@ -11,6 +11,7 @@ Feature: app-files-sharing
|
||||||
When I share "farewell.txt" with "user0"
|
When I share "farewell.txt" with "user0"
|
||||||
And I see that the file is shared with "user0"
|
And I see that the file is shared with "user0"
|
||||||
And I act as Jane
|
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
|
# The Files app is open again to reload the file list
|
||||||
And I open the Files app
|
And I open the Files app
|
||||||
Then I see that the file list contains a file named "farewell.txt"
|
Then I see that the file list contains a file named "farewell.txt"
|
||||||
|
@ -29,6 +30,7 @@ Feature: app-files-sharing
|
||||||
When I share "welcome.txt" with "user0"
|
When I share "welcome.txt" with "user0"
|
||||||
And I see that the file is shared with "user0"
|
And I see that the file is shared with "user0"
|
||||||
And I act as Jane
|
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
|
# The Files app is open again to reload the file list
|
||||||
And I open the Files app
|
And I open the Files app
|
||||||
Then I see that the file list contains a file named "welcome (2).txt"
|
Then I see that the file list contains a file named "welcome (2).txt"
|
||||||
|
@ -38,24 +40,6 @@ Feature: app-files-sharing
|
||||||
And I see that the "Sharing" tab in the details view is eventually loaded
|
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 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
|
Scenario: reshare a file with another user
|
||||||
Given I act as John
|
Given I act as John
|
||||||
And I am logged in as the admin
|
And I am logged in as the admin
|
||||||
|
@ -69,11 +53,13 @@ Feature: app-files-sharing
|
||||||
And I share "farewell.txt" with "user0"
|
And I share "farewell.txt" with "user0"
|
||||||
And I see that the file is shared with "user0"
|
And I see that the file is shared with "user0"
|
||||||
And I act as Jane
|
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
|
# The Files app is open again to reload the file list
|
||||||
And I open the Files app
|
And I open the Files app
|
||||||
When I share "farewell.txt" with "user1"
|
When I share "farewell.txt" with "user1"
|
||||||
And I see that the file is shared with "user1"
|
And I see that the file is shared with "user1"
|
||||||
And I act as Jim
|
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
|
# The Files app is open again to reload the file list
|
||||||
And I open the Files app
|
And I open the Files app
|
||||||
Then I see that the file list contains a file named "farewell.txt"
|
Then I see that the file list contains a file named "farewell.txt"
|
||||||
|
@ -94,6 +80,7 @@ Feature: app-files-sharing
|
||||||
And I share "farewell.txt" with "user0"
|
And I share "farewell.txt" with "user0"
|
||||||
And I see that the file is shared with "user0"
|
And I see that the file is shared with "user0"
|
||||||
And I act as Jane
|
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
|
# The Files app is open again to reload the file list
|
||||||
And I open the Files app
|
And I open the Files app
|
||||||
And I share "farewell.txt" with "user1"
|
And I share "farewell.txt" with "user1"
|
||||||
|
@ -119,6 +106,7 @@ Feature: app-files-sharing
|
||||||
When I share "Shared folder" with "user0"
|
When I share "Shared folder" with "user0"
|
||||||
And I see that the file is shared with "user0"
|
And I see that the file is shared with "user0"
|
||||||
And I act as Jane
|
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
|
# The Files app is open again to reload the file list
|
||||||
And I open the Files app
|
And I open the Files app
|
||||||
Then I see that the file list contains a file named "Shared folder"
|
Then I see that the file list contains a file named "Shared folder"
|
||||||
|
@ -142,6 +130,7 @@ Feature: app-files-sharing
|
||||||
And I create a new folder named "Subfolder"
|
And I create a new folder named "Subfolder"
|
||||||
And I see that the file list contains a file named "Subfolder"
|
And I see that the file list contains a file named "Subfolder"
|
||||||
When I act as Jane
|
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
|
# The Files app is open again to reload the file list
|
||||||
And I open the Files app
|
And I open the Files app
|
||||||
And I enter in the folder named "Shared folder"
|
And I enter in the folder named "Shared folder"
|
||||||
|
@ -158,6 +147,7 @@ Feature: app-files-sharing
|
||||||
And I share "Shared folder" with "user0"
|
And I share "Shared folder" with "user0"
|
||||||
And I see that the file is shared with "user0"
|
And I see that the file is shared with "user0"
|
||||||
And I act as Jane
|
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
|
# The Files app is open again to reload the file list
|
||||||
And I open the Files app
|
And I open the Files app
|
||||||
And I enter in the folder named "Shared folder"
|
And I enter in the folder named "Shared folder"
|
||||||
|
@ -180,6 +170,7 @@ Feature: app-files-sharing
|
||||||
And I share "Shared folder" with "user0"
|
And I share "Shared folder" with "user0"
|
||||||
And I see that the file is shared with "user0"
|
And I see that the file is shared with "user0"
|
||||||
And I act as Jane
|
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
|
# The Files app is open again to reload the file list
|
||||||
And I open the Files app
|
And I open the Files app
|
||||||
And I share "Shared folder" with "user1"
|
And I share "Shared folder" with "user1"
|
||||||
|
@ -188,6 +179,7 @@ Feature: app-files-sharing
|
||||||
And I create a new folder named "Subfolder"
|
And I create a new folder named "Subfolder"
|
||||||
And I see that the file list contains a file named "Subfolder"
|
And I see that the file list contains a file named "Subfolder"
|
||||||
When I act as Jim
|
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
|
# The Files app is open again to reload the file list
|
||||||
And I open the Files app
|
And I open the Files app
|
||||||
And I enter in the folder named "Shared folder"
|
And I enter in the folder named "Shared folder"
|
||||||
|
@ -206,10 +198,12 @@ Feature: app-files-sharing
|
||||||
And I share "Shared folder" with "user0"
|
And I share "Shared folder" with "user0"
|
||||||
And I see that the file is shared with "user0"
|
And I see that the file is shared with "user0"
|
||||||
And I act as Jane
|
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
|
# The Files app is open again to reload the file list
|
||||||
And I open the Files app
|
And I open the Files app
|
||||||
And I share "Shared folder" with "user1"
|
And I share "Shared folder" with "user1"
|
||||||
And I act as Jim
|
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
|
# The Files app is open again to reload the file list
|
||||||
And I open the Files app
|
And I open the Files app
|
||||||
And I enter in the folder named "Shared folder"
|
And I enter in the folder named "Shared folder"
|
||||||
|
@ -232,6 +226,7 @@ Feature: app-files-sharing
|
||||||
And I set the share with "user0" as not reshareable
|
And I set the share with "user0" as not reshareable
|
||||||
And I see that "user0" can not reshare the share
|
And I see that "user0" can not reshare the share
|
||||||
When I act as Jane
|
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
|
# The Files app is open again to reload the file list
|
||||||
And I open the Files app
|
And I open the Files app
|
||||||
Then I see that the file list contains a file named "Shared folder"
|
Then I see that the file list contains a file named "Shared folder"
|
||||||
|
@ -258,6 +253,7 @@ Feature: app-files-sharing
|
||||||
And I create a new folder named "Subfolder"
|
And I create a new folder named "Subfolder"
|
||||||
And I see that the file list contains a file named "Subfolder"
|
And I see that the file list contains a file named "Subfolder"
|
||||||
When I act as Jane
|
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
|
# The Files app is open again to reload the file list
|
||||||
And I open the Files app
|
And I open the Files app
|
||||||
And I enter in the folder named "Shared folder"
|
And I enter in the folder named "Shared folder"
|
||||||
|
|
|
@ -0,0 +1,98 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
/**
|
||||||
|
*
|
||||||
|
* @copyright Copyright (c) 2019, Daniel Calviño Sánchez (danxuliu@gmail.com)
|
||||||
|
*
|
||||||
|
* @license GNU AGPL version 3 or any later version
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU Affero General Public License as
|
||||||
|
* published by the Free Software Foundation, either version 3 of the
|
||||||
|
* License, or (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU Affero General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Affero General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
use Behat\Behat\Context\Context;
|
||||||
|
|
||||||
|
class NotificationsContext implements Context, ActorAwareInterface {
|
||||||
|
|
||||||
|
use ActorAware;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return Locator
|
||||||
|
*/
|
||||||
|
public static function notificationsButton() {
|
||||||
|
return Locator::forThe()->css("#header .notifications .notifications-button")->
|
||||||
|
describedAs("Notifications button in the header");
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return Locator
|
||||||
|
*/
|
||||||
|
public static function notificationsContainer() {
|
||||||
|
return Locator::forThe()->css("#header .notifications .notification-container")->
|
||||||
|
describedAs("Notifications container");
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return Locator
|
||||||
|
*/
|
||||||
|
public static function incomingShareNotificationForFile($fileName) {
|
||||||
|
return Locator::forThe()->xpath("//div[contains(concat(' ', normalize-space(@class), ' '), ' notification ') and //div[starts-with(normalize-space(), 'You received $fileName as a share by')]]")->
|
||||||
|
descendantOf(self::notificationsContainer())->
|
||||||
|
describedAs("Notification of incoming share for file $fileName");
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return Locator
|
||||||
|
*/
|
||||||
|
public static function actionsInIncomingShareNotificationForFile($fileName) {
|
||||||
|
return Locator::forThe()->css(".notification-actions")->
|
||||||
|
descendantOf(self::incomingShareNotificationForFile($fileName))->
|
||||||
|
describedAs("Actions in notification of incoming share for file $fileName");
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return Locator
|
||||||
|
*/
|
||||||
|
public static function actionInIncomingShareNotificationForFile($fileName, $action) {
|
||||||
|
return Locator::forThe()->xpath("//button[normalize-space() = '$action']")->
|
||||||
|
descendantOf(self::actionsInIncomingShareNotificationForFile($fileName))->
|
||||||
|
describedAs("$action button in notification of incoming share for file $fileName");
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return Locator
|
||||||
|
*/
|
||||||
|
public static function acceptButtonInIncomingShareNotificationForFile($fileName) {
|
||||||
|
return self::actionInIncomingShareNotificationForFile($fileName, 'Accept');
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @Given I accept the share for :fileName in the notifications
|
||||||
|
*/
|
||||||
|
public function iAcceptTheShareForInTheNotifications($fileName) {
|
||||||
|
$this->actor->find(self::notificationsButton(), 10)->click();
|
||||||
|
|
||||||
|
// Notifications are refreshed every 30 seconds, so wait a bit longer.
|
||||||
|
// 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->find(self::acceptButtonInIncomingShareNotificationForFile($fileName), 35)->click();
|
||||||
|
$this->actor->setFindTimeoutMultiplier($findTimeoutMultiplier);
|
||||||
|
|
||||||
|
// Hide the notifications again
|
||||||
|
$this->actor->find(self::notificationsButton(), 10)->click();
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
|
@ -193,6 +193,11 @@ cd ../../
|
||||||
# server to make possible to run the Nextcloud server on Apache if needed.
|
# server to make possible to run the Nextcloud server on Apache if needed.
|
||||||
ln --symbolic $(pwd) /var/www/html
|
ln --symbolic $(pwd) /var/www/html
|
||||||
|
|
||||||
|
# Add Notifications app to the "apps" directory (unless it is already there).
|
||||||
|
if [ ! -e "apps/notifications" ]; then
|
||||||
|
(cd apps && git clone --depth 1 https://github.com/nextcloud/notifications)
|
||||||
|
fi
|
||||||
|
|
||||||
INSTALL_AND_CONFIGURE_SERVER_PARAMETERS=""
|
INSTALL_AND_CONFIGURE_SERVER_PARAMETERS=""
|
||||||
if [ "$NEXTCLOUD_SERVER_DOMAIN" != "$DEFAULT_NEXTCLOUD_SERVER_DOMAIN" ]; then
|
if [ "$NEXTCLOUD_SERVER_DOMAIN" != "$DEFAULT_NEXTCLOUD_SERVER_DOMAIN" ]; then
|
||||||
INSTALL_AND_CONFIGURE_SERVER_PARAMETERS+="--nextcloud-server-domain $NEXTCLOUD_SERVER_DOMAIN"
|
INSTALL_AND_CONFIGURE_SERVER_PARAMETERS+="--nextcloud-server-domain $NEXTCLOUD_SERVER_DOMAIN"
|
||||||
|
|
Loading…
Reference in New Issue