Merge pull request #19890 from nextcloud/enh/comments-reference-id

Add optional comments reference_id

1 files changed, 13 insertions, 8 deletions

diff --git a/apps/dav/tests/unit/Comments/CommentsNodeTest.php b/apps/dav/tests/unit/Comments/CommentsNodeTest.php
index 0555d09379c..a219b0a5c74 100644
--- a/apps/dav/tests/unit/Comments/CommentsNodeTest.php
+++ b/apps/dav/tests/unit/Comments/CommentsNodeTest.php
@@ -108,7 +108,7 @@ class CommentsNodeTest extends \Test\TestCase {
 		$this->node->delete();
 	}
 
-	
+
 	public function testDeleteForbidden() {
 		$this->expectException(\Sabre\DAV\Exception\Forbidden::class);
 
@@ -150,7 +150,7 @@ class CommentsNodeTest extends \Test\TestCase {
 		$this->assertSame($this->node->getName(), $id);
 	}
 
-	
+
 	public function testSetName() {
 		$this->expectException(\Sabre\DAV\Exception\MethodNotAllowed::class);
 
@@ -195,7 +195,7 @@ class CommentsNodeTest extends \Test\TestCase {
 		$this->assertTrue($this->node->updateComment($msg));
 	}
 
-	
+
 	public function testUpdateCommentLogException() {
 		$this->expectException(\Exception::class);
 		$this->expectExceptionMessage('buh!');
@@ -236,7 +236,7 @@ class CommentsNodeTest extends \Test\TestCase {
 		$this->node->updateComment($msg);
 	}
 
-	
+
 	public function testUpdateCommentMessageTooLongException() {
 		$this->expectException(\Sabre\DAV\Exception\BadRequest::class);
 		$this->expectExceptionMessage('Message exceeds allowed character limit of');
@@ -275,7 +275,7 @@ class CommentsNodeTest extends \Test\TestCase {
 		$this->node->updateComment('foo');
 	}
 
-	
+
 	public function testUpdateForbiddenByUser() {
 		$this->expectException(\Sabre\DAV\Exception\Forbidden::class);
 
@@ -310,7 +310,7 @@ class CommentsNodeTest extends \Test\TestCase {
 		$this->node->updateComment($msg);
 	}
 
-	
+
 	public function testUpdateForbiddenByType() {
 		$this->expectException(\Sabre\DAV\Exception\Forbidden::class);
 
@@ -340,7 +340,7 @@ class CommentsNodeTest extends \Test\TestCase {
 		$this->node->updateComment($msg);
 	}
 
-	
+
 	public function testUpdateForbiddenByNotLoggedIn() {
 		$this->expectException(\Sabre\DAV\Exception\Forbidden::class);
 
@@ -403,6 +403,7 @@ class CommentsNodeTest extends \Test\TestCase {
 			$ns . 'latestChildDateTime' => new \DateTime('2016-01-12 18:48:00'),
 			$ns . 'objectType' => 'files',
 			$ns . 'objectId' => '1848',
+			$ns . 'referenceId' => 'ref',
 			$ns . 'isUnread' => null,
 		];
 
@@ -469,6 +470,10 @@ class CommentsNodeTest extends \Test\TestCase {
 			->method('getObjectId')
 			->willReturn($expected[$ns . 'objectId']);
 
+		$this->comment->expects($this->once())
+			->method('getReferenceId')
+			->willReturn($expected[$ns . 'referenceId']);
+
 		$user = $this->getMockBuilder(IUser::class)
 			->disableOriginalConstructor()
 			->getMock();
@@ -484,7 +489,7 @@ class CommentsNodeTest extends \Test\TestCase {
 		$properties = $this->node->getProperties(null);
 
 		foreach($properties as $name => $value) {
-			$this->assertTrue(array_key_exists($name, $expected));
+			$this->assertArrayHasKey($name, $expected);
 			$this->assertSame($expected[$name], $value);
 			unset($expected[$name]);
 		}