[Pkg-owncloud-commits] [php-sabredav] 84/275: Pass tests again.

[David Prévot]

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

taffit pushed a commit to branch master
in repository php-sabredav.

commit 02146031efbf905bbebdf0f3875610ce167a4f61
Author: Evert Pot <me at evertpot.com>
Date:   Thu Jul 3 00:36:25 2014 -0400

    Pass tests again.
---
 lib/CalDAV/ICalendarObjectContainer.php             | 8 ++++----
 tests/Sabre/CalDAV/Principal/UserTest.php           | 2 +-
 tests/Sabre/CalDAV/Schedule/FreeBusyRequestTest.php | 2 ++
 tests/Sabre/DAVACL/PrincipalTest.php                | 2 +-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/lib/CalDAV/ICalendarObjectContainer.php b/lib/CalDAV/ICalendarObjectContainer.php
index 6343e94..8bd1e9a 100644
--- a/lib/CalDAV/ICalendarObjectContainer.php
+++ b/lib/CalDAV/ICalendarObjectContainer.php
@@ -5,14 +5,14 @@ namespace Sabre\CalDAV;
 /**
  * This interface represents a node that may contain calendar objects.
  *
- * This is the shared parent for both the Inbox collection and calendars 
+ * This is the shared parent for both the Inbox collection and calendars
  * resources.
  *
- * In most cases you will likely want to look at ICalendar instead of this 
+ * In most cases you will likely want to look at ICalendar instead of this
  * interface.
  *
  * @copyright Copyright (C) 2007-2014 fruux GmbH. All rights reserved.
- * @author Evert Pot (http://evertpot.com/) 
+ * @author Evert Pot (http://evertpot.com/)
  * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
  */
 interface ICalendarObjectContainer extends \Sabre\DAV\ICollection {
@@ -37,4 +37,4 @@ interface ICalendarObjectContainer extends \Sabre\DAV\ICollection {
     public function calendarQuery(array $filters);
 
 
-} 
+}
diff --git a/tests/Sabre/CalDAV/Principal/UserTest.php b/tests/Sabre/CalDAV/Principal/UserTest.php
index d41692f..37b5eae 100644
--- a/tests/Sabre/CalDAV/Principal/UserTest.php
+++ b/tests/Sabre/CalDAV/Principal/UserTest.php
@@ -103,7 +103,7 @@ class UserTest extends \PHPUnit_Framework_TestCase {
         $expected = array(
             array(
                 'privilege' => '{DAV:}read',
-                'principal' => 'principals/user',
+                'principal' => '{DAV:}authenticated',
                 'protected' => true,
             ),
             array(
diff --git a/tests/Sabre/CalDAV/Schedule/FreeBusyRequestTest.php b/tests/Sabre/CalDAV/Schedule/FreeBusyRequestTest.php
index 8a1ed59..4495e0d 100644
--- a/tests/Sabre/CalDAV/Schedule/FreeBusyRequestTest.php
+++ b/tests/Sabre/CalDAV/Schedule/FreeBusyRequestTest.php
@@ -294,6 +294,8 @@ ICS;
 
     function testNoPrivilege() {
 
+        $this->markTestIncomplete('Currently there\'s no "no privilege" situation');
+
         $this->server->httpRequest = HTTP\Sapi::createFromServerArray(array(
             'CONTENT_TYPE' => 'text/calendar',
             'REQUEST_METHOD' => 'POST',
diff --git a/tests/Sabre/DAVACL/PrincipalTest.php b/tests/Sabre/DAVACL/PrincipalTest.php
index 47fa6a4..03fd9d6 100644
--- a/tests/Sabre/DAVACL/PrincipalTest.php
+++ b/tests/Sabre/DAVACL/PrincipalTest.php
@@ -179,7 +179,7 @@ class PrincipalTest extends \PHPUnit_Framework_TestCase {
         $this->assertEquals(array(
             array(
                 'privilege' => '{DAV:}read',
-                'principal' => 'principals/admin',
+                'principal' => '{DAV:}authenticated',
                 'protected' => true,
             )
         ),$principal->getACL());

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