From 66b1ccc63a28e577101e399af39457d42bd1e75f Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 29 Nov 2019 01:54:38 +0000 Subject: [PATCH 1/3] Bump sabre/http from 5.0.2 to 5.0.5 Bumps [sabre/http](https://github.com/sabre-io/http) from 5.0.2 to 5.0.5. - [Release notes](https://github.com/sabre-io/http/releases) - [Changelog](https://github.com/sabre-io/http/blob/master/CHANGELOG.md) - [Commits](https://github.com/sabre-io/http/compare/5.0.2...5.0.5) Signed-off-by: dependabot-preview[bot] --- composer.json | 2 +- composer.lock | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/composer.json b/composer.json index 4a62b98374f4..71f0fdabd258 100644 --- a/composer.json +++ b/composer.json @@ -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", diff --git a/composer.lock b/composer.lock index 1254f7190d27..a8d2cb35740c 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "a12b88c5b88737d38615dc3b755a7350", + "content-hash": "3e027015240ee48c59e781bd63f1d61e", "packages": [ { "name": "bantu/ini-get-wrapper", @@ -1936,16 +1936,16 @@ }, { "name": "sabre/http", - "version": "5.0.2", + "version": "5.0.5", "source": { "type": "git", "url": "https://github.com/sabre-io/http.git", - "reference": "c9833073175bf02c8550695860fe375e26b68709" + "reference": "85962a2ed867e7e5beb9f9d3a15cd53cd521a09b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sabre-io/http/zipball/c9833073175bf02c8550695860fe375e26b68709", - "reference": "c9833073175bf02c8550695860fe375e26b68709", + "url": "https://api.github.com/repos/sabre-io/http/zipball/85962a2ed867e7e5beb9f9d3a15cd53cd521a09b", + "reference": "85962a2ed867e7e5beb9f9d3a15cd53cd521a09b", "shasum": "" }, "require": { @@ -1988,7 +1988,7 @@ "keywords": [ "http" ], - "time": "2019-09-12T15:36:08+00:00" + "time": "2019-11-28T19:35:25+00:00" }, { "name": "sabre/uri", From 5b4c774b81c303e8fdffe0b0d73e26b749e864be Mon Sep 17 00:00:00 2001 From: Dipak Acharya Date: Fri, 29 Nov 2019 11:04:11 +0545 Subject: [PATCH 2/3] Fix acceptance tests for files_primary_s3 to work with sabre:5.0.5 --- .../features/apiVersions/fileVersions.feature | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/tests/acceptance/features/apiVersions/fileVersions.feature b/tests/acceptance/features/apiVersions/fileVersions.feature index c052f8cf56f1..0df9eb2823d6 100644 --- a/tests/acceptance/features/apiVersions/fileVersions.feature +++ b/tests/acceptance/features/apiVersions/fileVersions.feature @@ -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 From a710d696f75634f228a36336dac9e17d86d279f5 Mon Sep 17 00:00:00 2001 From: Phil Davis Date: Fri, 29 Nov 2019 13:43:25 +0545 Subject: [PATCH 3/3] Add changelog Update sabre/http (5.0.2 => 5.0.5) --- changelog/unreleased/36490 | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 changelog/unreleased/36490 diff --git a/changelog/unreleased/36490 b/changelog/unreleased/36490 new file mode 100644 index 000000000000..b26016954834 --- /dev/null +++ b/changelog/unreleased/36490 @@ -0,0 +1,3 @@ +Change: Update sabre/http (5.0.2 => 5.0.5) + +https://github.com/owncloud/core/pull/36490