Skip to content

GitLab

O
our_own_cloud_project
Commit 4888a0cd authored by Vincent Petry's avatar Vincent Petry Committed by GitHub
Browse files
Options

Merge pull request #27446 from owncloud/modifying-comments-tests 

Modifying comments tests
parents d42bbfaa aeb62690
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 419 additions and 479 deletions
apps/dav/lib/Connector/Sabre/CommentPropertiesPlugin.php
View file @ 4888a0cd
......@@ -179,6 +179,8 @@ class CommentPropertiesPlugin extends ServerPlugin {
[$node->getId()],
$user);
// Initialize with 0 as in prefetch phase in handleGetProperties
$numberOfCommentsForNode = 0;
if (isset($numberOfCommentsForNodes[$node->getId()])) {
$numberOfCommentsForNode = $numberOfCommentsForNodes[$node->getId()];
}
......
apps/dav/tests/unit/Connector/Sabre/CommentsPropertiesPluginTest.php
View file @ 4888a0cd
......@@ -304,4 +304,33 @@ class CommentsPropertiesPluginTest extends \Test\TestCase {
}
}
/**
* @dataProvider userProvider
* @param $user
*/
public function testGetUnreadCountWithZeroUnread($user) {
$node = $this->getMockBuilder('\OCA\DAV\Connector\Sabre\File')
->disableOriginalConstructor()
->getMock();
$node->expects($this->any())
->method('getId')
->will($this->returnValue('4567'));
$this->userSession->expects($this->once())
->method('getUser')
->will($this->returnValue($user));
$numberOfCommentsForNodes = [];
$this->commentsManager->expects($this->any())
->method('getNumberOfUnreadCommentsForNodes')
->willReturn($numberOfCommentsForNodes);
$unread = $this->plugin->getUnreadCount($node);
if(is_null($user)) {
$this->assertNull($unread);
} else {
$this->assertSame($unread, 0);
}
}
}
tests/integration/config/behat.yml
View file @ 4888a0cd
......@@ -12,8 +12,6 @@ default:
- admin
- admin
regular_user_password: 123456
- CommentsContext:
baseUrl: http://localhost:8080
- TagsContext:
baseUrl: http://localhost:8080
- CardDavContext:
......
tests/integration/features/bootstrap/BasicStructure.php
View file @ 4888a0cd
......@@ -10,6 +10,7 @@ trait BasicStructure {
use Auth;
use Trashbin;
use Checksums;
use Comments;
/** @var string */
private $currentUser = '';
......
tests/integration/features/bootstrap/Comments.php 0 → 100644
View file @ 4888a0cd
<?php
/**
* @author Lukas Reschke <lukas@owncloud.com>
* @author Sergio Bertolin <sbertolin@owncloud.com>
*
* @copyright Copyright (c) 2017, ownCloud, Gmbh.
* @license AGPL-3.0
*
* This code is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License, version 3,
* as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License, version 3,
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
*/
require __DIR__ . '/../../../../lib/composer/autoload.php';
//class CommentsContext implements \Behat\Behat\Context\Context {
trait Comments {
use Sharing;
/** @var int */
private $lastCommentId;
/** @var int */
private $lastFileId;
/**
* @param string $path
* @return int
*/
private function getFileIdForPath($user, $path) {
$propertiesTable = new \Behat\Gherkin\Node\TableNode([["{http://owncloud.org/ns}fileid"]]);
$this->asGetsPropertiesOfFolderWith($user, 'file', $path, $propertiesTable);
return (int) $this->response['{http://owncloud.org/ns}fileid'];
}
/**
* @When /^user "([^"]*)" comments with content "([^"]*)" on (file|folder) "([^"]*)"$/
* @param string $user
* @param string $content
* @param string $type
* @param string $path
* @throws \Exception
*/
public function postsAComment($user, $content, $type, $path) {
$fileId = $this->getFileIdForPath($user, $path);
$this->lastFileId = $fileId;
$commentsPath = '/comments/files/' . $fileId . '/';
try {
$this->response = $this->makeDavRequest($user,
"POST",
$commentsPath,
['Content-Type' => 'application/json',
],
null,
"uploads",
'{"actorId":"user0",
"actorDisplayName":"user0",
"actorType":"users",
"verb":"comment",
"message":"' . $content . '",
"creationDateTime":"Thu, 18 Feb 2016 17:04:18 GMT",
"objectType":"files"}');
$responseHeaders = $this->response->getHeaders();
$commentUrl = $responseHeaders['Content-Location'][0];
$this->lastCommentId = substr($commentUrl, strrpos($commentUrl,'/')+1);
} catch (\GuzzleHttp\Exception\ClientException $ex) {
$this->response = $ex->getResponse();
}
}
/**
* @Then /^user "([^"]*)" should have the following comments on (file|folder) "([^"]*)"$/
* @param string $user
* @param string $type
* @param string $path
* @param \Behat\Gherkin\Node\TableNode|null $expectedElements
*/
public function checkComments($user, $type, $path, $expectedElements){
$fileId = $this->getFileIdForPath($user, $path);
$commentsPath = '/comments/files/' . $fileId . '/';
$properties = '<oc:limit>200</oc:limit><oc:offset>0</oc:offset>';
try{
$elementList = $this->reportElementComments($user,$commentsPath,$properties);
} catch (\GuzzleHttp\Exception\ClientException $e) {
$this->response = $e->getResponse();
return 1;
}
if ($expectedElements instanceof \Behat\Gherkin\Node\TableNode) {
$elementRows = $expectedElements->getRows();
foreach($elementRows as $expectedElement) {
$commentFound = false;
foreach ($elementList as $id => $answer) {
if (($answer[200]['{http://owncloud.org/ns}actorDisplayName'] === $expectedElement[0]) and
($answer[200]['{http://owncloud.org/ns}message'] === $expectedElement[1])){
$commentFound = true;
break;
}
}
PHPUnit_Framework_Assert::assertTrue($commentFound, "Comment not found");
}
}
}
/**
* @Then /^user "([^"]*)" should have (\d+) comments on (file|folder) "([^"]*)"$/
* @param string $user
* @param string $numberOfComments
* @param string $type
* @param string $path
*/
public function checkNumberOfComments($user, $numberOfComments, $type, $path) {
$fileId = $this->getFileIdForPath($user, $path);
$commentsPath = '/comments/files/' . $fileId . '/';
$properties = '<oc:limit>200</oc:limit><oc:offset>0</oc:offset>';
try{
$elementList = $this->reportElementComments($user,$commentsPath,$properties);
PHPUnit_Framework_Assert::assertEquals($numberOfComments, count($elementList));
} catch (\GuzzleHttp\Exception\ClientException $e) {
$this->response = $e->getResponse();
}
}
public function deleteComment($user, $fileId, $commentId){
$commentsPath = '/comments/files/' . $fileId . '/' . $commentId;
try {
$this->response = $this->makeDavRequest($user,
"DELETE",
$commentsPath,
[],
null,
"uploads",
null);
} catch (\GuzzleHttp\Exception\ClientException $ex) {
$this->response = $ex->getResponse();
}
}
/**
* @Then user :user deletes the last created comment
* @param string $user
* @throws \Exception
*/
public function userDeletesLastComment($user) {
$this->deleteComment($user, $this->lastFileId, $this->lastCommentId);
}
/**
* @Then the response should contain a property :key with value :value
* @param string $key
* @param string $value
* @throws \Exception
*/
public function theResponseShouldContainAPropertyWithValue($key, $value) {
$keys = $this->response[0]['value'][2]['value'][0]['value'];
$found = false;
foreach($keys as $singleKey) {
if($singleKey['name'] === '{http://owncloud.org/ns}'.substr($key, 3)) {
if($singleKey['value'] === $value) {
$found = true;
}
}
}
if($found === false) {
throw new \Exception("Cannot find property $key with $value");
}
}
/**
* @Then the response should contain only :number comments
* @param int $number
* @throws \Exception
*/
public function theResponseShouldContainOnlyComments($number) {
if(count($this->response) !== (int)$number) {
throw new \Exception("Found more comments than $number (".count($this->response).")");
}
}
public function editAComment($user, $content, $fileId, $commentId) {
$commentsPath = '/comments/files/' . $fileId . '/' . $commentId;
try {
$this->response = $this->makeDavRequest($user,
"PROPPATCH",
$commentsPath,
[],
null,
"uploads",
'<?xml version="1.0"?>
<d:propertyupdate xmlns:d="DAV:" xmlns:oc="http://owncloud.org/ns">
<d:set>
<d:prop>
<oc:message>'. htmlspecialchars($content, ENT_XML1, 'UTF-8') .'</oc:message>
</d:prop>
</d:set>
</d:propertyupdate>');
} catch (\GuzzleHttp\Exception\ClientException $ex) {
$this->response = $ex->getResponse();
}
}
/**
* @When /^user "([^"]*)" edits last comment with content "([^"]*)"$/
* @param string $user
* @param string $content
* @param string $type
* @param string $path
* @throws \Exception
*/
public function userEditsLastCreatedComment($user, $content) {
$this->editAComment($user, $content, $this->lastFileId, $this->lastCommentId);
}
}
tests/integration/features/bootstrap/CommentsContext.php deleted 100644 → 0
View file @ d42bbfaa
<?php
/**
* @author Lukas Reschke <lukas@owncloud.com>
*
* @copyright Copyright (c) 2016, ownCloud, Inc.
* @license AGPL-3.0
*
* This code is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License, version 3,
* as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License, version 3,
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
*/
require __DIR__ . '/../../../../lib/composer/autoload.php';
class CommentsContext implements \Behat\Behat\Context\Context {
/** @var string */
private $baseUrl;
/** @var array */
private $response;
/** @var int */
private $commentId;
/** @var int */
private $fileId;
/**
* @param string $baseUrl
*/
public function __construct($baseUrl) {
$this->baseUrl = $baseUrl;
// in case of ci deployment we take the server url from the environment
$testServerUrl = getenv('TEST_SERVER_URL');
if ($testServerUrl !== false) {
$this->baseUrl = substr($testServerUrl, 0, -5);
}
}
/** @AfterScenario */
public function teardownScenario() {
$client = new \GuzzleHttp\Client();
try {
$client->delete(
$this->baseUrl.'/remote.php/webdav/myFileToComment.txt',
[
'auth' => [
'user0',
'123456',
],
'headers' => [
'Content-Type' => 'application/json',
],
]
);
} catch (\GuzzleHttp\Exception\ClientException $e) {
$e->getResponse();
}
}
/**
* @param string $path
* @return int
*/
private function getFileIdForPath($path) {
$url = $this->baseUrl.'/remote.php/webdav/'.$path;
$context = stream_context_create([
'http' => [
'method' => 'PROPFIND',
'header' => "Authorization: Basic dXNlcjA6MTIzNDU2\r\nContent-Type: application/x-www-form-urlencoded",
'content' => '<?xml version="1.0"?>
<d:propfind xmlns:d="DAV:" xmlns:oc="http://owncloud.org/ns">
<d:prop>
<oc:fileid />
</d:prop>
</d:propfind>'
]
]);
$response = file_get_contents($url, false, $context);
preg_match_all('/\<oc:fileid\>(.*)\<\/oc:fileid\>/', $response, $matches);
return (int)$matches[1][0];
}
/**
* @When :user posts a comment with content :content on the file named :fileName it should return :statusCode
* @param string $user
* @param string $content
* @param string $fileName
* @param int $statusCode
* @throws \Exception
*/
public function postsACommentWithContentOnTheFileNamedItShouldReturn($user, $content, $fileName, $statusCode) {
$fileId = $this->getFileIdForPath($fileName);
$this->fileId = (int)$fileId;
$url = $this->baseUrl.'/remote.php/dav/comments/files/'.$fileId.'/';
$client = new \GuzzleHttp\Client();
try {
$res = $client->post(
$url,
[
'body' => '{"actorId":"user0","actorDisplayName":"user0","actorType":"users","verb":"comment","message":"' . $content . '","creationDateTime":"Thu, 18 Feb 2016 17:04:18 GMT","objectType":"files"}',
'auth' => [
$user,
'123456',
],
'headers' => [
'Content-Type' => 'application/json',
],
]
);
} catch (\GuzzleHttp\Exception\ClientException $e) {
$res = $e->getResponse();
}
if($res->getStatusCode() !== (int)$statusCode) {
throw new \Exception("Response status code was not $statusCode (".$res->getStatusCode().")");
}
}
/**
* @Then As :user load all the comments of the file named :fileName it should return :statusCode
* @param string $user
* @param string $fileName
* @param int $statusCode
* @throws \Exception
*/
public function asLoadloadAllTheCommentsOfTheFileNamedItShouldReturn($user, $fileName, $statusCode) {
$fileId = $this->getFileIdForPath($fileName);
$url = $this->baseUrl.'/remote.php/dav/comments/files/'.$fileId.'/';
try {
$client = new \GuzzleHttp\Client();
$res = $client->createRequest(
'REPORT',
$url,
[
'body' => '<?xml version="1.0" encoding="utf-8" ?>
<oc:filter-comments xmlns:oc="http://owncloud.org/ns">
<oc:limit>200</oc:limit>
<oc:offset>0</oc:offset>
</oc:filter-comments>
',
'auth' => [
$user,
'123456',
],
'headers' => [
'Content-Type' => 'application/json',
],
]
);
$res = $client->send($res);
} catch (\GuzzleHttp\Exception\ClientException $e) {
$res = $e->getResponse();
}
if($res->getStatusCode() !== (int)$statusCode) {
throw new \Exception("Response status code was not $statusCode (".$res->getStatusCode().")");
}
if($res->getStatusCode() === 207) {
$service = new Sabre\Xml\Service();
$this->response = $service->parse($res->getBody()->getContents());
$this->commentId = (int)$this->response[0]['value'][2]['value'][0]['value'][0]['value'];
}
}
/**
* @Given As :user sending :verb to :url with
* @param string $user
* @param string $verb
* @param string $url
* @param \Behat\Gherkin\Node\TableNode $body
* @throws \Exception
*/
public function asUserSendingToWith($user, $verb, $url, \Behat\Gherkin\Node\TableNode $body) {
$client = new \GuzzleHttp\Client();
$options = [];
$options['auth'] = [$user, '123456'];
$fd = $body->getRowsHash();
$options['body'] = $fd;
$client->send($client->createRequest($verb, $this->baseUrl.'/ocs/v1.php/'.$url, $options));
}
/**
* @Then As :user delete the created comment it should return :statusCode
* @param string $user
* @param int $statusCode
* @throws \Exception
*/
public function asDeleteTheCreatedCommentItShouldReturn($user, $statusCode) {
$url = $this->baseUrl.'/remote.php/dav/comments/files/'.$this->fileId.'/'.$this->commentId;
$client = new \GuzzleHttp\Client();
try {
$res = $client->delete(
$url,
[
'auth' => [
$user,
'123456',
],
'headers' => [
'Content-Type' => 'application/json',
],
]
);
} catch (\GuzzleHttp\Exception\ClientException $e) {
$res = $e->getResponse();
}
if($res->getStatusCode() !== (int)$statusCode) {
throw new \Exception("Response status code was not $statusCode (".$res->getStatusCode().")");
}
}
/**
* @Then the response should contain a property :key with value :value
* @param string $key
* @param string $value
* @throws \Exception
*/
public function theResponseShouldContainAPropertyWithValue($key, $value) {
$keys = $this->response[0]['value'][2]['value'][0]['value'];
$found = false;
foreach($keys as $singleKey) {
if($singleKey['name'] === '{http://owncloud.org/ns}'.substr($key, 3)) {
if($singleKey['value'] === $value) {
$found = true;
}
}
}
if($found === false) {
throw new \Exception("Cannot find property $key with $value");
}
}
/**
* @Then the response should contain only :number comments
* @param int $number
* @throws \Exception
*/
public function theResponseShouldContainOnlyComments($number) {
if(count($this->response) !== (int)$number) {
throw new \Exception("Found more comments than $number (".count($this->response).")");
}
}
/**
* @Then As :user edit the last created comment and set text to :text it should return :statusCode
* @param string $user
* @param string $text
* @param int $statusCode
* @throws \Exception
*/
public function asEditTheLastCreatedCommentAndSetTextToItShouldReturn($user, $text, $statusCode) {
$client = new \GuzzleHttp\Client();
$options = [];
$options['auth'] = [$user, '123456'];
$options['body'] = '<?xml version="1.0"?>
<d:propertyupdate xmlns:d="DAV:" xmlns:oc="http://owncloud.org/ns">
<d:set>
<d:prop>
<oc:message>'.$text.'</oc:message>
</d:prop>
</d:set>
</d:propertyupdate>';
try {
$res = $client->send($client->createRequest('PROPPATCH', $this->baseUrl.'/remote.php/dav/comments/files/' . $this->fileId . '/' . $this->commentId, $options));
} catch (\GuzzleHttp\Exception\ClientException $e) {
$res = $e->getResponse();
}
if($res->getStatusCode() !== (int)$statusCode) {
throw new \Exception("Response status code was not $statusCode (".$res->getStatusCode().")");
}
}
}
tests/integration/features/bootstrap/TagsContext.php
View file @ 4888a0cd
......@@ -675,4 +675,21 @@ class TagsContext implements \Behat\Behat\Context\Context {
$this->response = $e->getResponse();
}
}
/**
* @Given As :user sending :verb to :url with
* @param string $user
* @param string $verb
* @param string $url
* @param \Behat\Gherkin\Node\TableNode $body
* @throws \Exception
*/
public function asUserSendingToWith($user, $verb, $url, \Behat\Gherkin\Node\TableNode $body) {
$client = new \GuzzleHttp\Client();
$options = [];
$options['auth'] = [$user, '123456'];
$fd = $body->getRowsHash();
$options['body'] = $fd;
$client->send($client->createRequest($verb, $this->baseUrl.'/ocs/v1.php/'.$url, $options));
}
}
tests/integration/features/bootstrap/WebDav.php
View file @ 4888a0cd
......@@ -51,14 +51,24 @@ trait WebDav {
}
}
public function makeDavRequest($user, $method, $path, $headers, $body = null, $type = "files"){
public function makeDavRequest($user,
$method,
$path,
$headers,
$body = null,
$type = "files",
$requestBody = null){
if ( $type === "files" ){
$fullUrl = substr($this->baseUrl, 0, -4) . $this->getDavFilesPath($user) . "$path";
} else if ( $type === "uploads" ){
$fullUrl = substr($this->baseUrl, 0, -4) . $this->davPath . "$path";
}
$client = new GClient();
$options = [];
if (!is_null($requestBody)){
$options['body'] = $requestBody;
}
if ($user === 'admin') {
$options['auth'] = $this->adminUser;
} else {
......@@ -317,6 +327,15 @@ trait WebDav {
$value = $value[0];
}
}
if ($expectedValue === "a_comment_url"){
if (preg_match("#^/remote.php/dav/comments/files/([0-9]+)$#", $value)) {
return 0;
} else {
throw new \Exception("Property \"$key\" found with value \"$value\", expected \"$expectedValue\"");
}
}
if ($value != $expectedValue) {
throw new \Exception("Property \"$key\" found with value \"$value\", expected \"$expectedValue\"");
}
......@@ -425,10 +444,35 @@ trait WebDav {
return $parsedResponse;
}
/* Returns the elements of a report command special for comments
* @param string $user
* @param string $path
* @param string $properties properties which needs to be included in the report
* @param string $filterRules filter-rules to choose what needs to appear in the report
*/
public function reportElementComments($user, $path, $properties){
$client = $this->getSabreClient($user);
$body = '<?xml version="1.0" encoding="utf-8" ?>
<oc:filter-comments xmlns:a="DAV:" xmlns:oc="http://owncloud.org/ns" >
' . $properties . '
</oc:filter-comments>';
$response = $client->request('REPORT', $this->makeSabrePathNotForFiles($path), $body);
$parsedResponse = $client->parseMultistatus($response['body']);
return $parsedResponse;