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

1 files changed, 6 insertions, 4 deletions

diff --git a/vendor/sabre/dav/tests/Sabre/DAV/Browser/GuessContentTypeTest.php b/vendor/sabre/dav/tests/Sabre/DAV/Browser/GuessContentTypeTest.php
index 6fc65f9e8..157c2170a 100644
--- a/vendor/sabre/dav/tests/Sabre/DAV/Browser/GuessContentTypeTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAV/Browser/GuessContentTypeTest.php
@@ -10,6 +10,7 @@ class GuessContentTypeTest extends DAV\AbstractServer {
     function setUp() {
 
         parent::setUp();
+        \Sabre\TestUtil::clearTempDir();
         file_put_contents(SABRE_TEMPDIR . '/somefile.jpg','blabla');
         file_put_contents(SABRE_TEMPDIR . '/somefile.hoi','blabla');
 
@@ -17,7 +18,7 @@ class GuessContentTypeTest extends DAV\AbstractServer {
 
     function tearDown() {
 
-        unlink(SABRE_TEMPDIR . '/somefile.jpg');
+        \Sabre\TestUtil::clearTempDir();
         parent::tearDown();
     }
 
@@ -44,7 +45,7 @@ class GuessContentTypeTest extends DAV\AbstractServer {
         );
         $result = $this->server->getPropertiesForPath('/somefile.jpg',$properties);
         $this->assertArrayHasKey(0,$result);
-        $this->assertArrayHasKey(200,$result[0]);
+        $this->assertArrayHasKey(200,$result[0], 'We received: ' . print_r($result,true));
         $this->assertArrayHasKey('{DAV:}getcontenttype',$result[0][200]);
         $this->assertEquals('image/jpeg',$result[0][200]['{DAV:}getcontenttype']);
 
@@ -61,8 +62,9 @@ class GuessContentTypeTest extends DAV\AbstractServer {
         );
         $result = $this->server->getPropertiesForPath('/somefile.hoi',$properties);
         $this->assertArrayHasKey(0,$result);
-        $this->assertArrayHasKey(404,$result[0]);
-        $this->assertArrayHasKey('{DAV:}getcontenttype',$result[0][404]);
+        $this->assertArrayHasKey(200,$result[0]);
+        $this->assertArrayHasKey('{DAV:}getcontenttype',$result[0][200]);
+        $this->assertEquals('application/octet-stream',$result[0][200]['{DAV:}getcontenttype']);
 
     }
 }