From efb7d21b52eb033530e80e5e49d175e6e3b031f4 Mon Sep 17 00:00:00 2001
From: ArthurHoaro <arthur@hoa.ro>
Date: Fri, 2 Oct 2020 17:50:59 +0200
Subject: Add strict types for bookmarks management

Parameters typing and using strict types overall increase the codebase
quality by enforcing the a given parameter will have the expected type.

It also removes the need to unnecessary unit tests checking methods
behavior with invalid input.
---
 .../DeleteBookmarkTest.php                           |  4 ++++
 .../ManageShaareControllerTest/SaveBookmarkTest.php  | 20 +++++++++++++++-----
 2 files changed, 19 insertions(+), 5 deletions(-)

(limited to 'tests/front/controller/admin/ManageShaareControllerTest')

diff --git a/tests/front/controller/admin/ManageShaareControllerTest/DeleteBookmarkTest.php b/tests/front/controller/admin/ManageShaareControllerTest/DeleteBookmarkTest.php
index ba774e21..83bbee7c 100644
--- a/tests/front/controller/admin/ManageShaareControllerTest/DeleteBookmarkTest.php
+++ b/tests/front/controller/admin/ManageShaareControllerTest/DeleteBookmarkTest.php
@@ -356,6 +356,10 @@ class DeleteBookmarkTest extends TestCase
         ;
         $response = new Response();
 
+        $this->container->bookmarkService->method('get')->with('123')->willReturn(
+            (new Bookmark())->setId(123)->setUrl('http://domain.tld')->setTitle('Title 123')
+        );
+
         $this->container->formatterFactory = $this->createMock(FormatterFactory::class);
         $this->container->formatterFactory
             ->expects(static::once())
diff --git a/tests/front/controller/admin/ManageShaareControllerTest/SaveBookmarkTest.php b/tests/front/controller/admin/ManageShaareControllerTest/SaveBookmarkTest.php
index f7a68226..37542c26 100644
--- a/tests/front/controller/admin/ManageShaareControllerTest/SaveBookmarkTest.php
+++ b/tests/front/controller/admin/ManageShaareControllerTest/SaveBookmarkTest.php
@@ -66,23 +66,27 @@ class SaveBookmarkTest extends TestCase
         $this->container->bookmarkService
             ->expects(static::once())
             ->method('addOrSet')
-            ->willReturnCallback(function (Bookmark $bookmark, bool $save) use ($checkBookmark, $id): void {
+            ->willReturnCallback(function (Bookmark $bookmark, bool $save) use ($checkBookmark, $id): Bookmark {
                 static::assertFalse($save);
 
                 $checkBookmark($bookmark);
 
                 $bookmark->setId($id);
+
+                return $bookmark;
             })
         ;
         $this->container->bookmarkService
             ->expects(static::once())
             ->method('set')
-            ->willReturnCallback(function (Bookmark $bookmark, bool $save) use ($checkBookmark, $id): void {
+            ->willReturnCallback(function (Bookmark $bookmark, bool $save) use ($checkBookmark, $id): Bookmark {
                 static::assertTrue($save);
 
                 $checkBookmark($bookmark);
 
                 static::assertSame($id, $bookmark->getId());
+
+                return $bookmark;
             })
         ;
 
@@ -155,21 +159,25 @@ class SaveBookmarkTest extends TestCase
         $this->container->bookmarkService
             ->expects(static::once())
             ->method('addOrSet')
-            ->willReturnCallback(function (Bookmark $bookmark, bool $save) use ($checkBookmark, $id): void {
+            ->willReturnCallback(function (Bookmark $bookmark, bool $save) use ($checkBookmark, $id): Bookmark {
                 static::assertFalse($save);
 
                 $checkBookmark($bookmark);
+
+                return $bookmark;
             })
         ;
         $this->container->bookmarkService
             ->expects(static::once())
             ->method('set')
-            ->willReturnCallback(function (Bookmark $bookmark, bool $save) use ($checkBookmark, $id): void {
+            ->willReturnCallback(function (Bookmark $bookmark, bool $save) use ($checkBookmark, $id): Bookmark {
                 static::assertTrue($save);
 
                 $checkBookmark($bookmark);
 
                 static::assertSame($id, $bookmark->getId());
+
+                return $bookmark;
             })
         ;
 
@@ -230,8 +238,10 @@ class SaveBookmarkTest extends TestCase
         $this->container->bookmarkService
             ->expects(static::once())
             ->method('addOrSet')
-            ->willReturnCallback(function (Bookmark $bookmark, bool $save) use ($thumb): void {
+            ->willReturnCallback(function (Bookmark $bookmark, bool $save) use ($thumb): Bookmark {
                 static::assertSame($thumb, $bookmark->getThumbnail());
+
+                return $bookmark;
             })
         ;
 
-- 
cgit v1.2.3


From 4cf3564d28dc8e4d08a3e64f09ad045ffbde97ae Mon Sep 17 00:00:00 2001
From: ArthurHoaro <arthur@hoa.ro>
Date: Fri, 25 Sep 2020 13:29:36 +0200
Subject: Add a setting to retrieve bookmark metadata asynchrounously

  - There is a new standalone script (metadata.js) which requests
    a new controller to get bookmark metadata and fill the form async
  - This feature is enabled with the new setting: general.enable_async_metadata
    (enabled by default)
  - general.retrieve_description is now enabled by default
  - A small rotating loader animation has a been added to bookmark inputs
    when metadata is being retrieved (default template)
  - Custom JS htmlentities has been removed and  mathiasbynens/he
    library is used instead

Fixes #1563
---
 .../DisplayCreateFormTest.php                      | 118 +++++++++++++++------
 1 file changed, 83 insertions(+), 35 deletions(-)

(limited to 'tests/front/controller/admin/ManageShaareControllerTest')

diff --git a/tests/front/controller/admin/ManageShaareControllerTest/DisplayCreateFormTest.php b/tests/front/controller/admin/ManageShaareControllerTest/DisplayCreateFormTest.php
index 2eb95251..4fd88480 100644
--- a/tests/front/controller/admin/ManageShaareControllerTest/DisplayCreateFormTest.php
+++ b/tests/front/controller/admin/ManageShaareControllerTest/DisplayCreateFormTest.php
@@ -9,6 +9,7 @@ use Shaarli\Config\ConfigManager;
 use Shaarli\Front\Controller\Admin\FrontAdminControllerMockHelper;
 use Shaarli\Front\Controller\Admin\ManageShaareController;
 use Shaarli\Http\HttpAccess;
+use Shaarli\Http\MetadataRetriever;
 use Shaarli\TestCase;
 use Slim\Http\Request;
 use Slim\Http\Response;
@@ -25,6 +26,7 @@ class DisplayCreateFormTest extends TestCase
         $this->createContainer();
 
         $this->container->httpAccess = $this->createMock(HttpAccess::class);
+        $this->container->metadataRetriever = $this->createMock(MetadataRetriever::class);
         $this->controller = new ManageShaareController($this->container);
     }
 
@@ -32,7 +34,7 @@ class DisplayCreateFormTest extends TestCase
      * Test displaying bookmark create form
      * Ensure that every step of the standard workflow works properly.
      */
-    public function testDisplayCreateFormWithUrl(): void
+    public function testDisplayCreateFormWithUrlAndWithMetadataRetrieval(): void
     {
         $this->container->environment = [
             'HTTP_REFERER' => $referer = 'http://shaarli/subfolder/controller/?searchtag=abc'
@@ -53,40 +55,20 @@ class DisplayCreateFormTest extends TestCase
         });
         $response = new Response();
 
-        $this->container->httpAccess
-            ->expects(static::once())
-            ->method('getCurlDownloadCallback')
-            ->willReturnCallback(
-                function (&$charset, &$title, &$description, &$tags) use (
-                    $remoteTitle,
-                    $remoteDesc,
-                    $remoteTags
-                ): callable {
-                    return function () use (
-                        &$charset,
-                        &$title,
-                        &$description,
-                        &$tags,
-                        $remoteTitle,
-                        $remoteDesc,
-                        $remoteTags
-                    ): void {
-                        $charset = 'ISO-8859-1';
-                        $title = $remoteTitle;
-                        $description = $remoteDesc;
-                        $tags = $remoteTags;
-                    };
-                }
-            )
-        ;
-        $this->container->httpAccess
-            ->expects(static::once())
-            ->method('getHttpResponse')
-            ->with($expectedUrl, 30, 4194304)
-            ->willReturnCallback(function($url, $timeout, $maxBytes, $callback): void {
-                $callback();
-            })
-        ;
+        $this->container->conf = $this->createMock(ConfigManager::class);
+        $this->container->conf->method('get')->willReturnCallback(function (string $param, $default) {
+            if ($param === 'general.enable_async_metadata') {
+                return false;
+            }
+
+            return $default;
+        });
+
+        $this->container->metadataRetriever->expects(static::once())->method('retrieve')->willReturn([
+            'title' => $remoteTitle,
+            'description' => $remoteDesc,
+            'tags' => $remoteTags,
+        ]);
 
         $this->container->bookmarkService
             ->expects(static::once())
@@ -127,6 +109,72 @@ class DisplayCreateFormTest extends TestCase
         static::assertSame($tags, $assignedVariables['tags']);
         static::assertArrayHasKey('source', $assignedVariables);
         static::assertArrayHasKey('default_private_links', $assignedVariables);
+        static::assertArrayHasKey('async_metadata', $assignedVariables);
+        static::assertArrayHasKey('retrieve_description', $assignedVariables);
+    }
+
+    /**
+     * Test displaying bookmark create form without any external metadata retrieval attempt
+     */
+    public function testDisplayCreateFormWithUrlAndWithoutMetadata(): void
+    {
+        $this->container->environment = [
+            'HTTP_REFERER' => $referer = 'http://shaarli/subfolder/controller/?searchtag=abc'
+        ];
+
+        $assignedVariables = [];
+        $this->assignTemplateVars($assignedVariables);
+
+        $url = 'http://url.tld/other?part=3&utm_ad=pay#hash';
+        $expectedUrl = str_replace('&utm_ad=pay', '', $url);
+
+        $request = $this->createMock(Request::class);
+        $request->method('getParam')->willReturnCallback(function (string $key) use ($url): ?string {
+            return $key === 'post' ? $url : null;
+        });
+        $response = new Response();
+
+        $this->container->metadataRetriever->expects(static::never())->method('retrieve');
+
+        $this->container->bookmarkService
+            ->expects(static::once())
+            ->method('bookmarksCountPerTag')
+            ->willReturn($tags = ['tag1' => 2, 'tag2' => 1])
+        ;
+
+        // Make sure that PluginManager hook is triggered
+        $this->container->pluginManager
+            ->expects(static::at(0))
+            ->method('executeHooks')
+            ->willReturnCallback(function (string $hook, array $data): array {
+                static::assertSame('render_editlink', $hook);
+                static::assertSame('', $data['link']['title']);
+                static::assertSame('', $data['link']['description']);
+
+                return $data;
+            })
+        ;
+
+        $result = $this->controller->displayCreateForm($request, $response);
+
+        static::assertSame(200, $result->getStatusCode());
+        static::assertSame('editlink', (string) $result->getBody());
+
+        static::assertSame('Shaare - Shaarli', $assignedVariables['pagetitle']);
+
+        static::assertSame($expectedUrl, $assignedVariables['link']['url']);
+        static::assertSame('', $assignedVariables['link']['title']);
+        static::assertSame('', $assignedVariables['link']['description']);
+        static::assertSame('', $assignedVariables['link']['tags']);
+        static::assertFalse($assignedVariables['link']['private']);
+
+        static::assertTrue($assignedVariables['link_is_new']);
+        static::assertSame($referer, $assignedVariables['http_referer']);
+        static::assertSame($tags, $assignedVariables['tags']);
+        static::assertArrayHasKey('source', $assignedVariables);
+        static::assertArrayHasKey('default_private_links', $assignedVariables);
+        static::assertArrayHasKey('async_metadata', $assignedVariables);
+        static::assertArrayHasKey('retrieve_description', $assignedVariables);
     }
 
     /**
-- 
cgit v1.2.3


From 21e72da9ee34cec56b10c83ae0c75b4bf320dfcb Mon Sep 17 00:00:00 2001
From: ArthurHoaro <arthur@hoa.ro>
Date: Thu, 15 Oct 2020 11:46:24 +0200
Subject: Asynchronous retrieval of bookmark's thumbnails

This feature is based general.enable_async_metadata setting and works with existing metadata.js file.
The script is compatible with any template:
   - the thumbnail div bloc must have  attribute
   - the bookmark bloc must have  attribute with the bookmark ID as value

Fixes #1564
---
 .../DisplayCreateFormTest.php                      | 10 ++--
 .../SaveBookmarkTest.php                           | 55 +++++++++++++++++++++-
 2 files changed, 59 insertions(+), 6 deletions(-)

(limited to 'tests/front/controller/admin/ManageShaareControllerTest')

diff --git a/tests/front/controller/admin/ManageShaareControllerTest/DisplayCreateFormTest.php b/tests/front/controller/admin/ManageShaareControllerTest/DisplayCreateFormTest.php
index 4fd88480..eafa54eb 100644
--- a/tests/front/controller/admin/ManageShaareControllerTest/DisplayCreateFormTest.php
+++ b/tests/front/controller/admin/ManageShaareControllerTest/DisplayCreateFormTest.php
@@ -144,12 +144,14 @@ class DisplayCreateFormTest extends TestCase
 
         // Make sure that PluginManager hook is triggered
         $this->container->pluginManager
-            ->expects(static::at(0))
+            ->expects(static::atLeastOnce())
             ->method('executeHooks')
+            ->withConsecutive(['render_editlink'], ['render_includes'])
             ->willReturnCallback(function (string $hook, array $data): array {
-                static::assertSame('render_editlink', $hook);
-                static::assertSame('', $data['link']['title']);
-                static::assertSame('', $data['link']['description']);
+                if ('render_editlink' === $hook) {
+                    static::assertSame('', $data['link']['title']);
+                    static::assertSame('', $data['link']['description']);
+                }
 
                 return $data;
             })
diff --git a/tests/front/controller/admin/ManageShaareControllerTest/SaveBookmarkTest.php b/tests/front/controller/admin/ManageShaareControllerTest/SaveBookmarkTest.php
index 37542c26..1adeef5a 100644
--- a/tests/front/controller/admin/ManageShaareControllerTest/SaveBookmarkTest.php
+++ b/tests/front/controller/admin/ManageShaareControllerTest/SaveBookmarkTest.php
@@ -209,7 +209,7 @@ class SaveBookmarkTest extends TestCase
     /**
      * Test save a bookmark - try to retrieve the thumbnail
      */
-    public function testSaveBookmarkWithThumbnail(): void
+    public function testSaveBookmarkWithThumbnailSync(): void
     {
         $parameters = ['lf_url' => 'http://url.tld/other?part=3#hash'];
 
@@ -224,7 +224,13 @@ class SaveBookmarkTest extends TestCase
 
         $this->container->conf = $this->createMock(ConfigManager::class);
         $this->container->conf->method('get')->willReturnCallback(function (string $key, $default) {
-            return $key === 'thumbnails.mode' ? Thumbnailer::MODE_ALL : $default;
+            if ($key === 'thumbnails.mode') {
+                return Thumbnailer::MODE_ALL;
+            } elseif ($key === 'general.enable_async_metadata') {
+                return false;
+            }
+
+            return $default;
         });
 
         $this->container->thumbnailer = $this->createMock(Thumbnailer::class);
@@ -274,6 +280,51 @@ class SaveBookmarkTest extends TestCase
         static::assertSame(302, $result->getStatusCode());
     }
 
+    /**
+     * Test save a bookmark - do not attempt to retrieve thumbnails if async mode is enabled.
+     */
+    public function testSaveBookmarkWithThumbnailAsync(): void
+    {
+        $parameters = ['lf_url' => 'http://url.tld/other?part=3#hash'];
+
+        $request = $this->createMock(Request::class);
+        $request
+            ->method('getParam')
+            ->willReturnCallback(function (string $key) use ($parameters): ?string {
+                return $parameters[$key] ?? null;
+            })
+        ;
+        $response = new Response();
+
+        $this->container->conf = $this->createMock(ConfigManager::class);
+        $this->container->conf->method('get')->willReturnCallback(function (string $key, $default) {
+            if ($key === 'thumbnails.mode') {
+                return Thumbnailer::MODE_ALL;
+            } elseif ($key === 'general.enable_async_metadata') {
+                return true;
+            }
+
+            return $default;
+        });
+
+        $this->container->thumbnailer = $this->createMock(Thumbnailer::class);
+        $this->container->thumbnailer->expects(static::never())->method('get');
+
+        $this->container->bookmarkService
+            ->expects(static::once())
+            ->method('addOrSet')
+            ->willReturnCallback(function (Bookmark $bookmark): Bookmark {
+                static::assertNull($bookmark->getThumbnail());
+
+                return $bookmark;
+            })
+        ;
+
+        $result = $this->controller->save($request, $response);
+
+        static::assertSame(302, $result->getStatusCode());
+    }
+
     /**
      * Change the password with a wrong existing password
      */
-- 
cgit v1.2.3


From 9c04921a8c28c18ef757f2d43ba35e7e2a7f1a4b Mon Sep 17 00:00:00 2001
From: ArthurHoaro <arthur@hoa.ro>
Date: Fri, 16 Oct 2020 20:17:08 +0200
Subject: Feature: Share private bookmarks using a URL containing a private key
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

  - Add a share link next to « Permalink » in linklist (using share icon
from fork awesome)
  - This link generates a private key associated to the bookmark
  - Accessing the bookmark while logged out with the proper key will
display it

Fixes #475
---
 .../SharePrivateTest.php                           | 139 +++++++++++++++++++++
 1 file changed, 139 insertions(+)
 create mode 100644 tests/front/controller/admin/ManageShaareControllerTest/SharePrivateTest.php

(limited to 'tests/front/controller/admin/ManageShaareControllerTest')

diff --git a/tests/front/controller/admin/ManageShaareControllerTest/SharePrivateTest.php b/tests/front/controller/admin/ManageShaareControllerTest/SharePrivateTest.php
new file mode 100644
index 00000000..1e7877c7
--- /dev/null
+++ b/tests/front/controller/admin/ManageShaareControllerTest/SharePrivateTest.php
@@ -0,0 +1,139 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Shaarli\Front\Controller\Admin\ManageShaareControllerTest;
+
+use Shaarli\Bookmark\Bookmark;
+use Shaarli\Front\Controller\Admin\FrontAdminControllerMockHelper;
+use Shaarli\Front\Controller\Admin\ManageShaareController;
+use Shaarli\Http\HttpAccess;
+use Shaarli\TestCase;
+use Slim\Http\Request;
+use Slim\Http\Response;
+
+/**
+ * Test GET /admin/shaare/private/{hash}
+ */
+class SharePrivateTest extends TestCase
+{
+    use FrontAdminControllerMockHelper;
+
+    /** @var ManageShaareController */
+    protected $controller;
+
+    public function setUp(): void
+    {
+        $this->createContainer();
+
+        $this->container->httpAccess = $this->createMock(HttpAccess::class);
+        $this->controller = new ManageShaareController($this->container);
+    }
+
+    /**
+     * Test shaare private with a private bookmark which does not have a key yet.
+     */
+    public function testSharePrivateWithNewPrivateBookmark(): void
+    {
+        $hash = 'abcdcef';
+        $request = $this->createMock(Request::class);
+        $response = new Response();
+
+        $bookmark = (new Bookmark())
+            ->setId(123)
+            ->setUrl('http://domain.tld')
+            ->setTitle('Title 123')
+            ->setPrivate(true)
+        ;
+
+        $this->container->bookmarkService
+            ->expects(static::once())
+            ->method('findByHash')
+            ->with($hash)
+            ->willReturn($bookmark)
+        ;
+        $this->container->bookmarkService
+            ->expects(static::once())
+            ->method('set')
+            ->with($bookmark, true)
+            ->willReturnCallback(function (Bookmark $bookmark): Bookmark {
+                static::assertSame(32, strlen($bookmark->getAdditionalContentEntry('private_key')));
+
+                return $bookmark;
+            })
+        ;
+
+        $result = $this->controller->sharePrivate($request, $response, ['hash' => $hash]);
+
+        static::assertSame(302, $result->getStatusCode());
+        static::assertRegExp('#/subfolder/shaare/' . $hash . '\?key=\w{32}#', $result->getHeaderLine('Location'));
+    }
+
+    /**
+     * Test shaare private with a private bookmark which does already have a key.
+     */
+    public function testSharePrivateWithExistingPrivateBookmark(): void
+    {
+        $hash = 'abcdcef';
+        $existingKey = 'this is a private key';
+        $request = $this->createMock(Request::class);
+        $response = new Response();
+
+        $bookmark = (new Bookmark())
+            ->setId(123)
+            ->setUrl('http://domain.tld')
+            ->setTitle('Title 123')
+            ->setPrivate(true)
+            ->addAdditionalContentEntry('private_key', $existingKey)
+        ;
+
+        $this->container->bookmarkService
+            ->expects(static::once())
+            ->method('findByHash')
+            ->with($hash)
+            ->willReturn($bookmark)
+        ;
+        $this->container->bookmarkService
+            ->expects(static::never())
+            ->method('set')
+        ;
+
+        $result = $this->controller->sharePrivate($request, $response, ['hash' => $hash]);
+
+        static::assertSame(302, $result->getStatusCode());
+        static::assertSame('/subfolder/shaare/' . $hash . '?key=' . $existingKey, $result->getHeaderLine('Location'));
+    }
+
+    /**
+     * Test shaare private with a public bookmark.
+     */
+    public function testSharePrivateWithPublicBookmark(): void
+    {
+        $hash = 'abcdcef';
+        $request = $this->createMock(Request::class);
+        $response = new Response();
+
+        $bookmark = (new Bookmark())
+            ->setId(123)
+            ->setUrl('http://domain.tld')
+            ->setTitle('Title 123')
+            ->setPrivate(false)
+        ;
+
+        $this->container->bookmarkService
+            ->expects(static::once())
+            ->method('findByHash')
+            ->with($hash)
+            ->willReturn($bookmark)
+        ;
+        $this->container->bookmarkService
+            ->expects(static::never())
+            ->method('set')
+        ;
+
+        $result = $this->controller->sharePrivate($request, $response, ['hash' => $hash]);
+
+        static::assertSame(302, $result->getStatusCode());
+        static::assertSame('/subfolder/shaare/' . $hash, $result->getHeaderLine('Location'));
+    }
+}
-- 
cgit v1.2.3


From 5d8de7587d67b5c3e5d1fed8562d9b87ecde80c1 Mon Sep 17 00:00:00 2001
From: ArthurHoaro <arthur@hoa.ro>
Date: Sat, 10 Oct 2020 17:40:26 +0200
Subject: Feature: bulk creation of bookmarks

This changes creates a new form in addlink page allowing to create
multiple bookmarks at once more easily. It focuses on re-using as much
existing code and template component as  possible.

These changes includes:
  - a new form in addlink (hidden behind a button by default),
containing a text area for URL, and tags/private status to apply to
created links
  - this form displays a new template called editlink.batch, itself
including editlink template multiple times
  - User interation in this new templates are handle by a new JS script
(shaare-batch.js) making AJAX requests, and therefore does not need page
reloading
  - ManageShaareController has been split into 3 distinct controllers:
    + ShaareAdd: displays addlink template
    + ShaareManage: various operation applied on existing shaares
(change visibility, pin, deletion, etc.)
    + ShaarePublish: handles creation/edit forms and saving Shaare's
form
  - Updated translations

Fixes #137
---
 .../ManageShaareControllerTest/AddShaareTest.php   |  47 ---
 .../ChangeVisibilityBookmarkTest.php               | 418 ---------------------
 .../DeleteBookmarkTest.php                         | 380 -------------------
 .../DisplayCreateFormTest.php                      | 367 ------------------
 .../DisplayEditFormTest.php                        | 155 --------
 .../ManageShaareControllerTest/PinBookmarkTest.php | 145 -------
 .../SaveBookmarkTest.php                           | 369 ------------------
 .../SharePrivateTest.php                           | 139 -------
 8 files changed, 2020 deletions(-)
 delete mode 100644 tests/front/controller/admin/ManageShaareControllerTest/AddShaareTest.php
 delete mode 100644 tests/front/controller/admin/ManageShaareControllerTest/ChangeVisibilityBookmarkTest.php
 delete mode 100644 tests/front/controller/admin/ManageShaareControllerTest/DeleteBookmarkTest.php
 delete mode 100644 tests/front/controller/admin/ManageShaareControllerTest/DisplayCreateFormTest.php
 delete mode 100644 tests/front/controller/admin/ManageShaareControllerTest/DisplayEditFormTest.php
 delete mode 100644 tests/front/controller/admin/ManageShaareControllerTest/PinBookmarkTest.php
 delete mode 100644 tests/front/controller/admin/ManageShaareControllerTest/SaveBookmarkTest.php
 delete mode 100644 tests/front/controller/admin/ManageShaareControllerTest/SharePrivateTest.php

(limited to 'tests/front/controller/admin/ManageShaareControllerTest')

diff --git a/tests/front/controller/admin/ManageShaareControllerTest/AddShaareTest.php b/tests/front/controller/admin/ManageShaareControllerTest/AddShaareTest.php
deleted file mode 100644
index 0f27ec2f..00000000
--- a/tests/front/controller/admin/ManageShaareControllerTest/AddShaareTest.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Shaarli\Front\Controller\Admin\ManageShaareControllerTest;
-
-use Shaarli\Front\Controller\Admin\FrontAdminControllerMockHelper;
-use Shaarli\Front\Controller\Admin\ManageShaareController;
-use Shaarli\Http\HttpAccess;
-use Shaarli\TestCase;
-use Slim\Http\Request;
-use Slim\Http\Response;
-
-class AddShaareTest extends TestCase
-{
-    use FrontAdminControllerMockHelper;
-
-    /** @var ManageShaareController */
-    protected $controller;
-
-    public function setUp(): void
-    {
-        $this->createContainer();
-
-        $this->container->httpAccess = $this->createMock(HttpAccess::class);
-        $this->controller = new ManageShaareController($this->container);
-    }
-
-    /**
-     * Test displaying add link page
-     */
-    public function testAddShaare(): void
-    {
-        $assignedVariables = [];
-        $this->assignTemplateVars($assignedVariables);
-
-        $request = $this->createMock(Request::class);
-        $response = new Response();
-
-        $result = $this->controller->addShaare($request, $response);
-
-        static::assertSame(200, $result->getStatusCode());
-        static::assertSame('addlink', (string) $result->getBody());
-
-        static::assertSame('Shaare a new link - Shaarli', $assignedVariables['pagetitle']);
-    }
-}
diff --git a/tests/front/controller/admin/ManageShaareControllerTest/ChangeVisibilityBookmarkTest.php b/tests/front/controller/admin/ManageShaareControllerTest/ChangeVisibilityBookmarkTest.php
deleted file mode 100644
index 096d0774..00000000
--- a/tests/front/controller/admin/ManageShaareControllerTest/ChangeVisibilityBookmarkTest.php
+++ /dev/null
@@ -1,418 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Shaarli\Front\Controller\Admin\ManageShaareControllerTest;
-
-use Shaarli\Bookmark\Bookmark;
-use Shaarli\Bookmark\Exception\BookmarkNotFoundException;
-use Shaarli\Formatter\BookmarkFormatter;
-use Shaarli\Formatter\BookmarkRawFormatter;
-use Shaarli\Formatter\FormatterFactory;
-use Shaarli\Front\Controller\Admin\FrontAdminControllerMockHelper;
-use Shaarli\Front\Controller\Admin\ManageShaareController;
-use Shaarli\Http\HttpAccess;
-use Shaarli\Security\SessionManager;
-use Shaarli\TestCase;
-use Slim\Http\Request;
-use Slim\Http\Response;
-
-class ChangeVisibilityBookmarkTest extends TestCase
-{
-    use FrontAdminControllerMockHelper;
-
-    /** @var ManageShaareController */
-    protected $controller;
-
-    public function setUp(): void
-    {
-        $this->createContainer();
-
-        $this->container->httpAccess = $this->createMock(HttpAccess::class);
-        $this->controller = new ManageShaareController($this->container);
-    }
-
-    /**
-     * Change bookmark visibility - Set private - Single public bookmark with valid parameters
-     */
-    public function testSetSingleBookmarkPrivate(): void
-    {
-        $parameters = ['id' => '123', 'newVisibility' => 'private'];
-
-        $request = $this->createMock(Request::class);
-        $request
-            ->method('getParam')
-            ->willReturnCallback(function (string $key) use ($parameters): ?string {
-                return $parameters[$key] ?? null;
-            })
-        ;
-        $response = new Response();
-
-        $bookmark = (new Bookmark())->setId(123)->setUrl('http://domain.tld')->setTitle('Title 123')->setPrivate(false);
-
-        static::assertFalse($bookmark->isPrivate());
-
-        $this->container->bookmarkService->expects(static::once())->method('get')->with(123)->willReturn($bookmark);
-        $this->container->bookmarkService->expects(static::once())->method('set')->with($bookmark, false);
-        $this->container->bookmarkService->expects(static::once())->method('save');
-        $this->container->formatterFactory = $this->createMock(FormatterFactory::class);
-        $this->container->formatterFactory
-            ->expects(static::once())
-            ->method('getFormatter')
-            ->with('raw')
-            ->willReturnCallback(function () use ($bookmark): BookmarkFormatter {
-                return new BookmarkRawFormatter($this->container->conf, true);
-            })
-        ;
-
-        // Make sure that PluginManager hook is triggered
-        $this->container->pluginManager
-            ->expects(static::once())
-            ->method('executeHooks')
-            ->with('save_link')
-        ;
-
-        $result = $this->controller->changeVisibility($request, $response);
-
-        static::assertTrue($bookmark->isPrivate());
-
-        static::assertSame(302, $result->getStatusCode());
-        static::assertSame(['/subfolder/'], $result->getHeader('location'));
-    }
-
-    /**
-     * Change bookmark visibility - Set public - Single private bookmark with valid parameters
-     */
-    public function testSetSingleBookmarkPublic(): void
-    {
-        $parameters = ['id' => '123', 'newVisibility' => 'public'];
-
-        $request = $this->createMock(Request::class);
-        $request
-            ->method('getParam')
-            ->willReturnCallback(function (string $key) use ($parameters): ?string {
-                return $parameters[$key] ?? null;
-            })
-        ;
-        $response = new Response();
-
-        $bookmark = (new Bookmark())->setId(123)->setUrl('http://domain.tld')->setTitle('Title 123')->setPrivate(true);
-
-        static::assertTrue($bookmark->isPrivate());
-
-        $this->container->bookmarkService->expects(static::once())->method('get')->with(123)->willReturn($bookmark);
-        $this->container->bookmarkService->expects(static::once())->method('set')->with($bookmark, false);
-        $this->container->bookmarkService->expects(static::once())->method('save');
-        $this->container->formatterFactory = $this->createMock(FormatterFactory::class);
-        $this->container->formatterFactory
-            ->expects(static::once())
-            ->method('getFormatter')
-            ->with('raw')
-            ->willReturn(new BookmarkRawFormatter($this->container->conf, true))
-        ;
-
-        // Make sure that PluginManager hook is triggered
-        $this->container->pluginManager
-            ->expects(static::once())
-            ->method('executeHooks')
-            ->with('save_link')
-        ;
-
-        $result = $this->controller->changeVisibility($request, $response);
-
-        static::assertFalse($bookmark->isPrivate());
-
-        static::assertSame(302, $result->getStatusCode());
-        static::assertSame(['/subfolder/'], $result->getHeader('location'));
-    }
-
-    /**
-     * Change bookmark visibility - Set private on single already private bookmark
-     */
-    public function testSetSinglePrivateBookmarkPrivate(): void
-    {
-        $parameters = ['id' => '123', 'newVisibility' => 'private'];
-
-        $request = $this->createMock(Request::class);
-        $request
-            ->method('getParam')
-            ->willReturnCallback(function (string $key) use ($parameters): ?string {
-                return $parameters[$key] ?? null;
-            })
-        ;
-        $response = new Response();
-
-        $bookmark = (new Bookmark())->setId(123)->setUrl('http://domain.tld')->setTitle('Title 123')->setPrivate(true);
-
-        static::assertTrue($bookmark->isPrivate());
-
-        $this->container->bookmarkService->expects(static::once())->method('get')->with(123)->willReturn($bookmark);
-        $this->container->bookmarkService->expects(static::once())->method('set')->with($bookmark, false);
-        $this->container->bookmarkService->expects(static::once())->method('save');
-        $this->container->formatterFactory = $this->createMock(FormatterFactory::class);
-        $this->container->formatterFactory
-            ->expects(static::once())
-            ->method('getFormatter')
-            ->with('raw')
-            ->willReturn(new BookmarkRawFormatter($this->container->conf, true))
-        ;
-
-        // Make sure that PluginManager hook is triggered
-        $this->container->pluginManager
-            ->expects(static::once())
-            ->method('executeHooks')
-            ->with('save_link')
-        ;
-
-        $result = $this->controller->changeVisibility($request, $response);
-
-        static::assertTrue($bookmark->isPrivate());
-
-        static::assertSame(302, $result->getStatusCode());
-        static::assertSame(['/subfolder/'], $result->getHeader('location'));
-    }
-
-    /**
-     * Change bookmark visibility - Set multiple bookmarks private
-     */
-    public function testSetMultipleBookmarksPrivate(): void
-    {
-        $parameters = ['id' => '123 456 789', 'newVisibility' => 'private'];
-
-        $request = $this->createMock(Request::class);
-        $request
-            ->method('getParam')
-            ->willReturnCallback(function (string $key) use ($parameters): ?string {
-                return $parameters[$key] ?? null;
-            })
-        ;
-        $response = new Response();
-
-        $bookmarks = [
-            (new Bookmark())->setId(123)->setUrl('http://domain.tld')->setTitle('Title 123')->setPrivate(false),
-            (new Bookmark())->setId(456)->setUrl('http://domain.tld')->setTitle('Title 456')->setPrivate(true),
-            (new Bookmark())->setId(789)->setUrl('http://domain.tld')->setTitle('Title 789')->setPrivate(false),
-        ];
-
-        $this->container->bookmarkService
-            ->expects(static::exactly(3))
-            ->method('get')
-            ->withConsecutive([123], [456], [789])
-            ->willReturnOnConsecutiveCalls(...$bookmarks)
-        ;
-        $this->container->bookmarkService
-            ->expects(static::exactly(3))
-            ->method('set')
-            ->withConsecutive(...array_map(function (Bookmark $bookmark): array {
-                return [$bookmark, false];
-            }, $bookmarks))
-        ;
-        $this->container->bookmarkService->expects(static::once())->method('save');
-        $this->container->formatterFactory = $this->createMock(FormatterFactory::class);
-        $this->container->formatterFactory
-            ->expects(static::once())
-            ->method('getFormatter')
-            ->with('raw')
-            ->willReturn(new BookmarkRawFormatter($this->container->conf, true))
-        ;
-
-        // Make sure that PluginManager hook is triggered
-        $this->container->pluginManager
-            ->expects(static::exactly(3))
-            ->method('executeHooks')
-            ->with('save_link')
-        ;
-
-        $result = $this->controller->changeVisibility($request, $response);
-
-        static::assertTrue($bookmarks[0]->isPrivate());
-        static::assertTrue($bookmarks[1]->isPrivate());
-        static::assertTrue($bookmarks[2]->isPrivate());
-
-        static::assertSame(302, $result->getStatusCode());
-        static::assertSame(['/subfolder/'], $result->getHeader('location'));
-    }
-
-    /**
-     * Change bookmark visibility - Single bookmark not found.
-     */
-    public function testChangeVisibilitySingleBookmarkNotFound(): void
-    {
-        $parameters = ['id' => '123', 'newVisibility' => 'private'];
-
-        $request = $this->createMock(Request::class);
-        $request
-            ->method('getParam')
-            ->willReturnCallback(function (string $key) use ($parameters): ?string {
-                return $parameters[$key] ?? null;
-            })
-        ;
-        $response = new Response();
-
-        $this->container->bookmarkService
-            ->expects(static::once())
-            ->method('get')
-            ->willThrowException(new BookmarkNotFoundException())
-        ;
-        $this->container->bookmarkService->expects(static::never())->method('set');
-        $this->container->bookmarkService->expects(static::never())->method('save');
-        $this->container->formatterFactory = $this->createMock(FormatterFactory::class);
-        $this->container->formatterFactory
-            ->expects(static::once())
-            ->method('getFormatter')
-            ->with('raw')
-            ->willReturn(new BookmarkRawFormatter($this->container->conf, true))
-        ;
-
-        // Make sure that PluginManager hook is not triggered
-        $this->container->pluginManager
-            ->expects(static::never())
-            ->method('executeHooks')
-            ->with('save_link')
-        ;
-
-        $result = $this->controller->changeVisibility($request, $response);
-
-        static::assertSame(302, $result->getStatusCode());
-        static::assertSame(['/subfolder/'], $result->getHeader('location'));
-    }
-
-    /**
-     * Change bookmark visibility - Multiple bookmarks with one not found.
-     */
-    public function testChangeVisibilityMultipleBookmarksOneNotFound(): void
-    {
-        $parameters = ['id' => '123 456 789', 'newVisibility' => 'public'];
-
-        $request = $this->createMock(Request::class);
-        $request
-            ->method('getParam')
-            ->willReturnCallback(function (string $key) use ($parameters): ?string {
-                return $parameters[$key] ?? null;
-            })
-        ;
-        $response = new Response();
-
-        $bookmarks = [
-            (new Bookmark())->setId(123)->setUrl('http://domain.tld')->setTitle('Title 123')->setPrivate(true),
-            (new Bookmark())->setId(789)->setUrl('http://domain.tld')->setTitle('Title 789')->setPrivate(false),
-        ];
-
-        $this->container->bookmarkService
-            ->expects(static::exactly(3))
-            ->method('get')
-            ->withConsecutive([123], [456], [789])
-            ->willReturnCallback(function (int $id) use ($bookmarks): Bookmark {
-                if ($id === 123) {
-                    return $bookmarks[0];
-                }
-                if ($id === 789) {
-                    return $bookmarks[1];
-                }
-                throw new BookmarkNotFoundException();
-            })
-        ;
-        $this->container->bookmarkService
-            ->expects(static::exactly(2))
-            ->method('set')
-            ->withConsecutive(...array_map(function (Bookmark $bookmark): array {
-                return [$bookmark, false];
-            }, $bookmarks))
-        ;
-        $this->container->bookmarkService->expects(static::once())->method('save');
-
-        // Make sure that PluginManager hook is not triggered
-        $this->container->pluginManager
-            ->expects(static::exactly(2))
-            ->method('executeHooks')
-            ->with('save_link')
-        ;
-
-        $this->container->sessionManager
-            ->expects(static::once())
-            ->method('setSessionParameter')
-            ->with(SessionManager::KEY_ERROR_MESSAGES, ['Bookmark with identifier 456 could not be found.'])
-        ;
-
-        $result = $this->controller->changeVisibility($request, $response);
-
-        static::assertSame(302, $result->getStatusCode());
-        static::assertSame(['/subfolder/'], $result->getHeader('location'));
-    }
-
-    /**
-     * Change bookmark visibility - Invalid ID
-     */
-    public function testChangeVisibilityInvalidId(): void
-    {
-        $parameters = ['id' => 'nope not an ID', 'newVisibility' => 'private'];
-
-        $request = $this->createMock(Request::class);
-        $request
-            ->method('getParam')
-            ->willReturnCallback(function (string $key) use ($parameters): ?string {
-                return $parameters[$key] ?? null;
-            })
-        ;
-        $response = new Response();
-
-        $this->container->sessionManager
-            ->expects(static::once())
-            ->method('setSessionParameter')
-            ->with(SessionManager::KEY_ERROR_MESSAGES, ['Invalid bookmark ID provided.'])
-        ;
-
-        $result = $this->controller->changeVisibility($request, $response);
-
-        static::assertSame(302, $result->getStatusCode());
-        static::assertSame(['/subfolder/'], $result->getHeader('location'));
-    }
-
-    /**
-     * Change bookmark visibility - Empty ID
-     */
-    public function testChangeVisibilityEmptyId(): void
-    {
-        $request = $this->createMock(Request::class);
-        $response = new Response();
-
-        $this->container->sessionManager
-            ->expects(static::once())
-            ->method('setSessionParameter')
-            ->with(SessionManager::KEY_ERROR_MESSAGES, ['Invalid bookmark ID provided.'])
-        ;
-
-        $result = $this->controller->changeVisibility($request, $response);
-
-        static::assertSame(302, $result->getStatusCode());
-        static::assertSame(['/subfolder/'], $result->getHeader('location'));
-    }
-
-    /**
-     * Change bookmark visibility - with invalid visibility
-     */
-    public function testChangeVisibilityWithInvalidVisibility(): void
-    {
-        $parameters = ['id' => '123', 'newVisibility' => 'invalid'];
-
-        $request = $this->createMock(Request::class);
-        $request
-            ->method('getParam')
-            ->willReturnCallback(function (string $key) use ($parameters): ?string {
-                return $parameters[$key] ?? null;
-            })
-        ;
-        $response = new Response();
-
-        $this->container->sessionManager
-            ->expects(static::once())
-            ->method('setSessionParameter')
-            ->with(SessionManager::KEY_ERROR_MESSAGES, ['Invalid visibility provided.'])
-        ;
-
-        $result = $this->controller->changeVisibility($request, $response);
-
-        static::assertSame(302, $result->getStatusCode());
-        static::assertSame(['/subfolder/'], $result->getHeader('location'));
-    }
-}
diff --git a/tests/front/controller/admin/ManageShaareControllerTest/DeleteBookmarkTest.php b/tests/front/controller/admin/ManageShaareControllerTest/DeleteBookmarkTest.php
deleted file mode 100644
index 83bbee7c..00000000
--- a/tests/front/controller/admin/ManageShaareControllerTest/DeleteBookmarkTest.php
+++ /dev/null
@@ -1,380 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Shaarli\Front\Controller\Admin\ManageShaareControllerTest;
-
-use Shaarli\Bookmark\Bookmark;
-use Shaarli\Bookmark\Exception\BookmarkNotFoundException;
-use Shaarli\Formatter\BookmarkFormatter;
-use Shaarli\Formatter\FormatterFactory;
-use Shaarli\Front\Controller\Admin\FrontAdminControllerMockHelper;
-use Shaarli\Front\Controller\Admin\ManageShaareController;
-use Shaarli\Http\HttpAccess;
-use Shaarli\Security\SessionManager;
-use Shaarli\TestCase;
-use Slim\Http\Request;
-use Slim\Http\Response;
-
-class DeleteBookmarkTest extends TestCase
-{
-    use FrontAdminControllerMockHelper;
-
-    /** @var ManageShaareController */
-    protected $controller;
-
-    public function setUp(): void
-    {
-        $this->createContainer();
-
-        $this->container->httpAccess = $this->createMock(HttpAccess::class);
-        $this->controller = new ManageShaareController($this->container);
-    }
-
-    /**
-     * Delete bookmark - Single bookmark with valid parameters
-     */
-    public function testDeleteSingleBookmark(): void
-    {
-        $parameters = ['id' => '123'];
-
-        $request = $this->createMock(Request::class);
-        $request
-            ->method('getParam')
-            ->willReturnCallback(function (string $key) use ($parameters): ?string {
-                return $parameters[$key] ?? null;
-            })
-        ;
-        $response = new Response();
-
-        $bookmark = (new Bookmark())->setId(123)->setUrl('http://domain.tld')->setTitle('Title 123');
-
-        $this->container->bookmarkService->expects(static::once())->method('get')->with(123)->willReturn($bookmark);
-        $this->container->bookmarkService->expects(static::once())->method('remove')->with($bookmark, false);
-        $this->container->bookmarkService->expects(static::once())->method('save');
-        $this->container->formatterFactory = $this->createMock(FormatterFactory::class);
-        $this->container->formatterFactory
-            ->expects(static::once())
-            ->method('getFormatter')
-            ->with('raw')
-            ->willReturnCallback(function () use ($bookmark): BookmarkFormatter {
-                $formatter = $this->createMock(BookmarkFormatter::class);
-                $formatter
-                    ->expects(static::once())
-                    ->method('format')
-                    ->with($bookmark)
-                    ->willReturn(['formatted' => $bookmark])
-                ;
-
-                return $formatter;
-            })
-        ;
-
-        // Make sure that PluginManager hook is triggered
-        $this->container->pluginManager
-            ->expects(static::once())
-            ->method('executeHooks')
-            ->with('delete_link', ['formatted' => $bookmark])
-        ;
-
-        $result = $this->controller->deleteBookmark($request, $response);
-
-        static::assertSame(302, $result->getStatusCode());
-        static::assertSame(['/subfolder/'], $result->getHeader('location'));
-    }
-
-    /**
-     * Delete bookmark - Multiple bookmarks with valid parameters
-     */
-    public function testDeleteMultipleBookmarks(): void
-    {
-        $parameters = ['id' => '123 456 789'];
-
-        $request = $this->createMock(Request::class);
-        $request
-            ->method('getParam')
-            ->willReturnCallback(function (string $key) use ($parameters): ?string {
-                return $parameters[$key] ?? null;
-            })
-        ;
-        $response = new Response();
-
-        $bookmarks = [
-            (new Bookmark())->setId(123)->setUrl('http://domain.tld')->setTitle('Title 123'),
-            (new Bookmark())->setId(456)->setUrl('http://domain.tld')->setTitle('Title 456'),
-            (new Bookmark())->setId(789)->setUrl('http://domain.tld')->setTitle('Title 789'),
-        ];
-
-        $this->container->bookmarkService
-            ->expects(static::exactly(3))
-            ->method('get')
-            ->withConsecutive([123], [456], [789])
-            ->willReturnOnConsecutiveCalls(...$bookmarks)
-        ;
-        $this->container->bookmarkService
-            ->expects(static::exactly(3))
-            ->method('remove')
-            ->withConsecutive(...array_map(function (Bookmark $bookmark): array {
-                return [$bookmark, false];
-            }, $bookmarks))
-        ;
-        $this->container->bookmarkService->expects(static::once())->method('save');
-        $this->container->formatterFactory = $this->createMock(FormatterFactory::class);
-        $this->container->formatterFactory
-            ->expects(static::once())
-            ->method('getFormatter')
-            ->with('raw')
-            ->willReturnCallback(function () use ($bookmarks): BookmarkFormatter {
-                $formatter = $this->createMock(BookmarkFormatter::class);
-
-                $formatter
-                    ->expects(static::exactly(3))
-                    ->method('format')
-                    ->withConsecutive(...array_map(function (Bookmark $bookmark): array {
-                        return [$bookmark];
-                    }, $bookmarks))
-                    ->willReturnOnConsecutiveCalls(...array_map(function (Bookmark $bookmark): array {
-                        return ['formatted' => $bookmark];
-                    }, $bookmarks))
-                ;
-
-                return $formatter;
-            })
-        ;
-
-        // Make sure that PluginManager hook is triggered
-        $this->container->pluginManager
-            ->expects(static::exactly(3))
-            ->method('executeHooks')
-            ->with('delete_link')
-        ;
-
-        $result = $this->controller->deleteBookmark($request, $response);
-
-        static::assertSame(302, $result->getStatusCode());
-        static::assertSame(['/subfolder/'], $result->getHeader('location'));
-    }
-
-    /**
-     * Delete bookmark - Single bookmark not found in the data store
-     */
-    public function testDeleteSingleBookmarkNotFound(): void
-    {
-        $parameters = ['id' => '123'];
-
-        $request = $this->createMock(Request::class);
-        $request
-            ->method('getParam')
-            ->willReturnCallback(function (string $key) use ($parameters): ?string {
-                return $parameters[$key] ?? null;
-            })
-        ;
-        $response = new Response();
-
-        $this->container->bookmarkService
-            ->expects(static::once())
-            ->method('get')
-            ->willThrowException(new BookmarkNotFoundException())
-        ;
-        $this->container->bookmarkService->expects(static::never())->method('remove');
-        $this->container->bookmarkService->expects(static::never())->method('save');
-        $this->container->formatterFactory = $this->createMock(FormatterFactory::class);
-        $this->container->formatterFactory
-            ->expects(static::once())
-            ->method('getFormatter')
-            ->with('raw')
-            ->willReturnCallback(function (): BookmarkFormatter {
-                $formatter = $this->createMock(BookmarkFormatter::class);
-
-                $formatter->expects(static::never())->method('format');
-
-                return $formatter;
-            })
-        ;
-        // Make sure that PluginManager hook is not triggered
-        $this->container->pluginManager
-            ->expects(static::never())
-            ->method('executeHooks')
-            ->with('delete_link')
-        ;
-
-        $result = $this->controller->deleteBookmark($request, $response);
-
-        static::assertSame(302, $result->getStatusCode());
-        static::assertSame(['/subfolder/'], $result->getHeader('location'));
-    }
-
-    /**
-     * Delete bookmark - Multiple bookmarks with one not found in the data store
-     */
-    public function testDeleteMultipleBookmarksOneNotFound(): void
-    {
-        $parameters = ['id' => '123 456 789'];
-
-        $request = $this->createMock(Request::class);
-        $request
-            ->method('getParam')
-            ->willReturnCallback(function (string $key) use ($parameters): ?string {
-                return $parameters[$key] ?? null;
-            })
-        ;
-        $response = new Response();
-
-        $bookmarks = [
-            (new Bookmark())->setId(123)->setUrl('http://domain.tld')->setTitle('Title 123'),
-            (new Bookmark())->setId(789)->setUrl('http://domain.tld')->setTitle('Title 789'),
-        ];
-
-        $this->container->bookmarkService
-            ->expects(static::exactly(3))
-            ->method('get')
-            ->withConsecutive([123], [456], [789])
-            ->willReturnCallback(function (int $id) use ($bookmarks): Bookmark {
-                if ($id === 123) {
-                    return $bookmarks[0];
-                }
-                if ($id === 789) {
-                    return $bookmarks[1];
-                }
-                throw new BookmarkNotFoundException();
-            })
-        ;
-        $this->container->bookmarkService
-            ->expects(static::exactly(2))
-            ->method('remove')
-            ->withConsecutive(...array_map(function (Bookmark $bookmark): array {
-                return [$bookmark, false];
-            }, $bookmarks))
-        ;
-        $this->container->bookmarkService->expects(static::once())->method('save');
-        $this->container->formatterFactory = $this->createMock(FormatterFactory::class);
-        $this->container->formatterFactory
-            ->expects(static::once())
-            ->method('getFormatter')
-            ->with('raw')
-            ->willReturnCallback(function () use ($bookmarks): BookmarkFormatter {
-                $formatter = $this->createMock(BookmarkFormatter::class);
-
-                $formatter
-                    ->expects(static::exactly(2))
-                    ->method('format')
-                    ->withConsecutive(...array_map(function (Bookmark $bookmark): array {
-                        return [$bookmark];
-                    }, $bookmarks))
-                    ->willReturnOnConsecutiveCalls(...array_map(function (Bookmark $bookmark): array {
-                        return ['formatted' => $bookmark];
-                    }, $bookmarks))
-                ;
-
-                return $formatter;
-            })
-        ;
-
-        // Make sure that PluginManager hook is not triggered
-        $this->container->pluginManager
-            ->expects(static::exactly(2))
-            ->method('executeHooks')
-            ->with('delete_link')
-        ;
-
-        $this->container->sessionManager
-            ->expects(static::once())
-            ->method('setSessionParameter')
-            ->with(SessionManager::KEY_ERROR_MESSAGES, ['Bookmark with identifier 456 could not be found.'])
-        ;
-
-        $result = $this->controller->deleteBookmark($request, $response);
-
-        static::assertSame(302, $result->getStatusCode());
-        static::assertSame(['/subfolder/'], $result->getHeader('location'));
-    }
-
-    /**
-     * Delete bookmark - Invalid ID
-     */
-    public function testDeleteInvalidId(): void
-    {
-        $parameters = ['id' => 'nope not an ID'];
-
-        $request = $this->createMock(Request::class);
-        $request
-            ->method('getParam')
-            ->willReturnCallback(function (string $key) use ($parameters): ?string {
-                return $parameters[$key] ?? null;
-            })
-        ;
-        $response = new Response();
-
-        $this->container->sessionManager
-            ->expects(static::once())
-            ->method('setSessionParameter')
-            ->with(SessionManager::KEY_ERROR_MESSAGES, ['Invalid bookmark ID provided.'])
-        ;
-
-        $result = $this->controller->deleteBookmark($request, $response);
-
-        static::assertSame(302, $result->getStatusCode());
-        static::assertSame(['/subfolder/'], $result->getHeader('location'));
-    }
-
-    /**
-     * Delete bookmark - Empty ID
-     */
-    public function testDeleteEmptyId(): void
-    {
-        $request = $this->createMock(Request::class);
-        $response = new Response();
-
-        $this->container->sessionManager
-            ->expects(static::once())
-            ->method('setSessionParameter')
-            ->with(SessionManager::KEY_ERROR_MESSAGES, ['Invalid bookmark ID provided.'])
-        ;
-
-        $result = $this->controller->deleteBookmark($request, $response);
-
-        static::assertSame(302, $result->getStatusCode());
-        static::assertSame(['/subfolder/'], $result->getHeader('location'));
-    }
-
-    /**
-     * Delete bookmark - from bookmarklet
-     */
-    public function testDeleteBookmarkFromBookmarklet(): void
-    {
-        $parameters = [
-            'id' => '123',
-            'source' => 'bookmarklet',
-        ];
-
-        $request = $this->createMock(Request::class);
-        $request
-            ->method('getParam')
-            ->willReturnCallback(function (string $key) use ($parameters): ?string {
-                return $parameters[$key] ?? null;
-            })
-        ;
-        $response = new Response();
-
-        $this->container->bookmarkService->method('get')->with('123')->willReturn(
-            (new Bookmark())->setId(123)->setUrl('http://domain.tld')->setTitle('Title 123')
-        );
-
-        $this->container->formatterFactory = $this->createMock(FormatterFactory::class);
-        $this->container->formatterFactory
-            ->expects(static::once())
-            ->method('getFormatter')
-            ->willReturnCallback(function (): BookmarkFormatter {
-                $formatter = $this->createMock(BookmarkFormatter::class);
-                $formatter->method('format')->willReturn(['formatted']);
-
-                return $formatter;
-            })
-        ;
-
-        $result = $this->controller->deleteBookmark($request, $response);
-
-        static::assertSame(200, $result->getStatusCode());
-        static::assertSame('<script>self.close();</script>', (string) $result->getBody('location'));
-    }
-}
diff --git a/tests/front/controller/admin/ManageShaareControllerTest/DisplayCreateFormTest.php b/tests/front/controller/admin/ManageShaareControllerTest/DisplayCreateFormTest.php
deleted file mode 100644
index eafa54eb..00000000
--- a/tests/front/controller/admin/ManageShaareControllerTest/DisplayCreateFormTest.php
+++ /dev/null
@@ -1,367 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Shaarli\Front\Controller\Admin\ManageShaareControllerTest;
-
-use Shaarli\Bookmark\Bookmark;
-use Shaarli\Config\ConfigManager;
-use Shaarli\Front\Controller\Admin\FrontAdminControllerMockHelper;
-use Shaarli\Front\Controller\Admin\ManageShaareController;
-use Shaarli\Http\HttpAccess;
-use Shaarli\Http\MetadataRetriever;
-use Shaarli\TestCase;
-use Slim\Http\Request;
-use Slim\Http\Response;
-
-class DisplayCreateFormTest extends TestCase
-{
-    use FrontAdminControllerMockHelper;
-
-    /** @var ManageShaareController */
-    protected $controller;
-
-    public function setUp(): void
-    {
-        $this->createContainer();
-
-        $this->container->httpAccess = $this->createMock(HttpAccess::class);
-        $this->container->metadataRetriever = $this->createMock(MetadataRetriever::class);
-        $this->controller = new ManageShaareController($this->container);
-    }
-
-    /**
-     * Test displaying bookmark create form
-     * Ensure that every step of the standard workflow works properly.
-     */
-    public function testDisplayCreateFormWithUrlAndWithMetadataRetrieval(): void
-    {
-        $this->container->environment = [
-            'HTTP_REFERER' => $referer = 'http://shaarli/subfolder/controller/?searchtag=abc'
-        ];
-
-        $assignedVariables = [];
-        $this->assignTemplateVars($assignedVariables);
-
-        $url = 'http://url.tld/other?part=3&utm_ad=pay#hash';
-        $expectedUrl = str_replace('&utm_ad=pay', '', $url);
-        $remoteTitle = 'Remote Title';
-        $remoteDesc = 'Sometimes the meta description is relevant.';
-        $remoteTags = 'abc def';
-
-        $request = $this->createMock(Request::class);
-        $request->method('getParam')->willReturnCallback(function (string $key) use ($url): ?string {
-            return $key === 'post' ? $url : null;
-        });
-        $response = new Response();
-
-        $this->container->conf = $this->createMock(ConfigManager::class);
-        $this->container->conf->method('get')->willReturnCallback(function (string $param, $default) {
-            if ($param === 'general.enable_async_metadata') {
-                return false;
-            }
-
-            return $default;
-        });
-
-        $this->container->metadataRetriever->expects(static::once())->method('retrieve')->willReturn([
-            'title' => $remoteTitle,
-            'description' => $remoteDesc,
-            'tags' => $remoteTags,
-        ]);
-
-        $this->container->bookmarkService
-            ->expects(static::once())
-            ->method('bookmarksCountPerTag')
-            ->willReturn($tags = ['tag1' => 2, 'tag2' => 1])
-        ;
-
-        // Make sure that PluginManager hook is triggered
-        $this->container->pluginManager
-            ->expects(static::atLeastOnce())
-            ->method('executeHooks')
-            ->withConsecutive(['render_editlink'], ['render_includes'])
-            ->willReturnCallback(function (string $hook, array $data) use ($remoteTitle, $remoteDesc): array {
-                if ('render_editlink' === $hook) {
-                    static::assertSame($remoteTitle, $data['link']['title']);
-                    static::assertSame($remoteDesc, $data['link']['description']);
-                }
-
-                return $data;
-            })
-        ;
-
-        $result = $this->controller->displayCreateForm($request, $response);
-
-        static::assertSame(200, $result->getStatusCode());
-        static::assertSame('editlink', (string) $result->getBody());
-
-        static::assertSame('Shaare - Shaarli', $assignedVariables['pagetitle']);
-
-        static::assertSame($expectedUrl, $assignedVariables['link']['url']);
-        static::assertSame($remoteTitle, $assignedVariables['link']['title']);
-        static::assertSame($remoteDesc, $assignedVariables['link']['description']);
-        static::assertSame($remoteTags, $assignedVariables['link']['tags']);
-        static::assertFalse($assignedVariables['link']['private']);
-
-        static::assertTrue($assignedVariables['link_is_new']);
-        static::assertSame($referer, $assignedVariables['http_referer']);
-        static::assertSame($tags, $assignedVariables['tags']);
-        static::assertArrayHasKey('source', $assignedVariables);
-        static::assertArrayHasKey('default_private_links', $assignedVariables);
-        static::assertArrayHasKey('async_metadata', $assignedVariables);
-        static::assertArrayHasKey('retrieve_description', $assignedVariables);
-    }
-
-    /**
-     * Test displaying bookmark create form without any external metadata retrieval attempt
-     */
-    public function testDisplayCreateFormWithUrlAndWithoutMetadata(): void
-    {
-        $this->container->environment = [
-            'HTTP_REFERER' => $referer = 'http://shaarli/subfolder/controller/?searchtag=abc'
-        ];
-
-        $assignedVariables = [];
-        $this->assignTemplateVars($assignedVariables);
-
-        $url = 'http://url.tld/other?part=3&utm_ad=pay#hash';
-        $expectedUrl = str_replace('&utm_ad=pay', '', $url);
-
-        $request = $this->createMock(Request::class);
-        $request->method('getParam')->willReturnCallback(function (string $key) use ($url): ?string {
-            return $key === 'post' ? $url : null;
-        });
-        $response = new Response();
-
-        $this->container->metadataRetriever->expects(static::never())->method('retrieve');
-
-        $this->container->bookmarkService
-            ->expects(static::once())
-            ->method('bookmarksCountPerTag')
-            ->willReturn($tags = ['tag1' => 2, 'tag2' => 1])
-        ;
-
-        // Make sure that PluginManager hook is triggered
-        $this->container->pluginManager
-            ->expects(static::atLeastOnce())
-            ->method('executeHooks')
-            ->withConsecutive(['render_editlink'], ['render_includes'])
-            ->willReturnCallback(function (string $hook, array $data): array {
-                if ('render_editlink' === $hook) {
-                    static::assertSame('', $data['link']['title']);
-                    static::assertSame('', $data['link']['description']);
-                }
-
-                return $data;
-            })
-        ;
-
-        $result = $this->controller->displayCreateForm($request, $response);
-
-        static::assertSame(200, $result->getStatusCode());
-        static::assertSame('editlink', (string) $result->getBody());
-
-        static::assertSame('Shaare - Shaarli', $assignedVariables['pagetitle']);
-
-        static::assertSame($expectedUrl, $assignedVariables['link']['url']);
-        static::assertSame('', $assignedVariables['link']['title']);
-        static::assertSame('', $assignedVariables['link']['description']);
-        static::assertSame('', $assignedVariables['link']['tags']);
-        static::assertFalse($assignedVariables['link']['private']);
-
-        static::assertTrue($assignedVariables['link_is_new']);
-        static::assertSame($referer, $assignedVariables['http_referer']);
-        static::assertSame($tags, $assignedVariables['tags']);
-        static::assertArrayHasKey('source', $assignedVariables);
-        static::assertArrayHasKey('default_private_links', $assignedVariables);
-        static::assertArrayHasKey('async_metadata', $assignedVariables);
-        static::assertArrayHasKey('retrieve_description', $assignedVariables);
-    }
-
-    /**
-     * Test displaying bookmark create form
-     * Ensure all available query parameters are handled properly.
-     */
-    public function testDisplayCreateFormWithFullParameters(): void
-    {
-        $assignedVariables = [];
-        $this->assignTemplateVars($assignedVariables);
-
-        $parameters = [
-            'post' => 'http://url.tld/other?part=3&utm_ad=pay#hash',
-            'title' => 'Provided Title',
-            'description' => 'Provided description.',
-            'tags' => 'abc def',
-            'private' => '1',
-            'source' => 'apps',
-        ];
-        $expectedUrl = str_replace('&utm_ad=pay', '', $parameters['post']);
-
-        $request = $this->createMock(Request::class);
-        $request
-            ->method('getParam')
-            ->willReturnCallback(function (string $key) use ($parameters): ?string {
-                return $parameters[$key] ?? null;
-            });
-        $response = new Response();
-
-        $result = $this->controller->displayCreateForm($request, $response);
-
-        static::assertSame(200, $result->getStatusCode());
-        static::assertSame('editlink', (string) $result->getBody());
-
-        static::assertSame('Shaare - Shaarli', $assignedVariables['pagetitle']);
-
-        static::assertSame($expectedUrl, $assignedVariables['link']['url']);
-        static::assertSame($parameters['title'], $assignedVariables['link']['title']);
-        static::assertSame($parameters['description'], $assignedVariables['link']['description']);
-        static::assertSame($parameters['tags'], $assignedVariables['link']['tags']);
-        static::assertTrue($assignedVariables['link']['private']);
-        static::assertTrue($assignedVariables['link_is_new']);
-        static::assertSame($parameters['source'], $assignedVariables['source']);
-    }
-
-    /**
-     * Test displaying bookmark create form
-     * Without any parameter.
-     */
-    public function testDisplayCreateFormEmpty(): void
-    {
-        $assignedVariables = [];
-        $this->assignTemplateVars($assignedVariables);
-
-        $request = $this->createMock(Request::class);
-        $response = new Response();
-
-        $this->container->httpAccess->expects(static::never())->method('getHttpResponse');
-        $this->container->httpAccess->expects(static::never())->method('getCurlDownloadCallback');
-
-        $result = $this->controller->displayCreateForm($request, $response);
-
-        static::assertSame(200, $result->getStatusCode());
-        static::assertSame('editlink', (string) $result->getBody());
-        static::assertSame('', $assignedVariables['link']['url']);
-        static::assertSame('Note: ', $assignedVariables['link']['title']);
-        static::assertSame('', $assignedVariables['link']['description']);
-        static::assertSame('', $assignedVariables['link']['tags']);
-        static::assertFalse($assignedVariables['link']['private']);
-        static::assertTrue($assignedVariables['link_is_new']);
-    }
-
-    /**
-     * Test displaying bookmark create form
-     * URL not using HTTP protocol: do not try to retrieve the title
-     */
-    public function testDisplayCreateFormNotHttp(): void
-    {
-        $assignedVariables = [];
-        $this->assignTemplateVars($assignedVariables);
-
-        $url = 'magnet://kubuntu.torrent';
-        $request = $this->createMock(Request::class);
-        $request
-            ->method('getParam')
-            ->willReturnCallback(function (string $key) use ($url): ?string {
-                return $key === 'post' ? $url : null;
-            });
-        $response = new Response();
-
-        $this->container->httpAccess->expects(static::never())->method('getHttpResponse');
-        $this->container->httpAccess->expects(static::never())->method('getCurlDownloadCallback');
-
-        $result = $this->controller->displayCreateForm($request, $response);
-
-        static::assertSame(200, $result->getStatusCode());
-        static::assertSame('editlink', (string) $result->getBody());
-        static::assertSame($url, $assignedVariables['link']['url']);
-        static::assertTrue($assignedVariables['link_is_new']);
-    }
-
-    /**
-     * Test displaying bookmark create form
-     * When markdown formatter is enabled, the no markdown tag should be added to existing tags.
-     */
-    public function testDisplayCreateFormWithMarkdownEnabled(): void
-    {
-        $assignedVariables = [];
-        $this->assignTemplateVars($assignedVariables);
-
-        $this->container->conf = $this->createMock(ConfigManager::class);
-        $this->container->conf
-            ->expects(static::atLeastOnce())
-            ->method('get')->willReturnCallback(function (string $key): ?string {
-                if ($key === 'formatter') {
-                    return 'markdown';
-                }
-
-                return $key;
-            })
-        ;
-
-        $request = $this->createMock(Request::class);
-        $response = new Response();
-
-        $result = $this->controller->displayCreateForm($request, $response);
-
-        static::assertSame(200, $result->getStatusCode());
-        static::assertSame('editlink', (string) $result->getBody());
-        static::assertSame(['nomarkdown' => 1], $assignedVariables['tags']);
-    }
-
-    /**
-     * Test displaying bookmark create form
-     * When an existing URL is submitted, we want to edit the existing link.
-     */
-    public function testDisplayCreateFormWithExistingUrl(): void
-    {
-        $assignedVariables = [];
-        $this->assignTemplateVars($assignedVariables);
-
-        $url = 'http://url.tld/other?part=3&utm_ad=pay#hash';
-        $expectedUrl = str_replace('&utm_ad=pay', '', $url);
-
-        $request = $this->createMock(Request::class);
-        $request
-            ->method('getParam')
-            ->willReturnCallback(function (string $key) use ($url): ?string {
-                return $key === 'post' ? $url : null;
-            });
-        $response = new Response();
-
-        $this->container->httpAccess->expects(static::never())->method('getHttpResponse');
-        $this->container->httpAccess->expects(static::never())->method('getCurlDownloadCallback');
-
-        $this->container->bookmarkService
-            ->expects(static::once())
-            ->method('findByUrl')
-            ->with($expectedUrl)
-            ->willReturn(
-                (new Bookmark())
-                    ->setId($id = 23)
-                    ->setUrl($expectedUrl)
-                    ->setTitle($title = 'Bookmark Title')
-                    ->setDescription($description = 'Bookmark description.')
-                    ->setTags($tags = ['abc', 'def'])
-                    ->setPrivate(true)
-                    ->setCreated($createdAt = new \DateTime('2020-06-10 18:45:44'))
-            )
-        ;
-
-        $result = $this->controller->displayCreateForm($request, $response);
-
-        static::assertSame(200, $result->getStatusCode());
-        static::assertSame('editlink', (string) $result->getBody());
-
-        static::assertSame('Edit Shaare - Shaarli', $assignedVariables['pagetitle']);
-        static::assertFalse($assignedVariables['link_is_new']);
-
-        static::assertSame($id, $assignedVariables['link']['id']);
-        static::assertSame($expectedUrl, $assignedVariables['link']['url']);
-        static::assertSame($title, $assignedVariables['link']['title']);
-        static::assertSame($description, $assignedVariables['link']['description']);
-        static::assertSame(implode(' ', $tags), $assignedVariables['link']['tags']);
-        static::assertTrue($assignedVariables['link']['private']);
-        static::assertSame($createdAt, $assignedVariables['link']['created']);
-    }
-}
diff --git a/tests/front/controller/admin/ManageShaareControllerTest/DisplayEditFormTest.php b/tests/front/controller/admin/ManageShaareControllerTest/DisplayEditFormTest.php
deleted file mode 100644
index 2dc3f41c..00000000
--- a/tests/front/controller/admin/ManageShaareControllerTest/DisplayEditFormTest.php
+++ /dev/null
@@ -1,155 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Shaarli\Front\Controller\Admin\ManageShaareControllerTest;
-
-use Shaarli\Bookmark\Bookmark;
-use Shaarli\Bookmark\Exception\BookmarkNotFoundException;
-use Shaarli\Front\Controller\Admin\FrontAdminControllerMockHelper;
-use Shaarli\Front\Controller\Admin\ManageShaareController;
-use Shaarli\Http\HttpAccess;
-use Shaarli\Security\SessionManager;
-use Shaarli\TestCase;
-use Slim\Http\Request;
-use Slim\Http\Response;
-
-class DisplayEditFormTest extends TestCase
-{
-    use FrontAdminControllerMockHelper;
-
-    /** @var ManageShaareController */
-    protected $controller;
-
-    public function setUp(): void
-    {
-        $this->createContainer();
-
-        $this->container->httpAccess = $this->createMock(HttpAccess::class);
-        $this->controller = new ManageShaareController($this->container);
-    }
-
-    /**
-     * Test displaying bookmark edit form
-     * When an existing ID is provided, ensure that default workflow works properly.
-     */
-    public function testDisplayEditFormDefault(): void
-    {
-        $assignedVariables = [];
-        $this->assignTemplateVars($assignedVariables);
-
-        $id = 11;
-
-        $request = $this->createMock(Request::class);
-        $response = new Response();
-
-        $this->container->httpAccess->expects(static::never())->method('getHttpResponse');
-        $this->container->httpAccess->expects(static::never())->method('getCurlDownloadCallback');
-
-        $this->container->bookmarkService
-            ->expects(static::once())
-            ->method('get')
-            ->with($id)
-            ->willReturn(
-                (new Bookmark())
-                    ->setId($id)
-                    ->setUrl($url = 'http://domain.tld')
-                    ->setTitle($title = 'Bookmark Title')
-                    ->setDescription($description = 'Bookmark description.')
-                    ->setTags($tags = ['abc', 'def'])
-                    ->setPrivate(true)
-                    ->setCreated($createdAt = new \DateTime('2020-06-10 18:45:44'))
-            )
-        ;
-
-        $result = $this->controller->displayEditForm($request, $response, ['id' => (string) $id]);
-
-        static::assertSame(200, $result->getStatusCode());
-        static::assertSame('editlink', (string) $result->getBody());
-
-        static::assertSame('Edit Shaare - Shaarli', $assignedVariables['pagetitle']);
-        static::assertFalse($assignedVariables['link_is_new']);
-
-        static::assertSame($id, $assignedVariables['link']['id']);
-        static::assertSame($url, $assignedVariables['link']['url']);
-        static::assertSame($title, $assignedVariables['link']['title']);
-        static::assertSame($description, $assignedVariables['link']['description']);
-        static::assertSame(implode(' ', $tags), $assignedVariables['link']['tags']);
-        static::assertTrue($assignedVariables['link']['private']);
-        static::assertSame($createdAt, $assignedVariables['link']['created']);
-    }
-
-    /**
-     * Test displaying bookmark edit form
-     * Invalid ID provided.
-     */
-    public function testDisplayEditFormInvalidId(): void
-    {
-        $id = 'invalid';
-
-        $request = $this->createMock(Request::class);
-        $response = new Response();
-
-        $this->container->sessionManager
-            ->expects(static::once())
-            ->method('setSessionParameter')
-            ->with(SessionManager::KEY_ERROR_MESSAGES, ['Bookmark with identifier invalid could not be found.'])
-        ;
-
-        $result = $this->controller->displayEditForm($request, $response, ['id' => $id]);
-
-        static::assertSame(302, $result->getStatusCode());
-        static::assertSame(['/subfolder/'], $result->getHeader('location'));
-    }
-
-    /**
-     * Test displaying bookmark edit form
-     * ID not provided.
-     */
-    public function testDisplayEditFormIdNotProvided(): void
-    {
-        $request = $this->createMock(Request::class);
-        $response = new Response();
-
-        $this->container->sessionManager
-            ->expects(static::once())
-            ->method('setSessionParameter')
-            ->with(SessionManager::KEY_ERROR_MESSAGES, ['Bookmark with identifier  could not be found.'])
-        ;
-
-        $result = $this->controller->displayEditForm($request, $response, []);
-
-        static::assertSame(302, $result->getStatusCode());
-        static::assertSame(['/subfolder/'], $result->getHeader('location'));
-    }
-
-    /**
-     * Test displaying bookmark edit form
-     * Bookmark not found.
-     */
-    public function testDisplayEditFormBookmarkNotFound(): void
-    {
-        $id = 123;
-
-        $request = $this->createMock(Request::class);
-        $response = new Response();
-
-        $this->container->bookmarkService
-            ->expects(static::once())
-            ->method('get')
-            ->with($id)
-            ->willThrowException(new BookmarkNotFoundException())
-        ;
-
-        $this->container->sessionManager
-            ->expects(static::once())
-            ->method('setSessionParameter')
-            ->with(SessionManager::KEY_ERROR_MESSAGES, ['Bookmark with identifier 123 could not be found.'])
-        ;
-
-        $result = $this->controller->displayEditForm($request, $response, ['id' => (string) $id]);
-
-        static::assertSame(302, $result->getStatusCode());
-        static::assertSame(['/subfolder/'], $result->getHeader('location'));
-    }
-}
diff --git a/tests/front/controller/admin/ManageShaareControllerTest/PinBookmarkTest.php b/tests/front/controller/admin/ManageShaareControllerTest/PinBookmarkTest.php
deleted file mode 100644
index 50ce7df1..00000000
--- a/tests/front/controller/admin/ManageShaareControllerTest/PinBookmarkTest.php
+++ /dev/null
@@ -1,145 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Shaarli\Front\Controller\Admin\ManageShaareControllerTest;
-
-use Shaarli\Bookmark\Bookmark;
-use Shaarli\Bookmark\Exception\BookmarkNotFoundException;
-use Shaarli\Front\Controller\Admin\FrontAdminControllerMockHelper;
-use Shaarli\Front\Controller\Admin\ManageShaareController;
-use Shaarli\Http\HttpAccess;
-use Shaarli\Security\SessionManager;
-use Shaarli\TestCase;
-use Slim\Http\Request;
-use Slim\Http\Response;
-
-class PinBookmarkTest extends TestCase
-{
-    use FrontAdminControllerMockHelper;
-
-    /** @var ManageShaareController */
-    protected $controller;
-
-    public function setUp(): void
-    {
-        $this->createContainer();
-
-        $this->container->httpAccess = $this->createMock(HttpAccess::class);
-        $this->controller = new ManageShaareController($this->container);
-    }
-
-    /**
-     * Test pin bookmark - with valid input
-     *
-     * @dataProvider initialStickyValuesProvider()
-     */
-    public function testPinBookmarkIsStickyNull(?bool $sticky, bool $expectedValue): void
-    {
-        $id = 123;
-
-        $request = $this->createMock(Request::class);
-        $response = new Response();
-
-        $bookmark = (new Bookmark())
-            ->setId(123)
-            ->setUrl('http://domain.tld')
-            ->setTitle('Title 123')
-            ->setSticky($sticky)
-        ;
-
-        $this->container->bookmarkService->expects(static::once())->method('get')->with(123)->willReturn($bookmark);
-        $this->container->bookmarkService->expects(static::once())->method('set')->with($bookmark, true);
-
-        // Make sure that PluginManager hook is triggered
-        $this->container->pluginManager
-            ->expects(static::once())
-            ->method('executeHooks')
-            ->with('save_link')
-        ;
-
-        $result = $this->controller->pinBookmark($request, $response, ['id' => (string) $id]);
-
-        static::assertSame(302, $result->getStatusCode());
-        static::assertSame(['/subfolder/'], $result->getHeader('location'));
-
-        static::assertSame($expectedValue, $bookmark->isSticky());
-    }
-
-    public function initialStickyValuesProvider(): array
-    {
-        // [initialStickyState, isStickyAfterPin]
-        return [[null, true], [false, true], [true, false]];
-    }
-
-    /**
-     * Test pin bookmark - invalid bookmark ID
-     */
-    public function testDisplayEditFormInvalidId(): void
-    {
-        $id = 'invalid';
-
-        $request = $this->createMock(Request::class);
-        $response = new Response();
-
-        $this->container->sessionManager
-            ->expects(static::once())
-            ->method('setSessionParameter')
-            ->with(SessionManager::KEY_ERROR_MESSAGES, ['Bookmark with identifier invalid could not be found.'])
-        ;
-
-        $result = $this->controller->pinBookmark($request, $response, ['id' => $id]);
-
-        static::assertSame(302, $result->getStatusCode());
-        static::assertSame(['/subfolder/'], $result->getHeader('location'));
-    }
-
-    /**
-     * Test pin bookmark - Bookmark ID not provided
-     */
-    public function testDisplayEditFormIdNotProvided(): void
-    {
-        $request = $this->createMock(Request::class);
-        $response = new Response();
-
-        $this->container->sessionManager
-            ->expects(static::once())
-            ->method('setSessionParameter')
-            ->with(SessionManager::KEY_ERROR_MESSAGES, ['Bookmark with identifier  could not be found.'])
-        ;
-
-        $result = $this->controller->pinBookmark($request, $response, []);
-
-        static::assertSame(302, $result->getStatusCode());
-        static::assertSame(['/subfolder/'], $result->getHeader('location'));
-    }
-
-    /**
-     * Test pin bookmark - bookmark not found
-     */
-    public function testDisplayEditFormBookmarkNotFound(): void
-    {
-        $id = 123;
-
-        $request = $this->createMock(Request::class);
-        $response = new Response();
-
-        $this->container->bookmarkService
-            ->expects(static::once())
-            ->method('get')
-            ->with($id)
-            ->willThrowException(new BookmarkNotFoundException())
-        ;
-
-        $this->container->sessionManager
-            ->expects(static::once())
-            ->method('setSessionParameter')
-            ->with(SessionManager::KEY_ERROR_MESSAGES, ['Bookmark with identifier 123 could not be found.'])
-        ;
-
-        $result = $this->controller->pinBookmark($request, $response, ['id' => (string) $id]);
-
-        static::assertSame(302, $result->getStatusCode());
-        static::assertSame(['/subfolder/'], $result->getHeader('location'));
-    }
-}
diff --git a/tests/front/controller/admin/ManageShaareControllerTest/SaveBookmarkTest.php b/tests/front/controller/admin/ManageShaareControllerTest/SaveBookmarkTest.php
deleted file mode 100644
index 1adeef5a..00000000
--- a/tests/front/controller/admin/ManageShaareControllerTest/SaveBookmarkTest.php
+++ /dev/null
@@ -1,369 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Shaarli\Front\Controller\Admin\ManageShaareControllerTest;
-
-use Shaarli\Bookmark\Bookmark;
-use Shaarli\Config\ConfigManager;
-use Shaarli\Front\Controller\Admin\FrontAdminControllerMockHelper;
-use Shaarli\Front\Controller\Admin\ManageShaareController;
-use Shaarli\Front\Exception\WrongTokenException;
-use Shaarli\Http\HttpAccess;
-use Shaarli\Security\SessionManager;
-use Shaarli\TestCase;
-use Shaarli\Thumbnailer;
-use Slim\Http\Request;
-use Slim\Http\Response;
-
-class SaveBookmarkTest extends TestCase
-{
-    use FrontAdminControllerMockHelper;
-
-    /** @var ManageShaareController */
-    protected $controller;
-
-    public function setUp(): void
-    {
-        $this->createContainer();
-
-        $this->container->httpAccess = $this->createMock(HttpAccess::class);
-        $this->controller = new ManageShaareController($this->container);
-    }
-
-    /**
-     * Test save a new bookmark
-     */
-    public function testSaveBookmark(): void
-    {
-        $id = 21;
-        $parameters = [
-            'lf_url' => 'http://url.tld/other?part=3#hash',
-            'lf_title' => 'Provided Title',
-            'lf_description' => 'Provided description.',
-            'lf_tags' => 'abc def',
-            'lf_private' => '1',
-            'returnurl' => 'http://shaarli/subfolder/admin/add-shaare'
-        ];
-
-        $request = $this->createMock(Request::class);
-        $request
-            ->method('getParam')
-            ->willReturnCallback(function (string $key) use ($parameters): ?string {
-                return $parameters[$key] ?? null;
-            })
-        ;
-        $response = new Response();
-
-        $checkBookmark = function (Bookmark $bookmark) use ($parameters) {
-            static::assertSame($parameters['lf_url'], $bookmark->getUrl());
-            static::assertSame($parameters['lf_title'], $bookmark->getTitle());
-            static::assertSame($parameters['lf_description'], $bookmark->getDescription());
-            static::assertSame($parameters['lf_tags'], $bookmark->getTagsString());
-            static::assertTrue($bookmark->isPrivate());
-        };
-
-        $this->container->bookmarkService
-            ->expects(static::once())
-            ->method('addOrSet')
-            ->willReturnCallback(function (Bookmark $bookmark, bool $save) use ($checkBookmark, $id): Bookmark {
-                static::assertFalse($save);
-
-                $checkBookmark($bookmark);
-
-                $bookmark->setId($id);
-
-                return $bookmark;
-            })
-        ;
-        $this->container->bookmarkService
-            ->expects(static::once())
-            ->method('set')
-            ->willReturnCallback(function (Bookmark $bookmark, bool $save) use ($checkBookmark, $id): Bookmark {
-                static::assertTrue($save);
-
-                $checkBookmark($bookmark);
-
-                static::assertSame($id, $bookmark->getId());
-
-                return $bookmark;
-            })
-        ;
-
-        // Make sure that PluginManager hook is triggered
-        $this->container->pluginManager
-            ->expects(static::atLeastOnce())
-            ->method('executeHooks')
-            ->withConsecutive(['save_link'])
-            ->willReturnCallback(function (string $hook, array $data) use ($parameters, $id): array {
-                if ('save_link' === $hook) {
-                    static::assertSame($id, $data['id']);
-                    static::assertSame($parameters['lf_url'], $data['url']);
-                    static::assertSame($parameters['lf_title'], $data['title']);
-                    static::assertSame($parameters['lf_description'], $data['description']);
-                    static::assertSame($parameters['lf_tags'], $data['tags']);
-                    static::assertTrue($data['private']);
-                }
-
-                return $data;
-            })
-        ;
-
-        $result = $this->controller->save($request, $response);
-
-        static::assertSame(302, $result->getStatusCode());
-        static::assertRegExp('@/subfolder/#[\w\-]{6}@', $result->getHeader('location')[0]);
-    }
-
-
-    /**
-     * Test save an existing bookmark
-     */
-    public function testSaveExistingBookmark(): void
-    {
-        $id = 21;
-        $parameters = [
-            'lf_id' => (string) $id,
-            'lf_url' => 'http://url.tld/other?part=3#hash',
-            'lf_title' => 'Provided Title',
-            'lf_description' => 'Provided description.',
-            'lf_tags' => 'abc def',
-            'lf_private' => '1',
-            'returnurl' => 'http://shaarli/subfolder/?page=2'
-        ];
-
-        $request = $this->createMock(Request::class);
-        $request
-            ->method('getParam')
-            ->willReturnCallback(function (string $key) use ($parameters): ?string {
-                return $parameters[$key] ?? null;
-            })
-        ;
-        $response = new Response();
-
-        $checkBookmark = function (Bookmark $bookmark) use ($parameters, $id) {
-            static::assertSame($id, $bookmark->getId());
-            static::assertSame($parameters['lf_url'], $bookmark->getUrl());
-            static::assertSame($parameters['lf_title'], $bookmark->getTitle());
-            static::assertSame($parameters['lf_description'], $bookmark->getDescription());
-            static::assertSame($parameters['lf_tags'], $bookmark->getTagsString());
-            static::assertTrue($bookmark->isPrivate());
-        };
-
-        $this->container->bookmarkService->expects(static::atLeastOnce())->method('exists')->willReturn(true);
-        $this->container->bookmarkService
-            ->expects(static::once())
-            ->method('get')
-            ->willReturn((new Bookmark())->setId($id)->setUrl('http://other.url'))
-        ;
-        $this->container->bookmarkService
-            ->expects(static::once())
-            ->method('addOrSet')
-            ->willReturnCallback(function (Bookmark $bookmark, bool $save) use ($checkBookmark, $id): Bookmark {
-                static::assertFalse($save);
-
-                $checkBookmark($bookmark);
-
-                return $bookmark;
-            })
-        ;
-        $this->container->bookmarkService
-            ->expects(static::once())
-            ->method('set')
-            ->willReturnCallback(function (Bookmark $bookmark, bool $save) use ($checkBookmark, $id): Bookmark {
-                static::assertTrue($save);
-
-                $checkBookmark($bookmark);
-
-                static::assertSame($id, $bookmark->getId());
-
-                return $bookmark;
-            })
-        ;
-
-        // Make sure that PluginManager hook is triggered
-        $this->container->pluginManager
-            ->expects(static::atLeastOnce())
-            ->method('executeHooks')
-            ->withConsecutive(['save_link'])
-            ->willReturnCallback(function (string $hook, array $data) use ($parameters, $id): array {
-                if ('save_link' === $hook) {
-                    static::assertSame($id, $data['id']);
-                    static::assertSame($parameters['lf_url'], $data['url']);
-                    static::assertSame($parameters['lf_title'], $data['title']);
-                    static::assertSame($parameters['lf_description'], $data['description']);
-                    static::assertSame($parameters['lf_tags'], $data['tags']);
-                    static::assertTrue($data['private']);
-                }
-
-                return $data;
-            })
-        ;
-
-        $result = $this->controller->save($request, $response);
-
-        static::assertSame(302, $result->getStatusCode());
-        static::assertRegExp('@/subfolder/\?page=2#[\w\-]{6}@', $result->getHeader('location')[0]);
-    }
-
-    /**
-     * Test save a bookmark - try to retrieve the thumbnail
-     */
-    public function testSaveBookmarkWithThumbnailSync(): void
-    {
-        $parameters = ['lf_url' => 'http://url.tld/other?part=3#hash'];
-
-        $request = $this->createMock(Request::class);
-        $request
-            ->method('getParam')
-            ->willReturnCallback(function (string $key) use ($parameters): ?string {
-                return $parameters[$key] ?? null;
-            })
-        ;
-        $response = new Response();
-
-        $this->container->conf = $this->createMock(ConfigManager::class);
-        $this->container->conf->method('get')->willReturnCallback(function (string $key, $default) {
-            if ($key === 'thumbnails.mode') {
-                return Thumbnailer::MODE_ALL;
-            } elseif ($key === 'general.enable_async_metadata') {
-                return false;
-            }
-
-            return $default;
-        });
-
-        $this->container->thumbnailer = $this->createMock(Thumbnailer::class);
-        $this->container->thumbnailer
-            ->expects(static::once())
-            ->method('get')
-            ->with($parameters['lf_url'])
-            ->willReturn($thumb = 'http://thumb.url')
-        ;
-
-        $this->container->bookmarkService
-            ->expects(static::once())
-            ->method('addOrSet')
-            ->willReturnCallback(function (Bookmark $bookmark, bool $save) use ($thumb): Bookmark {
-                static::assertSame($thumb, $bookmark->getThumbnail());
-
-                return $bookmark;
-            })
-        ;
-
-        $result = $this->controller->save($request, $response);
-
-        static::assertSame(302, $result->getStatusCode());
-    }
-
-    /**
-     * Test save a bookmark - with ID #0
-     */
-    public function testSaveBookmarkWithIdZero(): void
-    {
-        $parameters = ['lf_id' => '0'];
-
-        $request = $this->createMock(Request::class);
-        $request
-            ->method('getParam')
-            ->willReturnCallback(function (string $key) use ($parameters): ?string {
-                return $parameters[$key] ?? null;
-            })
-        ;
-        $response = new Response();
-
-        $this->container->bookmarkService->expects(static::once())->method('exists')->with(0)->willReturn(true);
-        $this->container->bookmarkService->expects(static::once())->method('get')->with(0)->willReturn(new Bookmark());
-
-        $result = $this->controller->save($request, $response);
-
-        static::assertSame(302, $result->getStatusCode());
-    }
-
-    /**
-     * Test save a bookmark - do not attempt to retrieve thumbnails if async mode is enabled.
-     */
-    public function testSaveBookmarkWithThumbnailAsync(): void
-    {
-        $parameters = ['lf_url' => 'http://url.tld/other?part=3#hash'];
-
-        $request = $this->createMock(Request::class);
-        $request
-            ->method('getParam')
-            ->willReturnCallback(function (string $key) use ($parameters): ?string {
-                return $parameters[$key] ?? null;
-            })
-        ;
-        $response = new Response();
-
-        $this->container->conf = $this->createMock(ConfigManager::class);
-        $this->container->conf->method('get')->willReturnCallback(function (string $key, $default) {
-            if ($key === 'thumbnails.mode') {
-                return Thumbnailer::MODE_ALL;
-            } elseif ($key === 'general.enable_async_metadata') {
-                return true;
-            }
-
-            return $default;
-        });
-
-        $this->container->thumbnailer = $this->createMock(Thumbnailer::class);
-        $this->container->thumbnailer->expects(static::never())->method('get');
-
-        $this->container->bookmarkService
-            ->expects(static::once())
-            ->method('addOrSet')
-            ->willReturnCallback(function (Bookmark $bookmark): Bookmark {
-                static::assertNull($bookmark->getThumbnail());
-
-                return $bookmark;
-            })
-        ;
-
-        $result = $this->controller->save($request, $response);
-
-        static::assertSame(302, $result->getStatusCode());
-    }
-
-    /**
-     * Change the password with a wrong existing password
-     */
-    public function testSaveBookmarkFromBookmarklet(): void
-    {
-        $parameters = ['source' => 'bookmarklet'];
-
-        $request = $this->createMock(Request::class);
-        $request
-            ->method('getParam')
-            ->willReturnCallback(function (string $key) use ($parameters): ?string {
-                return $parameters[$key] ?? null;
-            })
-        ;
-        $response = new Response();
-
-        $result = $this->controller->save($request, $response);
-
-        static::assertSame(200, $result->getStatusCode());
-        static::assertSame('<script>self.close();</script>', (string) $result->getBody());
-    }
-
-    /**
-     * Change the password with a wrong existing password
-     */
-    public function testSaveBookmarkWrongToken(): void
-    {
-        $this->container->sessionManager = $this->createMock(SessionManager::class);
-        $this->container->sessionManager->method('checkToken')->willReturn(false);
-
-        $this->container->bookmarkService->expects(static::never())->method('addOrSet');
-        $this->container->bookmarkService->expects(static::never())->method('set');
-
-        $request = $this->createMock(Request::class);
-        $response = new Response();
-
-        $this->expectException(WrongTokenException::class);
-
-        $this->controller->save($request, $response);
-    }
-
-}
diff --git a/tests/front/controller/admin/ManageShaareControllerTest/SharePrivateTest.php b/tests/front/controller/admin/ManageShaareControllerTest/SharePrivateTest.php
deleted file mode 100644
index 1e7877c7..00000000
--- a/tests/front/controller/admin/ManageShaareControllerTest/SharePrivateTest.php
+++ /dev/null
@@ -1,139 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Shaarli\Front\Controller\Admin\ManageShaareControllerTest;
-
-use Shaarli\Bookmark\Bookmark;
-use Shaarli\Front\Controller\Admin\FrontAdminControllerMockHelper;
-use Shaarli\Front\Controller\Admin\ManageShaareController;
-use Shaarli\Http\HttpAccess;
-use Shaarli\TestCase;
-use Slim\Http\Request;
-use Slim\Http\Response;
-
-/**
- * Test GET /admin/shaare/private/{hash}
- */
-class SharePrivateTest extends TestCase
-{
-    use FrontAdminControllerMockHelper;
-
-    /** @var ManageShaareController */
-    protected $controller;
-
-    public function setUp(): void
-    {
-        $this->createContainer();
-
-        $this->container->httpAccess = $this->createMock(HttpAccess::class);
-        $this->controller = new ManageShaareController($this->container);
-    }
-
-    /**
-     * Test shaare private with a private bookmark which does not have a key yet.
-     */
-    public function testSharePrivateWithNewPrivateBookmark(): void
-    {
-        $hash = 'abcdcef';
-        $request = $this->createMock(Request::class);
-        $response = new Response();
-
-        $bookmark = (new Bookmark())
-            ->setId(123)
-            ->setUrl('http://domain.tld')
-            ->setTitle('Title 123')
-            ->setPrivate(true)
-        ;
-
-        $this->container->bookmarkService
-            ->expects(static::once())
-            ->method('findByHash')
-            ->with($hash)
-            ->willReturn($bookmark)
-        ;
-        $this->container->bookmarkService
-            ->expects(static::once())
-            ->method('set')
-            ->with($bookmark, true)
-            ->willReturnCallback(function (Bookmark $bookmark): Bookmark {
-                static::assertSame(32, strlen($bookmark->getAdditionalContentEntry('private_key')));
-
-                return $bookmark;
-            })
-        ;
-
-        $result = $this->controller->sharePrivate($request, $response, ['hash' => $hash]);
-
-        static::assertSame(302, $result->getStatusCode());
-        static::assertRegExp('#/subfolder/shaare/' . $hash . '\?key=\w{32}#', $result->getHeaderLine('Location'));
-    }
-
-    /**
-     * Test shaare private with a private bookmark which does already have a key.
-     */
-    public function testSharePrivateWithExistingPrivateBookmark(): void
-    {
-        $hash = 'abcdcef';
-        $existingKey = 'this is a private key';
-        $request = $this->createMock(Request::class);
-        $response = new Response();
-
-        $bookmark = (new Bookmark())
-            ->setId(123)
-            ->setUrl('http://domain.tld')
-            ->setTitle('Title 123')
-            ->setPrivate(true)
-            ->addAdditionalContentEntry('private_key', $existingKey)
-        ;
-
-        $this->container->bookmarkService
-            ->expects(static::once())
-            ->method('findByHash')
-            ->with($hash)
-            ->willReturn($bookmark)
-        ;
-        $this->container->bookmarkService
-            ->expects(static::never())
-            ->method('set')
-        ;
-
-        $result = $this->controller->sharePrivate($request, $response, ['hash' => $hash]);
-
-        static::assertSame(302, $result->getStatusCode());
-        static::assertSame('/subfolder/shaare/' . $hash . '?key=' . $existingKey, $result->getHeaderLine('Location'));
-    }
-
-    /**
-     * Test shaare private with a public bookmark.
-     */
-    public function testSharePrivateWithPublicBookmark(): void
-    {
-        $hash = 'abcdcef';
-        $request = $this->createMock(Request::class);
-        $response = new Response();
-
-        $bookmark = (new Bookmark())
-            ->setId(123)
-            ->setUrl('http://domain.tld')
-            ->setTitle('Title 123')
-            ->setPrivate(false)
-        ;
-
-        $this->container->bookmarkService
-            ->expects(static::once())
-            ->method('findByHash')
-            ->with($hash)
-            ->willReturn($bookmark)
-        ;
-        $this->container->bookmarkService
-            ->expects(static::never())
-            ->method('set')
-        ;
-
-        $result = $this->controller->sharePrivate($request, $response, ['hash' => $hash]);
-
-        static::assertSame(302, $result->getStatusCode());
-        static::assertSame('/subfolder/shaare/' . $hash, $result->getHeaderLine('Location'));
-    }
-}
-- 
cgit v1.2.3