From 8de50d44b6239dd54aef6080b4e5b9728cdbd9e7 Mon Sep 17 00:00:00 2001 From: Marco Nassabain Date: Sun, 28 Feb 2021 23:06:53 +0100 Subject: =?UTF-8?q?=E2=9C=85=20ItemMapperPaginatedTest:=20update=20tests?= =?UTF-8?q?=20Adapted=20folder/feed/item=20tests=20to=20take=20account=20f?= =?UTF-8?q?or=20shared=20data=20-=20testFindAllItemsStarredSearch=20-=20te?= =?UTF-8?q?stFindAllFeed=20-=20testFindAllFeedInverted=20-=20testFindAllFe?= =?UTF-8?q?edHideRead=20-=20testFindAllFeedSearch=20-=20testFindAllFolderI?= =?UTF-8?q?dNull=20-=20testFindAllFolderHideRead=20-=20testFindAllFolderHi?= =?UTF-8?q?deReadInvertOrder=20-=20testFindAllFolderSearchId?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Marco Nassabain --- tests/Unit/Db/ItemMapperPaginatedTest.php | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/Unit/Db/ItemMapperPaginatedTest.php b/tests/Unit/Db/ItemMapperPaginatedTest.php index 3e506ffa1..f6703739a 100644 --- a/tests/Unit/Db/ItemMapperPaginatedTest.php +++ b/tests/Unit/Db/ItemMapperPaginatedTest.php @@ -427,7 +427,7 @@ class ItemMapperPaginatedTest extends MapperTestUtility $this->builder->expects($this->exactly(6)) ->method('andWhere') ->withConsecutive( - ['feeds.user_id = :userId'], + ['(feeds.user_id = :userId AND items.shared_by = \'\') OR items.shared_with = :sharedWith'], ['feeds.deleted_at = 0'], ['items.search_index LIKE :term0'], ['items.search_index LIKE :term1'], @@ -440,6 +440,7 @@ class ItemMapperPaginatedTest extends MapperTestUtility ->method('setParameter') ->withConsecutive( ['userId', 'jack'], + ['sharedWith', 'jack'], ['term0', '%key%'], ['term1', '%word%'], ['offset', 10], @@ -511,6 +512,7 @@ class ItemMapperPaginatedTest extends MapperTestUtility ['feeds.deleted_at = 0'], ['feeds.user_id = :userId'], ['items.feed_id = :feedId'], + ['items.shared_by = \'\''], ['items.id < :offset'] ) ->will($this->returnSelf()); @@ -655,6 +657,7 @@ class ItemMapperPaginatedTest extends MapperTestUtility ['feeds.deleted_at = 0'], ['feeds.user_id = :userId'], ['items.feed_id = :feedId'], + ['items.shared_by = \'\''], ['items.id > :offset'] ) ->will($this->returnSelf()); @@ -726,6 +729,7 @@ class ItemMapperPaginatedTest extends MapperTestUtility ['feeds.deleted_at = 0'], ['feeds.user_id = :userId'], ['items.feed_id = :feedId'], + ['items.shared_by = \'\''], ['items.id < :offset'], ['items.unread = :unread'] ) @@ -803,6 +807,7 @@ class ItemMapperPaginatedTest extends MapperTestUtility ['feeds.deleted_at = 0'], ['feeds.user_id = :userId'], ['items.feed_id = :feedId'], + ['items.shared_by = \'\''], ['items.search_index LIKE :term0'], ['items.search_index LIKE :term1'], ['items.id < :offset'] @@ -895,6 +900,7 @@ class ItemMapperPaginatedTest extends MapperTestUtility ->withConsecutive( ['feeds.user_id = :userId'], ['feeds.deleted_at = 0'], + ['items.shared_by = \'\''], ['x IS NULL'], ['items.id < :offset'] ) @@ -1063,6 +1069,7 @@ class ItemMapperPaginatedTest extends MapperTestUtility ->withConsecutive( ['feeds.user_id = :userId'], ['feeds.deleted_at = 0'], + ['items.shared_by = \'\''], ['x IS NULL'], ['items.id < :offset'], ['items.unread = :unread'] @@ -1149,6 +1156,7 @@ class ItemMapperPaginatedTest extends MapperTestUtility ->withConsecutive( ['feeds.user_id = :userId'], ['feeds.deleted_at = 0'], + ['items.shared_by = \'\''], ['x IS NULL'], ['items.id > :offset'], ['items.unread = :unread'] @@ -1238,6 +1246,7 @@ class ItemMapperPaginatedTest extends MapperTestUtility ->withConsecutive( ['feeds.user_id = :userId'], ['feeds.deleted_at = 0'], + ['items.shared_by = \'\''], ['x = y'], ['items.search_index LIKE :term0'], ['items.search_index LIKE :term1'], -- cgit v1.2.3