mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix issues in CardDav

This commit is contained in:
Joas Schilling 2016-03-11 10:42:57 +01:00
parent b4affa4d27
commit 2faf520504
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
build/integration/features/bootstrap/CardDavContext.php
View File

@ -73,6 +73,10 @@ class CardDavContext implements \Behat\Behat\Context\Context {
/** /**
* @When :user requests addressbook :addressBook with statuscode :statusCode * @When :user requests addressbook :addressBook with statuscode :statusCode
* @param string $user
* @param string $addressBook
* @param int $statusCode
* @throws \Exception
*/ */
public function requestsAddressbookWithStatuscode($user, $addressBook, $statusCode) { public function requestsAddressbookWithStatuscode($user, $addressBook, $statusCode) {
$davUrl = $this->baseUrl . '/remote.php/dav/addressbooks/users/'.$addressBook; $davUrl = $this->baseUrl . '/remote.php/dav/addressbooks/users/'.$addressBook;
@ -112,6 +116,10 @@ class CardDavContext implements \Behat\Behat\Context\Context {
/** /**
* @Given :user creates an addressbook named :addressBook with statuscode :statusCode * @Given :user creates an addressbook named :addressBook with statuscode :statusCode
* @param string $user
* @param string $addressBook
* @param int $statusCode
* @throws \Exception
*/ */
public function createsAnAddressbookNamedWithStatuscode($user, $addressBook, $statusCode) { public function createsAnAddressbookNamedWithStatuscode($user, $addressBook, $statusCode) {
$davUrl = $this->baseUrl . '/remote.php/dav/addressbooks/users/'.$user.'/'.$addressBook; $davUrl = $this->baseUrl . '/remote.php/dav/addressbooks/users/'.$user.'/'.$addressBook;
@ -121,9 +129,7 @@ class CardDavContext implements \Behat\Behat\Context\Context {
'MKCOL', 'MKCOL',
$davUrl, $davUrl,
[ [
'body' => '<d:mkcol xmlns:c="urn:ietf:params:xml:ns:caldav" 'body' => '<d:mkcol xmlns:card="urn:ietf:params:xml:ns:carddav"
xmlns:card="urn:ietf:params:xml:ns:carddav"
xmlns:cs="http://calendarserver.org/ns/"
xmlns:d="DAV:"> xmlns:d="DAV:">
<d:set> <d:set>
<d:prop> <d:prop>
@ -158,6 +164,8 @@ class CardDavContext implements \Behat\Behat\Context\Context {
/** /**
* @When The CardDAV exception is :message * @When The CardDAV exception is :message
* @param string $message
* @throws \Exception
*/ */
public function theCarddavExceptionIs($message) { public function theCarddavExceptionIs($message) {
$result = $this->responseXml['value'][0]['value']; $result = $this->responseXml['value'][0]['value'];
@ -175,6 +183,8 @@ class CardDavContext implements \Behat\Behat\Context\Context {
/** /**
* @When The CardDAV error message is :arg1 * @When The CardDAV error message is :arg1
* @param string $message
* @throws \Exception
*/ */
public function theCarddavErrorMessageIs($message) { public function theCarddavErrorMessageIs($message) {
$result = $this->responseXml['value'][1]['value']; $result = $this->responseXml['value'][1]['value'];