From 0b02a6d123b2014705998c94ddf3d460948d3eac Mon Sep 17 00:00:00 2001
From: redmatrix <git@macgirvin.com>
Date: Tue, 10 May 2016 17:26:44 -0700
Subject: initial sabre upgrade (needs lots of work - to wit: authentication,
 redo the browser interface, and rework event export/import)

---
 .../sabre/dav/tests/Sabre/DAVACL/ACLMethodTest.php | 55 ++++++++++------------
 1 file changed, 24 insertions(+), 31 deletions(-)

(limited to 'vendor/sabre/dav/tests/Sabre/DAVACL/ACLMethodTest.php')

diff --git a/vendor/sabre/dav/tests/Sabre/DAVACL/ACLMethodTest.php b/vendor/sabre/dav/tests/Sabre/DAVACL/ACLMethodTest.php
index 9960180a3..4ecd42717 100644
--- a/vendor/sabre/dav/tests/Sabre/DAVACL/ACLMethodTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAVACL/ACLMethodTest.php
@@ -16,17 +16,7 @@ class ACLMethodTest extends \PHPUnit_Framework_TestCase {
         $server = new DAV\Server();
         $server->addPlugin($acl);
 
-        $acl->unknownMethod('ACL','test');
-
-    }
-
-    function testCallbackPassthru() {
-
-        $acl = new Plugin();
-        $server = new DAV\Server();
-        $server->addPlugin($acl);
-
-        $this->assertNull($acl->unknownMethod('FOO','test'));
+        $acl->httpAcl($server->httpRequest, $server->httpResponse);
 
     }
 
@@ -49,7 +39,7 @@ class ACLMethodTest extends \PHPUnit_Framework_TestCase {
         $server->httpRequest->setBody($body);
         $server->addPlugin($acl);
 
-        $acl->httpACL('test');
+        $acl->httpACL($server->httpRequest, $server->httpResponse);
 
     }
 
@@ -61,13 +51,15 @@ class ACLMethodTest extends \PHPUnit_Framework_TestCase {
         $acl = new Plugin();
         $server = new DAV\Server($tree);
         $server->httpRequest = new HTTP\Request();
+        $server->httpRequest->setUrl('/test');
+
         $body = '<?xml version="1.0"?>
 <d:acl xmlns:d="DAV:">
 </d:acl>';
         $server->httpRequest->setBody($body);
         $server->addPlugin($acl);
 
-        $this->assertNull($acl->httpACL('test'));
+        $this->assertFalse($acl->httpACL($server->httpRequest, $server->httpResponse));
 
     }
 
@@ -81,7 +73,7 @@ class ACLMethodTest extends \PHPUnit_Framework_TestCase {
         );
         $acl = new Plugin();
         $server = new DAV\Server($tree);
-        $server->httpRequest = new HTTP\Request();
+        $server->httpRequest = new HTTP\Request('ACL','/test');
         $body = '<?xml version="1.0"?>
 <d:acl xmlns:d="DAV:">
     <d:ace>
@@ -92,7 +84,7 @@ class ACLMethodTest extends \PHPUnit_Framework_TestCase {
         $server->httpRequest->setBody($body);
         $server->addPlugin($acl);
 
-        $acl->httpACL('test');
+        $acl->httpACL($server->httpRequest, $server->httpResponse);
 
     }
 
@@ -109,7 +101,7 @@ class ACLMethodTest extends \PHPUnit_Framework_TestCase {
         );
         $acl = new Plugin();
         $server = new DAV\Server($tree);
-        $server->httpRequest = new HTTP\Request();
+        $server->httpRequest = new HTTP\Request('ACL','/test');
         $body = '<?xml version="1.0"?>
 <d:acl xmlns:d="DAV:">
     <d:ace>
@@ -120,7 +112,7 @@ class ACLMethodTest extends \PHPUnit_Framework_TestCase {
         $server->httpRequest->setBody($body);
         $server->addPlugin($acl);
 
-        $acl->httpACL('test');
+        $acl->httpACL($server->httpRequest, $server->httpResponse);
 
     }
 
@@ -134,7 +126,7 @@ class ACLMethodTest extends \PHPUnit_Framework_TestCase {
         );
         $acl = new Plugin();
         $server = new DAV\Server($tree);
-        $server->httpRequest = new HTTP\Request();
+        $server->httpRequest = new HTTP\Request('ACL','/test');
         $body = '<?xml version="1.0"?>
 <d:acl xmlns:d="DAV:">
     <d:ace>
@@ -145,7 +137,7 @@ class ACLMethodTest extends \PHPUnit_Framework_TestCase {
         $server->httpRequest->setBody($body);
         $server->addPlugin($acl);
 
-        $acl->httpACL('test');
+        $acl->httpACL($server->httpRequest, $server->httpResponse);
 
     }
 
@@ -159,18 +151,18 @@ class ACLMethodTest extends \PHPUnit_Framework_TestCase {
         );
         $acl = new Plugin();
         $server = new DAV\Server($tree);
-        $server->httpRequest = new HTTP\Request();
+        $server->httpRequest = new HTTP\Request('ACL','/test');
         $body = '<?xml version="1.0"?>
 <d:acl xmlns:d="DAV:">
     <d:ace>
-        <d:grant><d:privilege><d:read-acl /></d:privilege></d:grant>
+        <d:grant><d:privilege><d:all /></d:privilege></d:grant>
         <d:principal><d:href>/principals/notfound</d:href></d:principal>
     </d:ace>
 </d:acl>';
         $server->httpRequest->setBody($body);
         $server->addPlugin($acl);
 
-        $acl->httpACL('test');
+        $acl->httpACL($server->httpRequest, $server->httpResponse);
 
     }
 
@@ -192,7 +184,7 @@ class ACLMethodTest extends \PHPUnit_Framework_TestCase {
         );
         $acl = new Plugin();
         $server = new DAV\Server($tree);
-        $server->httpRequest = new HTTP\Request();
+        $server->httpRequest = new HTTP\Request('ACL','/test');
         $body = '<?xml version="1.0"?>
 <d:acl xmlns:d="DAV:">
     <d:ace>
@@ -203,7 +195,7 @@ class ACLMethodTest extends \PHPUnit_Framework_TestCase {
         $server->httpRequest->setBody($body);
         $server->addPlugin($acl);
 
-        $acl->httpACL('test');
+        $acl->httpACL($server->httpRequest, $server->httpResponse);
 
     }
 
@@ -225,7 +217,7 @@ class ACLMethodTest extends \PHPUnit_Framework_TestCase {
         );
         $acl = new Plugin();
         $server = new DAV\Server($tree);
-        $server->httpRequest = new HTTP\Request();
+        $server->httpRequest = new HTTP\Request('ACL','/test');
         $body = '<?xml version="1.0"?>
 <d:acl xmlns:d="DAV:">
     <d:ace>
@@ -236,7 +228,7 @@ class ACLMethodTest extends \PHPUnit_Framework_TestCase {
         $server->httpRequest->setBody($body);
         $server->addPlugin($acl);
 
-        $acl->httpACL('test');
+        $acl->httpACL($server->httpRequest, $server->httpResponse);
 
     }
 
@@ -258,7 +250,7 @@ class ACLMethodTest extends \PHPUnit_Framework_TestCase {
         );
         $acl = new Plugin();
         $server = new DAV\Server($tree);
-        $server->httpRequest = new HTTP\Request();
+        $server->httpRequest = new HTTP\Request('ACL','/test');
         $body = '<?xml version="1.0"?>
 <d:acl xmlns:d="DAV:">
     <d:ace>
@@ -269,11 +261,11 @@ class ACLMethodTest extends \PHPUnit_Framework_TestCase {
         $server->httpRequest->setBody($body);
         $server->addPlugin($acl);
 
-        $acl->httpACL('test');
+        $acl->httpACL($server->httpRequest, $server->httpResponse);
 
     }
 
-    function testSuccessComplex () {
+    function testSuccessComplex() {
 
         $oldACL = array(
             array(
@@ -296,7 +288,7 @@ class ACLMethodTest extends \PHPUnit_Framework_TestCase {
         );
         $acl = new Plugin();
         $server = new DAV\Server($tree);
-        $server->httpRequest = new HTTP\Request();
+        $server->httpRequest = new HTTP\Request('ACL','/test');
         $body = '<?xml version="1.0"?>
 <d:acl xmlns:d="DAV:">
     <d:ace>
@@ -312,7 +304,8 @@ class ACLMethodTest extends \PHPUnit_Framework_TestCase {
         $server->httpRequest->setBody($body);
         $server->addPlugin($acl);
 
-        $this->assertFalse($acl->unknownMethod('ACL','test'));
+
+        $this->assertFalse($acl->httpAcl($server->httpRequest, $server->httpResponse));
 
         $this->assertEquals(array(
             array(
-- 
cgit v1.2.3