aboutsummaryrefslogtreecommitdiffhomepage
path: root/tests/front/controller/admin/ManageTagControllerTest.php
diff options
context:
space:
mode:
authorArthurHoaro <arthur@hoa.ro>2021-01-20 14:45:59 +0100
committerArthurHoaro <arthur@hoa.ro>2021-01-20 15:01:29 +0100
commit9b8c0a4560fa1d87cab1529099b1b4677e92e265 (patch)
tree330a9b1a42ff7b7f24a76612b57fae63417ef483 /tests/front/controller/admin/ManageTagControllerTest.php
parent055d97f9a9e67d8ee8ae81bbf59a4b846a145d9f (diff)
downloadShaarli-9b8c0a4560fa1d87cab1529099b1b4677e92e265.tar.gz
Shaarli-9b8c0a4560fa1d87cab1529099b1b4677e92e265.tar.zst
Shaarli-9b8c0a4560fa1d87cab1529099b1b4677e92e265.zip
Handle pagination through BookmarkService
Handle all search results through SearchResult object. This is a required step toward implementing a BookmarkService based on SQL database. Related to #953
Diffstat (limited to 'tests/front/controller/admin/ManageTagControllerTest.php')
-rw-r--r--tests/front/controller/admin/ManageTagControllerTest.php9
1 files changed, 5 insertions, 4 deletions
diff --git a/tests/front/controller/admin/ManageTagControllerTest.php b/tests/front/controller/admin/ManageTagControllerTest.php
index af6f273f..56a64cbb 100644
--- a/tests/front/controller/admin/ManageTagControllerTest.php
+++ b/tests/front/controller/admin/ManageTagControllerTest.php
@@ -6,6 +6,7 @@ namespace Shaarli\Front\Controller\Admin;
6 6
7use Shaarli\Bookmark\Bookmark; 7use Shaarli\Bookmark\Bookmark;
8use Shaarli\Bookmark\BookmarkFilter; 8use Shaarli\Bookmark\BookmarkFilter;
9use Shaarli\Bookmark\SearchResult;
9use Shaarli\Config\ConfigManager; 10use Shaarli\Config\ConfigManager;
10use Shaarli\Front\Exception\WrongTokenException; 11use Shaarli\Front\Exception\WrongTokenException;
11use Shaarli\Security\SessionManager; 12use Shaarli\Security\SessionManager;
@@ -100,11 +101,11 @@ class ManageTagControllerTest extends TestCase
100 ->expects(static::once()) 101 ->expects(static::once())
101 ->method('search') 102 ->method('search')
102 ->with(['searchtags' => 'old-tag'], BookmarkFilter::$ALL, true) 103 ->with(['searchtags' => 'old-tag'], BookmarkFilter::$ALL, true)
103 ->willReturnCallback(function () use ($bookmark1, $bookmark2): array { 104 ->willReturnCallback(function () use ($bookmark1, $bookmark2): SearchResult {
104 $bookmark1->expects(static::once())->method('renameTag')->with('old-tag', 'new-tag'); 105 $bookmark1->expects(static::once())->method('renameTag')->with('old-tag', 'new-tag');
105 $bookmark2->expects(static::once())->method('renameTag')->with('old-tag', 'new-tag'); 106 $bookmark2->expects(static::once())->method('renameTag')->with('old-tag', 'new-tag');
106 107
107 return [$bookmark1, $bookmark2]; 108 return SearchResult::getSearchResult([$bookmark1, $bookmark2]);
108 }) 109 })
109 ; 110 ;
110 $this->container->bookmarkService 111 $this->container->bookmarkService
@@ -153,11 +154,11 @@ class ManageTagControllerTest extends TestCase
153 ->expects(static::once()) 154 ->expects(static::once())
154 ->method('search') 155 ->method('search')
155 ->with(['searchtags' => 'old-tag'], BookmarkFilter::$ALL, true) 156 ->with(['searchtags' => 'old-tag'], BookmarkFilter::$ALL, true)
156 ->willReturnCallback(function () use ($bookmark1, $bookmark2): array { 157 ->willReturnCallback(function () use ($bookmark1, $bookmark2): SearchResult {
157 $bookmark1->expects(static::once())->method('deleteTag')->with('old-tag'); 158 $bookmark1->expects(static::once())->method('deleteTag')->with('old-tag');
158 $bookmark2->expects(static::once())->method('deleteTag')->with('old-tag'); 159 $bookmark2->expects(static::once())->method('deleteTag')->with('old-tag');
159 160
160 return [$bookmark1, $bookmark2]; 161 return SearchResult::getSearchResult([$bookmark1, $bookmark2]);
161 }) 162 })
162 ; 163 ;
163 $this->container->bookmarkService 164 $this->container->bookmarkService