mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert (partially) "Accept incoming shares in acceptance tests" 

This reverts commit f402e23448.

Since eb4c42d3d1 now shares are accepted
by default, so no notification is shown to accept them.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
This commit is contained in:
Daniel Calviño Sánchez 2020-03-20 17:39:34 +01:00
parent a0058fe601
commit 43e18e96e2
2 changed files with 18 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tests/acceptance/features/app-comments.feature
View File

@ -47,7 +47,6 @@ 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"
@ -64,7 +63,6 @@ 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"
@ -94,7 +92,6 @@ 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
@ -112,7 +109,6 @@ 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"
@ -141,7 +137,6 @@ 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
@ -159,7 +154,6 @@ 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"
@ -190,7 +184,6 @@ 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"
@ -209,7 +202,6 @@ 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"
@ -264,7 +256,6 @@ 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"

32
tests/acceptance/features/app-files-sharing.feature
View File

@ -11,7 +11,6 @@ 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"
@ -30,7 +29,6 @@ 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"
@ -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 "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
@ -53,13 +69,11 @@ 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"
@ -80,7 +94,6 @@ 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"
@ -106,7 +119,6 @@ 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"
@ -130,7 +142,6 @@ 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"
@ -147,7 +158,6 @@ 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"
@ -170,7 +180,6 @@ 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"
@ -179,7 +188,6 @@ 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"
@ -198,12 +206,10 @@ 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"
@ -226,7 +232,6 @@ 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"
@ -253,7 +258,6 @@ 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"