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>

1 files changed, 14 insertions, 18 deletions

diff --git a/tests/acceptance/features/app-files-sharing.feature b/tests/acceptance/features/app-files-sharing.feature
index 401384816e8..15ed42aba6a 100644
--- a/tests/acceptance/features/app-files-sharing.feature
+++ b/tests/acceptance/features/app-files-sharing.feature
@@ -11,6 +11,7 @@ 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"
@@ -29,6 +30,7 @@ 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"
@@ -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 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
@@ -69,11 +53,13 @@ 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"
@@ -94,6 +80,7 @@ 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"
@@ -119,6 +106,7 @@ 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"
@@ -142,6 +130,7 @@ 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"
@@ -158,6 +147,7 @@ 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"
@@ -180,6 +170,7 @@ 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"
@@ -188,6 +179,7 @@ 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"
@@ -206,10 +198,12 @@ 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"
@@ -232,6 +226,7 @@ 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"
@@ -258,6 +253,7 @@ 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"