Skip to content

Use skeleton files only when necessary in webuiCreateDelete and webUISharingIntGrp suites #35421

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
phil-davis merged 1 commit into from
Jun 4, 2019
Merged

Use skeleton files only when necessary in webuiCreateDelete and webUISharingIntGrp suites #35421

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions tests/acceptance/features/webUICreateDelete/createFolders.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Feature: create folders
So that I can organise my data structure

Background:
Given user "user1" has been created with default attributes
Given user "user1" has been created with default attributes and without skeleton files
And user "user1" has logged in using the webUI
And the user has browsed to the files page

Expand All @@ -30,11 +30,15 @@ Feature: create folders
Then folder "sub-folder" should be listed on the webUI

Scenario: Create a folder with existing name
Given user "user1" has created folder "/simple-folder"
And the user has reloaded the current page of the webUI
When the user creates a folder with the invalid name "simple-folder" using the webUI
Then near the folder input field a tooltip with the text 'simple-folder already exists' should be displayed on the webUI

Scenario: Create a folder in a public share
Given the user has created a new public link for folder "simple-empty-folder" using the webUI with
Given user "user1" has created folder "/simple-empty-folder"
And the user has reloaded the current page of the webUI
And the user has created a new public link for folder "simple-empty-folder" using the webUI with
| permission | read-write |
And the public accesses the last created public link using the webUI
When the user creates a folder with the name "top-folder" using the webUI
Expand Down
6 changes: 3 additions & 3 deletions tests/acceptance/features/webUICreateDelete/createFoldersEdgeCases.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Feature: create folder
So that I can organise my data structure

Background:
Given user "user1" has been created with default attributes
Given user "user1" has been created with default attributes and without skeleton files
And user "user1" has logged in using the webUI
And the user has browsed to the files page

Expand Down Expand Up @@ -39,8 +39,8 @@ Feature: create folder

@smokeTest
Scenario Outline: Create a sub-folder inside an existing folder with problematic name
# Use an existing folder with problematic name to create a sub-folder
# Uses the folder created by skeleton
Given user "user1" has created folder <folder>
And the user has reloaded the current page of the webUI
When the user opens folder <folder> using the webUI
And the user creates a folder with the name "sub-folder" using the webUI
Then folder "sub-folder" should be listed on the webUI
Expand Down
2 changes: 1 addition & 1 deletion tests/acceptance/features/webUICreateDelete/deleteFilesFolders.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ Feature: deleting files and folders
And file "zzzz-must-be-last-file-in-folder.txt" should not be listed on the webUI

Scenario: delete files from shared with others page
Given user "user2" has been created with default attributes
Given user "user2" has been created with default attributes and without skeleton files
Given the user has shared file "lorem.txt" with user "User Two" using the webUI
And the user has shared folder "simple-folder" with user "User Two" using the webUI
And the user has browsed to the shared-with-others page
Expand Down
28 changes: 14 additions & 14 deletions tests/acceptance/features/webUISharingInternalGroups/shareWithGroups.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ Feature: Sharing files and folders with internal groups
So that those groups can access the files and folders

Background:
Given these users have been created with default attributes:
Given these users have been created with default attributes and without skeleton files:
| username |
| user1 |
| user2 |
| user3 |
And user "user3" has been created with default attributes
And these groups have been created:
| groupname |
| grp1 |
Expand All @@ -23,15 +23,15 @@ Feature: Sharing files and folders with internal groups
When the user shares folder "simple-folder" with group "grp1" using the webUI
And the user shares file "testimage.jpg" with group "grp1" using the webUI
And the user re-logs in as "user1" using the webUI
Then folder "simple-folder (2)" should be listed on the webUI
And folder "simple-folder (2)" should be marked as shared with "grp1" by "User Three" on the webUI
And file "testimage (2).jpg" should be listed on the webUI
And file "testimage (2).jpg" should be marked as shared with "grp1" by "User Three" on the webUI
Then folder "simple-folder" should be listed on the webUI
And folder "simple-folder" should be marked as shared with "grp1" by "User Three" on the webUI
And file "testimage.jpg" should be listed on the webUI
And file "testimage.jpg" should be marked as shared with "grp1" by "User Three" on the webUI
When the user re-logs in as "user2" using the webUI
Then folder "simple-folder (2)" should be listed on the webUI
And folder "simple-folder (2)" should be marked as shared with "grp1" by "User Three" on the webUI
And file "testimage (2).jpg" should be listed on the webUI
And file "testimage (2).jpg" should be marked as shared with "grp1" by "User Three" on the webUI
Then folder "simple-folder" should be listed on the webUI
And folder "simple-folder" should be marked as shared with "grp1" by "User Three" on the webUI
And file "testimage.jpg" should be listed on the webUI
And file "testimage.jpg" should be marked as shared with "grp1" by "User Three" on the webUI

@TestAlsoOnExternalUserBackend @skipOnFIREFOX
Scenario: share a file with an internal group a member overwrites and unshares the file
Expand Down Expand Up @@ -112,19 +112,19 @@ Feature: Sharing files and folders with internal groups
Given group "system-group" has been created
And the administrator has browsed to the admin sharing settings page
When the administrator excludes group "system-group" from receiving shares using the webUI
Then user "user1" should not be able to share file "lorem.txt" with group "system-group" using the sharing API
Then user "user3" should not be able to share file "lorem.txt" with group "system-group" using the sharing API

Scenario: user tries to share a folder in a group which is excluded from receiving share
Given group "system-group" has been created
And the administrator has browsed to the admin sharing settings page
When the administrator excludes group "system-group" from receiving shares using the webUI
Then user "user1" should not be able to share folder "simple-folder" with group "system-group" using the sharing API
Then user "user3" should not be able to share folder "simple-folder" with group "system-group" using the sharing API

Scenario: autocompletion for a group that is excluded from receiving shares
Given group "system-group" has been created
And the administrator has browsed to the admin sharing settings page
When the administrator excludes group "system-group" from receiving shares using the webUI
And the user re-logs in as "user1" using the webUI
And the user re-logs in as "user3" using the webUI
And the user browses to the files page
And the user opens the share dialog for folder "simple-folder"
And the user types "system-group" in the share-with-field
Expand Down Expand Up @@ -184,7 +184,7 @@ Feature: Sharing files and folders with internal groups
@mailhog
Scenario: user should get an error message when trying to send notification by email to the group where some user have set up their email and others haven't
Given parameter "shareapi_allow_mail_notification" of app "core" has been set to "yes"
And these users have been created:
And these users have been created without skeleton files:
| username |
| brand-new-user |
| off-brand-new-user |
Expand Down
20 changes: 10 additions & 10 deletions tests/acceptance/features/webUISharingInternalGroups/shareWithGroupsEdgeCases.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ Feature: Sharing files and folders with internal groups
So that those groups can access the files and folders

Scenario Outline: sharing files and folder with an internal problematic group name
Given these users have been created with default attributes:
Given these users have been created with default attributes and without skeleton files:
| username |
| user1 |
| user2 |
| user3 |
And user "user3" has been created with default attributes
And these groups have been created:
| groupname |
| <group> |
Expand All @@ -19,15 +19,15 @@ Feature: Sharing files and folders with internal groups
When the user shares folder "simple-folder" with group "<group>" using the webUI
And the user shares file "testimage.jpg" with group "<group>" using the webUI
And the user re-logs in as "user1" using the webUI
Then folder "simple-folder (2)" should be listed on the webUI
And folder "simple-folder (2)" should be marked as shared with "<group>" by "User Three" on the webUI
And file "testimage (2).jpg" should be listed on the webUI
And file "testimage (2).jpg" should be marked as shared with "<group>" by "User Three" on the webUI
Then folder "simple-folder" should be listed on the webUI
And folder "simple-folder" should be marked as shared with "<group>" by "User Three" on the webUI
And file "testimage.jpg" should be listed on the webUI
And file "testimage.jpg" should be marked as shared with "<group>" by "User Three" on the webUI
When the user re-logs in as "user2" using the webUI
Then folder "simple-folder (2)" should be listed on the webUI
And folder "simple-folder (2)" should be marked as shared with "<group>" by "User Three" on the webUI
And file "testimage (2).jpg" should be listed on the webUI
And file "testimage (2).jpg" should be marked as shared with "<group>" by "User Three" on the webUI
Then folder "simple-folder" should be listed on the webUI
And folder "simple-folder" should be marked as shared with "<group>" by "User Three" on the webUI
And file "testimage.jpg" should be listed on the webUI
And file "testimage.jpg" should be marked as shared with "<group>" by "User Three" on the webUI
Examples:
| group |
| ?\?@#%@,; |
Expand Down