From 6dbf64fa9de279cc9a71f64d41d5f4bb427371d0 Mon Sep 17 00:00:00 2001 From: WENDLING NICOLAS Date: Sun, 28 Feb 2021 22:50:49 +0100 Subject: =?UTF-8?q?=E2=9C=85=20Fix=20tests=20in=20ItemMapperAfterTest:=20-?= =?UTF-8?q?=20testFindAllInFeedAfter=20-=20testFindAllInFeedAfterHideRead?= =?UTF-8?q?=20-=20testFindAllInFolderAfter=20-=20testFindAllInFolderAfterH?= =?UTF-8?q?ideRead=20-=20testFindAllAfterUnread?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Marco Nassabain --- tests/Unit/Db/ItemMapperAfterTest.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/Unit/Db/ItemMapperAfterTest.php b/tests/Unit/Db/ItemMapperAfterTest.php index 75804e629..8a31fedf6 100644 --- a/tests/Unit/Db/ItemMapperAfterTest.php +++ b/tests/Unit/Db/ItemMapperAfterTest.php @@ -66,6 +66,7 @@ class ItemMapperAfterTest extends MapperTestUtility ->method('andWhere') ->withConsecutive( ['items.last_modified >= :updatedSince'], + ['items.shared_by = \'\''], ['feeds.user_id = :userId'], ['feeds.id = :feedId'], ['feeds.deleted_at = 0'] @@ -131,6 +132,7 @@ class ItemMapperAfterTest extends MapperTestUtility ->method('andWhere') ->withConsecutive( ['items.last_modified >= :updatedSince'], + ['items.shared_by = \'\''], ['feeds.user_id = :userId'], ['feeds.id = :feedId'], ['feeds.deleted_at = 0'], @@ -205,6 +207,7 @@ class ItemMapperAfterTest extends MapperTestUtility ->method('andWhere') ->withConsecutive( ['items.last_modified >= :updatedSince'], + ['items.shared_by = \'\''], ['feeds.user_id = :userId'], ['feeds.deleted_at = 0'], ['folders.id = :folderId'] @@ -273,6 +276,7 @@ class ItemMapperAfterTest extends MapperTestUtility ->method('andWhere') ->withConsecutive( ['items.last_modified >= :updatedSince'], + ['items.shared_by = \'\''], ['feeds.user_id = :userId'], ['feeds.deleted_at = 0'], ['folders.id = :folderId'], @@ -460,7 +464,7 @@ class ItemMapperAfterTest extends MapperTestUtility ->withConsecutive( ['items.last_modified >= :updatedSince'], ['feeds.deleted_at = 0'], - ['feeds.user_id = :userId'], + ['(feeds.user_id = :userId AND items.shared_by = \'\') OR items.shared_with = :sharedWith'], ['items.unread = :unread'] ) ->will($this->returnSelf()); @@ -470,6 +474,7 @@ class ItemMapperAfterTest extends MapperTestUtility ->with([ 'updatedSince' => 1610903351, 'userId' => 'jack', + 'sharedWith' => 'jack' ]) ->will($this->returnSelf()); -- cgit v1.2.3