From abba7386eebb7f75c91d61e947bc6955577de54b Mon Sep 17 00:00:00 2001 From: WENDLING NICOLAS Date: Sun, 28 Feb 2021 23:00:29 +0100 Subject: =?UTF-8?q?=E2=9C=85=20Fix=20tests=20in=20ItemMapperAfterTest:=20-?= =?UTF-8?q?=20testFindAllAfterStarred=20-=20testFindAllAfterAll=20-=20test?= =?UTF-8?q?FindAllAfterInvalid?= 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 | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'tests') diff --git a/tests/Unit/Db/ItemMapperAfterTest.php b/tests/Unit/Db/ItemMapperAfterTest.php index 8a31fedf6..5c91fa00d 100644 --- a/tests/Unit/Db/ItemMapperAfterTest.php +++ b/tests/Unit/Db/ItemMapperAfterTest.php @@ -534,7 +534,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.starred = :starred'] ) ->will($this->returnSelf()); @@ -544,6 +544,7 @@ class ItemMapperAfterTest extends MapperTestUtility ->with([ 'updatedSince' => 1610903351, 'userId' => 'jack', + 'sharedWith' => 'jack' ]) ->will($this->returnSelf()); @@ -603,7 +604,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'] ) ->will($this->returnSelf()); @@ -612,6 +613,7 @@ class ItemMapperAfterTest extends MapperTestUtility ->with([ 'updatedSince' => 1610903351, 'userId' => 'jack', + 'sharedWith' => 'jack' ]) ->will($this->returnSelf()); @@ -669,7 +671,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'] ) ->will($this->returnSelf()); @@ -678,6 +680,7 @@ class ItemMapperAfterTest extends MapperTestUtility ->with([ 'updatedSince' => 1610903351, 'userId' => 'jack', + 'sharedWith' => 'jack' ]) ->will($this->returnSelf()); -- cgit v1.2.3