Skip to content

Commit

Permalink
Merge pull request #4935 from owncloud/refactor-scenarios-upload
Browse files Browse the repository at this point in the history
[Tests-Only] refactor upload tests to not use skeleton files
  • Loading branch information
individual-it authored Apr 9, 2021
2 parents 9e34325 + cdf8839 commit 6441c7b
Show file tree
Hide file tree
Showing 11 changed files with 42 additions and 15 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ Other free text and markdown formatting can be used elsewhere in the document if
- [webUITrashbinRestore/trashbinRestore.feature:123](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUITrashbinRestore/trashbinRestore.feature#L123)

### [Conflict / overwrite issues with TUS](https://github.com/owncloud/ocis/issues/1294)
- [webUIUpload/uploadEdgecases.feature:105](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIUpload/uploadEdgecases.feature#L105)
- [webUIUpload/uploadEdgecases.feature:109](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIUpload/uploadEdgecases.feature#L109)
- [webUIUpload/uploadFileGreaterThanQuotaSize.feature:12](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIUpload/uploadFileGreaterThanQuotaSize.feature#L12)

### [restoring a file deleted from a received shared folder is not possible](https://github.com/owncloud/ocis/issues/1124)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ Feature: Sharing files and folders with internal groups
And user "Brian" has created folder "simple-folder/simple-empty-folder"
And user "Brian" has created file "simple-folder/lorem.txt"
And user "Alice" has created file "textfile0.txt"
Given user "Alice" has shared file "/textfile0.txt" with group "grp1"
And user "Alice" has shared file "/textfile0.txt" with group "grp1"
And user "Brian" has accepted the share "textfile0.txt" offered by user "Alice"
When user "Brian" has logged in using the webUI
Then the following resources should not have share indicators on the webUI
Expand Down
7 changes: 6 additions & 1 deletion tests/acceptance/features/webUIUpload/upload.feature
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,10 @@ Feature: File Upload
So that I can store files in ownCloud

Background:
Given user "Alice" has been created with default attributes
Given user "Alice" has been created with default attributes and without skeleton files
And user "Alice" has created folder "simple-folder"
And user "Alice" has uploaded file with content "initial content" to "lorem.txt"
And user "Alice" has uploaded file with content "initial content" to "simple-folder/lorem.txt"
And user "Alice" has logged in using the webUI

@smokeTest
Expand Down Expand Up @@ -43,6 +46,8 @@ Feature: File Upload

@smokeTest
Scenario: Upload of a folder inside a subdirectory
Given user "Alice" has created folder "simple-empty-folder"
And the user has browsed to the files page
When the user browses to the folder "simple-empty-folder" on the files page
And the user uploads folder "PARENT" using the webUI
Then no message should be displayed on the webUI
Expand Down
10 changes: 7 additions & 3 deletions tests/acceptance/features/webUIUpload/uploadEdgecases.feature
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Feature: File Upload
that is not academically correct but saves a lot of time

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

Expand All @@ -27,7 +27,9 @@ Feature: File Upload

@smokeTest
Scenario Outline: upload a new file into a sub folder
Given a file with the size of "3000" bytes and the name "0" has been created locally
Given user "Alice" has created folder "<folder-to-upload-to>"
And the user has browsed to the files page
And a file with the size of "3000" bytes and the name "0" has been created locally
When the user opens folder "<folder-to-upload-to>" using the webUI
And the user uploads a created file "0" using the webUI
Then file "0" should be listed on the webUI
Expand Down Expand Up @@ -95,7 +97,9 @@ Feature: File Upload

# upload into "simple-folder" because there is already a folder called "0" in the root
Scenario: Upload a big file called "0" (when chunking in implemented that upload should be chunked)
Given a file with the size of "30000000" bytes and the name "0" has been created locally
Given user "Alice" has created folder "simple-folder"
And the user has browsed to the files page
And a file with the size of "30000000" bytes and the name "0" has been created locally
When the user opens folder "simple-folder" using the webUI
And the user uploads a created file "0" using the webUI
Then file "0" should be listed on the webUI
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Feature: Upload a file
So that I can store it in owncloud

Background:
Given user "Alice" has been created with default attributes
Given user "Alice" has been created with default attributes and without skeleton files

@smokeTest
@issue-1049
Expand Down
4 changes: 2 additions & 2 deletions tests/acceptance/features/webUIUserJourney/journey1.feature
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ Feature: User Journey 1
I would like to do basic file operations

Background:
Given user "Alice" has been created with default attributes
And user "Brian" has been created with default attributes
Given user "Alice" has been created with default attributes and without skeleton files
And user "Brian" has been created with default attributes and without skeleton files

@journey
Scenario: simple upload of a file that does not exist before
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,16 @@ Feature: Locks

Background:
#do not set email, see bugs in https://github.com/owncloud/core/pull/32250#issuecomment-434615887
Given these users have been created:
Given these users have been created with default attributes and without skeleton files:
| username |
| brand-new-user |
And user "brand-new-user" has logged in using the webUI

@skip @yetToImplement
Scenario Outline: deleting a file in a public share of a locked folder
Given user "brand-new-user" has locked folder "simple-folder" setting following properties
Given user "brand-new-user" has created folder "simple-folder"
And user "brand-new-user" has created file "simple-folder/lorem.txt"
And user "brand-new-user" has locked folder "simple-folder" setting following properties
| lockscope | <lockscope> |
And the user has browsed to the files page
And the user has created a new public link for folder "simple-folder" using the webUI with
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,13 @@ Feature: Locks

Background:
#do not set email, see bugs in https://github.com/owncloud/core/pull/32250#issuecomment-434615887
Given these users have been created:
Given these users have been created with default attributes and without skeleton files:
| username |
| brand-new-user |
Given user "brand-new-user" has created folder "simple-folder"
Given user "brand-new-user" has created folder "simple-empty-folder"
Given user "brand-new-user" has created file "simple-folder/lorem.txt"
Given user "brand-new-user" has created file "lorem.txt"
And user "brand-new-user" has logged in using the webUI

@skip @yetToImplement
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,13 @@ Feature: Locks

Background:
#do not set email, see bugs in https://github.com/owncloud/core/pull/32250#issuecomment-434615887
Given these users have been created:
Given these users have been created with default attributes and without skeleton files:
| username |
| brand-new-user |
Given user "brand-new-user" has created folder "simple-folder"
Given user "brand-new-user" has created folder "simple-empty-folder"
Given user "brand-new-user" has created file "simple-folder/lorem.txt"
Given user "brand-new-user" has created file "lorem.txt"
And user "brand-new-user" has logged in using the webUI
And the user browses to the files page

Expand Down
6 changes: 5 additions & 1 deletion tests/acceptance/features/webUIWebdavLocks/locks.feature
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,13 @@ Feature: Locks

Background:
#do not set email, see bugs in https://github.com/owncloud/core/pull/32250#issuecomment-434615887
Given these users have been created:
Given these users have been created with default attributes and without skeleton files:
| username |
| brand-new-user |
Given user "brand-new-user" has created folder "simple-folder"
Given user "brand-new-user" has created folder "simple-empty-folder"
Given user "brand-new-user" has created file "simple-folder/lorem.txt"
Given user "brand-new-user" has created file "lorem.txt"
And user "brand-new-user" has logged in using the webUI

@skip @yetToImplement
Expand Down
6 changes: 5 additions & 1 deletion tests/acceptance/features/webUIWebdavLocks/unlock.feature
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,13 @@ Feature: Unlock locked files and folders

Background:
#do not set email, see bugs in https://github.com/owncloud/core/pull/32250#issuecomment-434615887
Given these users have been created:
Given these users have been created with default attributes and without skeleton files:
| username |
| brand-new-user |
Given user "brand-new-user" has created folder "simple-folder"
Given user "brand-new-user" has created folder "simple-empty-folder"
Given user "brand-new-user" has created file "simple-folder/lorem.txt"
Given user "brand-new-user" has created file "lorem.txt"
And user "brand-new-user" has logged in using the webUI

@skip @yetToImplement
Expand Down

0 comments on commit 6441c7b

Please sign in to comment.