initial sabre upgrade (needs lots of work - to wit: authentication, redo the browser interface, and rework event export/import)

1 files changed, 35 insertions, 34 deletions

diff --git a/vendor/sabre/dav/tests/Sabre/DAV/Auth/Backend/AbstractBasicTest.php b/vendor/sabre/dav/tests/Sabre/DAV/Auth/Backend/AbstractBasicTest.php
index 36d23c5c0..7d7a59898 100644
--- a/vendor/sabre/dav/tests/Sabre/DAV/Auth/Backend/AbstractBasicTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAV/Auth/Backend/AbstractBasicTest.php
@@ -5,67 +5,68 @@ namespace Sabre\DAV\Auth\Backend;
 use Sabre\DAV;
 use Sabre\HTTP;
 
-require_once 'Sabre/HTTP/ResponseMock.php';
-
 class AbstractBasicTest extends \PHPUnit_Framework_TestCase {
 
-    /**
-     * @expectedException Sabre\DAV\Exception\NotAuthenticated
-     */
-    public function testAuthenticateNoHeaders() {
+    function testCheckNoHeaders() {
 
-        $response = new HTTP\ResponseMock();
-        $server = new DAV\Server();
-        $server->httpResponse = $response;
+        $request = new HTTP\Request();
+        $response = new HTTP\Response();
 
         $backend = new AbstractBasicMock();
-        $backend->authenticate($server,'myRealm');
 
-    }
+        $this->assertFalse(
+            $backend->check($request, $response)[0]
+        );
 
-    /**
-     * @expectedException Sabre\DAV\Exception\NotAuthenticated
-     */
-    public function testAuthenticateUnknownUser() {
+    }
 
-        $response = new HTTP\ResponseMock();
-        $tree = new DAV\ObjectTree(new DAV\SimpleCollection('bla'));
-        $server = new DAV\Server($tree);
-        $server->httpResponse = $response;
+    function testCheckUnknownUser() {
 
-        $request = new HTTP\Request(array(
+        $request = HTTP\Sapi::createFromServerArray(array(
             'PHP_AUTH_USER' => 'username',
             'PHP_AUTH_PW' => 'wrongpassword',
         ));
-        $server->httpRequest = $request;
+        $response = new HTTP\Response();
 
         $backend = new AbstractBasicMock();
-        $backend->authenticate($server,'myRealm');
 
-    }
+        $this->assertFalse(
+            $backend->check($request, $response)[0]
+        );
 
-    public function testAuthenticate() {
+    }
 
-        $response = new HTTP\ResponseMock();
-        $tree = new DAV\ObjectTree(new DAV\SimpleCollection('bla'));
-        $server = new DAV\Server($tree);
-        $server->httpResponse = $response;
+    function testCheckSuccess() {
 
-        $request = new HTTP\Request(array(
+        $request = HTTP\Sapi::createFromServerArray(array(
             'PHP_AUTH_USER' => 'username',
             'PHP_AUTH_PW' => 'password',
         ));
-        $server->httpRequest = $request;
+        $response = new HTTP\Response();
 
         $backend = new AbstractBasicMock();
-        $this->assertTrue($backend->authenticate($server,'myRealm'));
+        $this->assertEquals(
+            [true, 'principals/username'],
+            $backend->check($request, $response)
+        );
 
-        $result = $backend->getCurrentUser();
+    }
 
-        $this->assertEquals('username', $result);
+    function testRequireAuth() {
 
-    }
+        $request = new HTTP\Request();
+        $response = new HTTP\Response();
 
+        $backend = new AbstractBasicMock();
+        $backend->setRealm('writing unittests on a saturday night');
+        $backend->challenge($request, $response);
+
+        $this->assertEquals(
+            'Basic realm="writing unittests on a saturday night"',
+            $response->getHeader('WWW-Authenticate')
+        );
+
+    }
 
 }