[Pkg-owncloud-commits] [php-sabredav] 32/163: Merge branch '1.7' into 1.8

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to annotated tag upstream/2.0.0_beta1
in repository php-sabredav.

commit d7a609d41709d850f259012f50006995352b312c
Merge: d4a6faa 1d7288a
Author: Evert Pot <evert at rooftopsolutions.nl>
Date:   Fri Apr 4 16:43:24 2014 -0400

    Merge branch '1.7' into 1.8

 .travis.yml                          |  1 +
 ChangeLog                            |  2 ++
 lib/Sabre/DAV/Locks/Plugin.php       |  2 +-
 tests/Sabre/DAV/Locks/PluginTest.php | 16 ++++++++++++++++
 tests/composer.vobject3.json         |  6 +++---
 5 files changed, 23 insertions(+), 4 deletions(-)

diff --cc tests/Sabre/DAV/Locks/PluginTest.php
index a45dafd,55ced34..ed8a000
--- a/tests/Sabre/DAV/Locks/PluginTest.php
+++ b/tests/Sabre/DAV/Locks/PluginTest.php
@@@ -914,9 -909,25 +914,25 @@@ class PluginTest extends DAV\AbstractSe
  
      }
  
+     function testDeleteWithETagOnCollection() {
+ 
+         $serverVars = array(
+             'REQUEST_URI'    => '/dir',
+             'REQUEST_METHOD' => 'DELETE',
+             'HTTP_IF' => '(["etag1"])',
+         );
+ 
+         $request = new Sabre_HTTP_Request($serverVars);
+         $request->setBody('newbody');
+         $this->server->httpRequest = $request;
+         $this->server->exec();
+         $this->assertEquals('HTTP/1.1 412 Precondition failed',$this->response->status);
+ 
+     }
+ 
      function testGetTimeoutHeader() {
  
 -        $request = new Sabre_HTTP_Request(array(
 +        $request = new HTTP\Request(array(
              'HTTP_TIMEOUT' => 'second-100',
          ));
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/php-sabredav.git