From 306f97d656f39f805379f7e034a4eefa4b91f99e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien?= Date: Sun, 28 Feb 2021 21:08:55 +0100 Subject: Fix tests testFindAllInFolderAfterHideRead, testFindAllInFolderAfter, testFindAllInFeedAfterHideRead, testFindAllInFeedAfter Signed-off-by: Marco Nassabain --- tests/Unit/Db/ItemMapperTest.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'tests') diff --git a/tests/Unit/Db/ItemMapperTest.php b/tests/Unit/Db/ItemMapperTest.php index 067043330..b0a0cf355 100644 --- a/tests/Unit/Db/ItemMapperTest.php +++ b/tests/Unit/Db/ItemMapperTest.php @@ -493,10 +493,11 @@ class ItemMapperTest extends MapperTestUtility ->with('items', 'news_feeds', 'feeds', 'items.feed_id = feeds.id') ->will($this->returnSelf()); - $this->builder->expects($this->exactly(3)) + $this->builder->expects($this->exactly(4)) ->method('andWhere') ->withConsecutive( ['items.last_modified >= :updatedSince'], + ['items.shared_by = \'\''], ['feeds.user_id = :userId'], ['feeds.id = :feedId'] ) @@ -557,10 +558,11 @@ class ItemMapperTest extends MapperTestUtility ->with('items', 'news_feeds', 'feeds', 'items.feed_id = feeds.id') ->will($this->returnSelf()); - $this->builder->expects($this->exactly(4)) + $this->builder->expects($this->exactly(5)) ->method('andWhere') ->withConsecutive( ['items.last_modified >= :updatedSince'], + ['items.shared_by = \'\''], ['feeds.user_id = :userId'], ['feeds.id = :feedId'], ['items.unread = 1'] @@ -625,10 +627,11 @@ class ItemMapperTest extends MapperTestUtility ) ->will($this->returnSelf()); - $this->builder->expects($this->exactly(3)) + $this->builder->expects($this->exactly(4)) ->method('andWhere') ->withConsecutive( ['items.last_modified >= :updatedSince'], + ['items.shared_by = \'\''], ['feeds.user_id = :userId'], ['folders.id = :folderId'] ) @@ -692,10 +695,11 @@ class ItemMapperTest extends MapperTestUtility ) ->will($this->returnSelf()); - $this->builder->expects($this->exactly(4)) + $this->builder->expects($this->exactly(5)) ->method('andWhere') ->withConsecutive( ['items.last_modified >= :updatedSince'], + ['items.shared_by = \'\''], ['feeds.user_id = :userId'], ['folders.id = :folderId'], ['items.unread = 1'] -- cgit v1.2.3