Skip to content

Commit

Permalink
Merge pull request #36490 from owncloud/dependabot/composer/sabre/htt…
Browse files Browse the repository at this point in the history
…p-5.0.5

Bump sabre/http from 5.0.2 to 5.0.5
  • Loading branch information
phil-davis authored Nov 29, 2019
2 parents 817b3f1 + a710d69 commit e0e66b8
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 10 deletions.
3 changes: 3 additions & 0 deletions changelog/unreleased/36490
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Change: Update sabre/http (5.0.2 => 5.0.5)

https://github.com/owncloud/core/pull/36490
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"patchwork/jsqueeze": "^2.0",
"lukasreschke/id3parser": "^0.0.3",
"sabre/dav": "^4.0",
"sabre/http": "5.0.2",
"sabre/http": "5.0.5",
"deepdiver/zipstreamer": "^1.1",
"symfony/translation": "^3.4",
"zendframework/zend-inputfilter": "^2.8",
Expand Down
12 changes: 6 additions & 6 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 11 additions & 3 deletions tests/acceptance/features/apiVersions/fileVersions.feature
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,19 @@ Feature: dav-versions

@smokeTest
Scenario: Restore a file and check, if the content is now in the current file
Given user "user0" has uploaded file with content "123" to "/davtest.txt"
And user "user0" has uploaded file with content "12345" to "/davtest.txt"
Given user "user0" has uploaded file with content "Test Content." to "/davtest.txt"
And user "user0" has uploaded file with content "Content Test Updated." to "/davtest.txt"
And the version folder of file "/davtest.txt" for user "user0" should contain "1" element
When user "user0" restores version index "1" of file "/davtest.txt" using the WebDAV API
Then the content of file "/davtest.txt" for user "user0" should be "123"
Then the content of file "/davtest.txt" for user "user0" should be "Test Content."

@smokeTest @skipOnStorage:ceph @files_primary_s3-issue-278
Scenario: Restore a file back to bigger content and check, if the content is now in the current file
Given user "user0" has uploaded file with content "Back To The Future." to "/davtest.txt"
And user "user0" has uploaded file with content "Update Content." to "/davtest.txt"
And the version folder of file "/davtest.txt" for user "user0" should contain "1" element
When user "user0" restores version index "1" of file "/davtest.txt" using the WebDAV API
Then the content of file "/davtest.txt" for user "user0" should be "Back To The Future."

@smokeTest @skipOnStorage:ceph @files_primary_s3-issue-161
Scenario Outline: Uploading a chunked file does create the correct version that can be restored
Expand Down

0 comments on commit e0e66b8

Please sign in to comment.