Skip to content

Commit

Permalink
Merge pull request #35361 from owncloud/stable10-create-user-bg
Browse files Browse the repository at this point in the history
[stable10] Remove unnecessary create users from background in feature files for webUI tests
  • Loading branch information
phil-davis authored May 29, 2019
2 parents fc9e072 + fd5e0f7 commit 7be91da
Show file tree
Hide file tree
Showing 9 changed files with 19 additions and 14 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ Feature: deleting files and folders
Given these users have been created with default attributes:
| username |
| user1 |
| user2 |
And user "user1" has logged in using the webUI
And the user has browsed to the files page

Expand Down Expand Up @@ -118,6 +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 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
7 changes: 4 additions & 3 deletions tests/acceptance/features/webUIFiles/fileDetails.feature
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ Feature: User can open the details panel for any file or folder
Given these users have been created with default attributes:
| username |
| user1 |
| user2 |
And user "user1" has logged in using the webUI
And the user has browsed to the files page

Expand Down Expand Up @@ -56,7 +55,8 @@ Feature: User can open the details panel for any file or folder

@comments-app-required
Scenario: user shares a file and then the details dialog should work in a Shared with others page
Given the user has shared folder "simple-folder" with user "User Two" using the webUI
Given user "user2" has been created with default attributes
And the user has shared folder "simple-folder" with user "User Two" using the webUI
When the user browses to the shared-with-others page
Then folder "simple-folder" should be listed on the webUI
When the user opens the file action menu of folder "simple-folder" in the webUI
Expand All @@ -70,7 +70,8 @@ Feature: User can open the details panel for any file or folder

@comments-app-required
Scenario: the recipient user should be able to view different areas of details panel in Shared with you page
Given the user has shared folder "simple-folder" with user "User Two" using the webUI
Given user "user2" has been created with default attributes
And the user has shared folder "simple-folder" with user "User Two" using the webUI
And the user re-logs in as "user2" using the webUI
When the user browses to the shared-with-you page
Then folder "simple-folder (2)" should be listed on the webUI
Expand Down
4 changes: 3 additions & 1 deletion tests/acceptance/features/webUIFiles/search.feature
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ Feature: Search

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

Expand Down Expand Up @@ -78,20 +77,23 @@ Feature: Search
And file "lorem.txt" with path "/simple-folder" should be listed in the tags page on the webUI

Scenario: Search for a shared file
Given user "user0" has been created with default attributes
When user "user0" shares file "/lorem.txt" with user "user1" using the sharing API
And the user reloads the current page of the webUI
And the user searches for "lorem" using the webUI
Then file "lorem (2).txt" should be listed on the webUI

Scenario: Search for a re-shared file
Given user "user2" has been created with default attributes
And user "user0" has been created with default attributes
When user "user2" shares file "/lorem.txt" with user "user0" using the sharing API
And user "user0" shares file "/lorem (2).txt" with user "user1" using the sharing API
And the user reloads the current page of the webUI
And the user searches for "lorem" using the webUI
Then file "lorem (2).txt" should be listed on the webUI

Scenario: Search for a shared folder
Given user "user0" has been created with default attributes
When user "user0" shares folder "simple-folder" with user "user1" using the sharing API
And the user reloads the current page of the webUI
And the user searches for "simple" using the webUI
Expand Down
10 changes: 6 additions & 4 deletions tests/acceptance/features/webUIFiles/versions.feature
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ Feature: Versions of a file
Given these users have been created with default attributes:
| username |
| user0 |
| user1 |

@skipOnStorage:ceph @files_primary_s3-issue-67
Scenario: upload new file with same name to see if different versions are shown
Expand All @@ -32,7 +31,8 @@ Feature: Versions of a file
Then the content of file "lorem-file.txt" for user "user0" should be "lorem content"

Scenario: sharee can see the versions of a file
Given user "user0" has uploaded file with content "lorem content" to "/lorem-file.txt"
Given user "user1" has been created with default attributes
And user "user0" has uploaded file with content "lorem content" to "/lorem-file.txt"
And user "user0" has uploaded file with content "lorem" to "/lorem-file.txt"
And user "user0" has uploaded file with content "new lorem content" to "/lorem-file.txt"
And user "user0" has shared file "lorem-file.txt" with user "user1"
Expand All @@ -55,7 +55,8 @@ Feature: Versions of a file

@skipOnStorage:ceph @files_primary_s3-issue-155
Scenario: file versions cannot be seen in the webUI only for user whose versions is deleted
Given user "user0" has uploaded file with content "lorem content" to "/lorem-file.txt"
Given user "user1" has been created with default attributes
And user "user0" has uploaded file with content "lorem content" to "/lorem-file.txt"
And user "user0" has uploaded file with content "lorem" to "/lorem-file.txt"
And user "user1" has uploaded file with content "lorem content" to "/lorem-file.txt"
And user "user1" has uploaded file with content "lorem" to "/lorem-file.txt"
Expand All @@ -72,7 +73,8 @@ Feature: Versions of a file

@skipOnStorage:ceph @files_primary_s3-issue-155
Scenario: file versions cannot be seen in the webUI for all users after deleting versions for all users
Given user "user0" has uploaded file with content "lorem content" to "/lorem-file.txt"
Given user "user1" has been created with default attributes
And user "user0" has uploaded file with content "lorem content" to "/lorem-file.txt"
And user "user0" has uploaded file with content "lorem" to "/lorem-file.txt"
And user "user1" has uploaded file with content "lorem content" to "/lorem-file.txt"
And user "user1" has uploaded file with content "lorem" to "/lorem-file.txt"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ Feature: restrict resharing
| username |
| user1 |
| user2 |
| user3 |
And these groups have been created:
| groupname |
| grp1 |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ Feature: accept/decline shares coming from internal users
| username |
| user1 |
| user2 |
| user3 |
And these groups have been created:
| groupname |
| grp1 |
Expand All @@ -31,6 +30,7 @@ Feature: accept/decline shares coming from internal users

Scenario: receive shares with same name from different users
Given the setting "Automatically accept new incoming local user shares" in the section "Sharing" has been disabled
And user "user3" has been created with default attributes
And user "user2" has shared folder "/simple-folder" with user "user3"
And user "user1" has shared folder "/simple-folder" with user "user3"
When user "user3" logs in using the webUI
Expand All @@ -39,6 +39,7 @@ Feature: accept/decline shares coming from internal users

Scenario: receive shares with same name from different users, accept one by one
Given the setting "Automatically accept new incoming local user shares" in the section "Sharing" has been disabled
And user "user3" has been created with default attributes
And user "user2" has created folder "/simple-folder/from_user2"
And user "user2" has shared folder "/simple-folder" with user "user3"
And user "user1" has created folder "/simple-folder/from_user1"
Expand All @@ -54,6 +55,7 @@ Feature: accept/decline shares coming from internal users

Scenario: receive shares with same name from different users
Given the setting "Automatically accept new incoming local user shares" in the section "Sharing" has been disabled
And user "user3" has been created with default attributes
And user "user2" has shared folder "/simple-folder" with user "user3"
And user "user1" has shared folder "/simple-folder" with user "user3"
When user "user3" logs in using the webUI
Expand Down
2 changes: 1 addition & 1 deletion tests/acceptance/features/webUITags/createTags.feature
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ Feature: Creation of tags for the files and folders
Given these users have been created with default attributes:
| username |
| user1 |
| user2 |
And the user has browsed to the login page
And the user has logged in with username "user1" and password "%alt1%" using the webUI

Expand Down Expand Up @@ -40,6 +39,7 @@ Feature: Creation of tags for the files and folders

@skipOnFIREFOX
Scenario: Create and add tag on a shared file
Given user "user2" has been created with default attributes
When the user renames file "lorem.txt" to "coolnewfile.txt" using the webUI
And the user browses directly to display the details of file "coolnewfile.txt" in folder ""
And the user adds a tag "tag1" to the file using the webUI
Expand Down
2 changes: 1 addition & 1 deletion tests/acceptance/features/webUITags/deleteTags.feature
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ Feature: Deletion of existing tags from files and folders
Given these users have been created with default attributes:
| username |
| user1 |
| user2 |
And the user has browsed to the login page
And the user has logged in with username "user1" and password "%alt1%" using the webUI

@skipOnFIREFOX
Scenario: Delete a tag in a shared file
Given user "user2" has been created with default attributes
When the user renames file "lorem.txt" to "coolnewfile.txt" using the webUI
And the user browses directly to display the details of file "coolnewfile.txt" in folder ""
And the user adds a tag "tag1" to the file using the webUI
Expand Down
1 change: 0 additions & 1 deletion tests/acceptance/features/webUITags/removeTags.feature
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ Feature: Removal of already existing tags from files and folders
Given these users have been created with default attributes:
| username |
| user1 |
| user2 |
And the user has browsed to the login page
And the user has logged in with username "user1" and password "%alt1%" using the webUI

Expand Down

0 comments on commit 7be91da

Please sign in to comment.