Skip to content

Commit

Permalink
Merge pull request #39944 from owncloud/improveThenStepInApiWebdavEta…
Browse files Browse the repository at this point in the history 
…gPropagation1

[tests-only][full-ci] Improve Then step in apiWebdavEtagPropagation1 suite
  • Loading branch information
@individual-it
individual-it authored Apr 6, 2022
2 parents 53a107c + 5ff298b commit a0f849e
Show file tree
Hide file tree
Showing 2 changed files with 46 additions and 23 deletions.
27 changes: 18 additions & 9 deletions tests/acceptance/features/apiWebdavEtagPropagation1/deleteFileFolder.feature
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ Feature: propagation of etags when deleting a file or folder
And user "Alice" has stored etag of element "/upload"
And user "Alice" has stored etag of element "/upload/sub"
When user "Alice" deletes file "/upload/sub/file.txt" using the WebDAV API
Then these etags should have changed:
Then the HTTP status code should be "204"
And these etags should have changed:
| user | path |
| Alice | / |
| Alice | /upload |
Expand All @@ -40,7 +41,8 @@ Feature: propagation of etags when deleting a file or folder
And user "Alice" has stored etag of element "/upload"
And user "Alice" has stored etag of element "/upload/sub"
When user "Alice" deletes folder "/upload/sub/toDelete" using the WebDAV API
Then these etags should have changed:
Then the HTTP status code should be "204"
And these etags should have changed:
| user | path |
| Alice | / |
| Alice | /upload |
Expand All @@ -65,7 +67,8 @@ Feature: propagation of etags when deleting a file or folder
And user "Alice" has stored etag of element "/upload"
And user "Alice" has stored etag of element "/upload/sub"
When user "Alice" deletes folder "/upload/sub/toDelete" using the WebDAV API
Then these etags should have changed:
Then the HTTP status code should be "204"
And these etags should have changed:
| user | path |
| Alice | / |
| Alice | /upload |
Expand Down Expand Up @@ -96,7 +99,8 @@ Feature: propagation of etags when deleting a file or folder
And user "Brian" has stored etag of element "/Shares/upload"
And user "Brian" has stored etag of element "/Shares/upload/sub"
When user "Brian" deletes file "/Shares/upload/sub/file.txt" using the WebDAV API
Then these etags should have changed:
Then the HTTP status code should be "204"
And these etags should have changed:
| user | path |
| Alice | / |
| Alice | /upload |
Expand Down Expand Up @@ -131,7 +135,8 @@ Feature: propagation of etags when deleting a file or folder
And user "Brian" has stored etag of element "/Shares/upload"
And user "Brian" has stored etag of element "/Shares/upload/sub"
When user "Alice" deletes file "/upload/sub/file.txt" using the WebDAV API
Then these etags should have changed:
Then the HTTP status code should be "204"
And these etags should have changed:
| user | path |
| Alice | / |
| Alice | /upload |
Expand Down Expand Up @@ -168,7 +173,8 @@ Feature: propagation of etags when deleting a file or folder
And user "Brian" has stored etag of element "/Shares/upload"
And user "Brian" has stored etag of element "/Shares/upload/sub"
When user "Brian" deletes folder "/Shares/upload/sub/toDelete" using the WebDAV API
Then these etags should have changed:
Then the HTTP status code should be "204"
And these etags should have changed:
| user | path |
| Alice | / |
| Alice | /upload |
Expand Down Expand Up @@ -205,7 +211,8 @@ Feature: propagation of etags when deleting a file or folder
And user "Brian" has stored etag of element "/Shares/upload"
And user "Brian" has stored etag of element "/Shares/upload/sub"
When user "Alice" deletes folder "/upload/sub/toDelete" using the WebDAV API
Then these etags should have changed:
Then the HTTP status code should be "204"
And these etags should have changed:
| user | path |
| Alice | / |
| Alice | /upload |
Expand Down Expand Up @@ -234,7 +241,8 @@ Feature: propagation of etags when deleting a file or folder
And user "Alice" has stored etag of element "/"
And user "Alice" has stored etag of element "/upload"
When the public deletes file "file.txt" from the last public share using the new public WebDAV API
Then these etags should have changed:
Then the HTTP status code should be "204"
And these etags should have changed:
| user | path |
| Alice | / |
| Alice | /upload |
Expand All @@ -258,7 +266,8 @@ Feature: propagation of etags when deleting a file or folder
And user "Alice" has stored etag of element "/"
And user "Alice" has stored etag of element "/upload"
When the public deletes folder "sub" from the last public share using the new public WebDAV API
Then these etags should have changed:
Then the HTTP status code should be "204"
And these etags should have changed:
| user | path |
| Alice | / |
| Alice | /upload |
Expand Down
42 changes: 28 additions & 14 deletions tests/acceptance/features/apiWebdavEtagPropagation1/moveFileFolder.feature
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ Feature: propagation of etags when moving files or folders
And user "Alice" has stored etag of element "/"
And user "Alice" has stored etag of element "/upload"
When user "Alice" moves file "/upload/file.txt" to "/upload/renamed.txt" using the WebDAV API
Then these etags should have changed:
Then the HTTP status code should be "201"
And these etags should have changed:
| user | path |
| Alice | / |
| Alice | /upload |
Expand All @@ -36,7 +37,8 @@ Feature: propagation of etags when moving files or folders
And user "Alice" has stored etag of element "/src"
And user "Alice" has stored etag of element "/dst"
When user "Alice" moves file "/src/file.txt" to "/dst/file.txt" using the WebDAV API
Then these etags should have changed:
Then the HTTP status code should be "201"
And these etags should have changed:
| user | path |
| Alice | / |
| Alice | /src |
Expand All @@ -61,7 +63,8 @@ Feature: propagation of etags when moving files or folders
And user "Alice" has stored etag of element "/upload"
And user "Alice" has stored etag of element "/upload/sub"
When user "Alice" moves file "/upload/file.txt" to "/upload/sub/file.txt" using the WebDAV API
Then these etags should have changed:
Then the HTTP status code should be "201"
And these etags should have changed:
| user | path |
| Alice | / |
| Alice | /upload |
Expand All @@ -84,7 +87,8 @@ Feature: propagation of etags when moving files or folders
And user "Alice" has stored etag of element "/"
And user "Alice" has stored etag of element "/upload"
When user "Alice" moves folder "/upload/src" to "/upload/dst" using the WebDAV API
Then these etags should have changed:
Then the HTTP status code should be "201"
And these etags should have changed:
| user | path |
| Alice | / |
| Alice | /upload |
Expand All @@ -108,7 +112,8 @@ Feature: propagation of etags when moving files or folders
And user "Alice" has stored etag of element "/src"
And user "Alice" has stored etag of element "/dst"
When user "Alice" moves folder "/src/folder" to "/dst/folder" using the WebDAV API
Then these etags should have changed:
Then the HTTP status code should be "201"
And these etags should have changed:
| user | path |
| Alice | / |
| Alice | /src |
Expand All @@ -133,7 +138,8 @@ Feature: propagation of etags when moving files or folders
And user "Alice" has stored etag of element "/upload"
And user "Alice" has stored etag of element "/upload/sub"
When user "Alice" moves folder "/upload/folder" to "/upload/sub/folder" using the WebDAV API
Then these etags should have changed:
Then the HTTP status code should be "201"
And these etags should have changed:
| user | path |
| Alice | / |
| Alice | /upload |
Expand Down Expand Up @@ -164,7 +170,8 @@ Feature: propagation of etags when moving files or folders
And user "Brian" has stored etag of element "/Shares"
And user "Brian" has stored etag of element "/Shares/upload"
When user "Brian" moves file "/Shares/upload/file.txt" to "/Shares/upload/renamed.txt" using the WebDAV API
Then these etags should have changed:
Then the HTTP status code should be "201"
And these etags should have changed:
| user | path |
| Alice | / |
| Alice | /upload |
Expand Down Expand Up @@ -197,7 +204,8 @@ Feature: propagation of etags when moving files or folders
And user "Brian" has stored etag of element "/Shares"
And user "Brian" has stored etag of element "/Shares/upload"
When user "Alice" moves file "/upload/file.txt" to "/upload/renamed.txt" using the WebDAV API
Then these etags should have changed:
Then the HTTP status code should be "201"
And these etags should have changed:
| user | path |
| Alice | / |
| Alice | /upload |
Expand Down Expand Up @@ -235,7 +243,8 @@ Feature: propagation of etags when moving files or folders
And user "Brian" has stored etag of element "/Shares/src"
And user "Brian" has stored etag of element "/Shares/dst"
When user "Alice" moves file "/src/file.txt" to "/dst/file.txt" using the WebDAV API
Then these etags should have changed:
Then the HTTP status code should be "201"
And these etags should have changed:
| user | path |
| Alice | / |
| Alice | /src |
Expand Down Expand Up @@ -275,7 +284,8 @@ Feature: propagation of etags when moving files or folders
And user "Brian" has stored etag of element "/Shares/src"
And user "Brian" has stored etag of element "/Shares/dst"
When user "Brian" moves file "/Shares/src/file.txt" to "/Shares/dst/file.txt" using the WebDAV API
Then these etags should have changed:
Then the HTTP status code should be "201"
And these etags should have changed:
| user | path |
| Alice | / |
| Alice | /src |
Expand Down Expand Up @@ -315,7 +325,8 @@ Feature: propagation of etags when moving files or folders
And user "Brian" has stored etag of element "/Shares/src"
And user "Brian" has stored etag of element "/Shares/dst"
When user "Alice" moves folder "/src/toMove" to "/dst/toMove" using the WebDAV API
Then these etags should have changed:
Then the HTTP status code should be "201"
And these etags should have changed:
| user | path |
| Alice | / |
| Alice | /src |
Expand Down Expand Up @@ -355,7 +366,8 @@ Feature: propagation of etags when moving files or folders
And user "Brian" has stored etag of element "/Shares/src"
And user "Brian" has stored etag of element "/Shares/dst"
When user "Brian" moves folder "/Shares/src/toMove" to "/Shares/dst/toMove" using the WebDAV API
Then these etags should have changed:
Then the HTTP status code should be "201"
And these etags should have changed:
| user | path |
| Alice | / |
| Alice | /src |
Expand Down Expand Up @@ -385,7 +397,8 @@ Feature: propagation of etags when moving files or folders
And user "Alice" has stored etag of element "/"
And user "Alice" has stored etag of element "/upload"
When the public renames file "file.txt" to "renamed.txt" from the last public share using the new public WebDAV API
Then these etags should have changed:
Then the HTTP status code should be "201"
And these etags should have changed:
| user | path |
| Alice | / |
| Alice | /upload |
Expand All @@ -410,7 +423,8 @@ Feature: propagation of etags when moving files or folders
And user "Alice" has stored etag of element "/"
And user "Alice" has stored etag of element "/upload"
When the public renames folder "sub" to "renamed" from the last public share using the new public WebDAV API
Then these etags should have changed:
Then the HTTP status code should be "201"
And these etags should have changed:
| user | path |
| Alice | / |
| Alice | /upload |
Expand Down

0 comments on commit a0f849e

Please sign in to comment.