41 files changed, 1420 insertions, 743 deletions
diff --git a/tests/Wallabag/AnnotationBundle/Controller/AnnotationControllerTest.php b/tests/Wallabag/AnnotationBundle/Controller/AnnotationControllerTest.php
index 96474468..2c46e0a1 100644
--- a/tests/Wallabag/AnnotationBundle/Controller/AnnotationControllerTest.php
+++ b/tests/Wallabag/AnnotationBundle/Controller/AnnotationControllerTest.php
@@ -1,6 +1,6 @@
 <?php
-namespace Tests\AnnotationBundle\Controller;
+namespace Tests\Wallabag\AnnotationBundle\Controller;
 use Tests\Wallabag\AnnotationBundle\WallabagAnnotationTestCase;
 use Wallabag\AnnotationBundle\Entity\Annotation;
@@ -100,8 +100,7 @@ class AnnotationControllerTest extends WallabagAnnotationTestCase
        $this->assertSame('my quote', $content['quote']);
        /** @var Annotation $annotation */
-        $annotation = $this->client->getContainer()
+        $annotation = $em
-            ->get('doctrine.orm.entity_manager')
            ->getRepository('WallabagAnnotationBundle:Annotation')
            ->findLastAnnotationByPageId($entry->getId(), 1);
diff --git a/tests/Wallabag/AnnotationBundle/WallabagAnnotationTestCase.php b/tests/Wallabag/AnnotationBundle/WallabagAnnotationTestCase.php
index 105e8add..9c7aba6b 100644
--- a/tests/Wallabag/AnnotationBundle/WallabagAnnotationTestCase.php
+++ b/tests/Wallabag/AnnotationBundle/WallabagAnnotationTestCase.php
@@ -43,9 +43,9 @@ abstract class WallabagAnnotationTestCase extends WebTestCase
        $container = $client->getContainer();
        /** @var $userManager \FOS\UserBundle\Doctrine\UserManager */
-        $userManager = $container->get('fos_user.user_manager');
+        $userManager = $container->get('fos_user.user_manager.test');
        /** @var $loginManager \FOS\UserBundle\Security\LoginManager */
-        $loginManager = $container->get('fos_user.security.login_manager');
+        $loginManager = $container->get('fos_user.security.login_manager.test');
        $firewallName = $container->getParameter('fos_user.firewall_name');
        $this->user = $userManager->findUserBy(['username' => 'admin']);
diff --git a/tests/Wallabag/ApiBundle/Controller/DeveloperControllerTest.php b/tests/Wallabag/ApiBundle/Controller/DeveloperControllerTest.php
index e1a0ac7e..5586c70d 100644
--- a/tests/Wallabag/ApiBundle/Controller/DeveloperControllerTest.php
+++ b/tests/Wallabag/ApiBundle/Controller/DeveloperControllerTest.php
@@ -135,7 +135,7 @@ class DeveloperControllerTest extends WallabagCoreTestCase
    {
        $client = $this->getClient();
        $em = $client->getContainer()->get('doctrine.orm.entity_manager');
-        $userManager = $client->getContainer()->get('fos_user.user_manager');
+        $userManager = $client->getContainer()->get('fos_user.user_manager.test');
        $user = $userManager->findUserBy(['username' => $username]);
        $apiClient = new Client($user);
        $apiClient->setName('My app');
diff --git a/tests/Wallabag/ApiBundle/Controller/EntryRestControllerTest.php b/tests/Wallabag/ApiBundle/Controller/EntryRestControllerTest.php
index 46b5f460..8b7898ee 100644
--- a/tests/Wallabag/ApiBundle/Controller/EntryRestControllerTest.php
+++ b/tests/Wallabag/ApiBundle/Controller/EntryRestControllerTest.php
@@ -15,7 +15,7 @@ class EntryRestControllerTest extends WallabagApiTestCase
        $entry = $this->client->getContainer()
            ->get('doctrine.orm.entity_manager')
            ->getRepository('WallabagCoreBundle:Entry')
-            ->findOneBy(['user' => 1, 'isArchived' => false]);
+            ->findOneBy(['user' => $this->getUserId(), 'isArchived' => false]);
        if (!$entry) {
            $this->markTestSkipped('No content found in db.');
@@ -41,7 +41,7 @@ class EntryRestControllerTest extends WallabagApiTestCase
        $entry = $this->client->getContainer()
            ->get('doctrine.orm.entity_manager')
            ->getRepository('WallabagCoreBundle:Entry')
-            ->findOneBy(['user' => 1, 'url' => 'http://0.0.0.0/entry2']);
+            ->findOneBy(['user' => $this->getUserId(), 'url' => 'http://0.0.0.0/entry2']);
        if (!$entry) {
            $this->markTestSkipped('No content found in db.');
@@ -60,7 +60,7 @@ class EntryRestControllerTest extends WallabagApiTestCase
        $entry = $this->client->getContainer()
            ->get('doctrine.orm.entity_manager')
            ->getRepository('WallabagCoreBundle:Entry')
-            ->findOneBy(['user' => 1, 'isArchived' => false]);
+            ->findOneBy(['user' => $this->getUserId(), 'isArchived' => false]);
        if (!$entry) {
            $this->markTestSkipped('No content found in db.');
@@ -108,7 +108,7 @@ class EntryRestControllerTest extends WallabagApiTestCase
        $entry = $this->client->getContainer()
            ->get('doctrine.orm.entity_manager')
            ->getRepository('WallabagCoreBundle:Entry')
-            ->findOneBy(['user' => 2, 'isArchived' => false]);
+            ->findOneBy(['user' => $this->getUserId('bob'), 'isArchived' => false]);
        if (!$entry) {
            $this->markTestSkipped('No content found in db.');
@@ -133,6 +133,27 @@ class EntryRestControllerTest extends WallabagApiTestCase
        $this->assertSame(1, $content['page']);
        $this->assertGreaterThanOrEqual(1, $content['pages']);
+        $this->assertNotNull($content['_embedded']['items'][0]['content']);
+        $this->assertSame('application/json', $this->client->getResponse()->headers->get('Content-Type'));
+    }
+    public function testGetEntriesDetailMetadata()
+    {
+        $this->client->request('GET', '/api/entries?detail=metadata');
+        $this->assertSame(200, $this->client->getResponse()->getStatusCode());
+        $content = json_decode($this->client->getResponse()->getContent(), true);
+        $this->assertGreaterThanOrEqual(1, \count($content));
+        $this->assertNotEmpty($content['_embedded']['items']);
+        $this->assertGreaterThanOrEqual(1, $content['total']);
+        $this->assertSame(1, $content['page']);
+        $this->assertGreaterThanOrEqual(1, $content['pages']);
+        $this->assertNull($content['_embedded']['items'][0]['content']);
        $this->assertSame('application/json', $this->client->getResponse()->headers->get('Content-Type'));
    }
@@ -185,7 +206,7 @@ class EntryRestControllerTest extends WallabagApiTestCase
        $entry = $this->client->getContainer()
            ->get('doctrine.orm.entity_manager')
            ->getRepository('WallabagCoreBundle:Entry')
-            ->findOneByUser(1);
+            ->findOneByUser($this->getUserId());
        if (!$entry) {
            $this->markTestSkipped('No content found in db.');
@@ -489,8 +510,9 @@ class EntryRestControllerTest extends WallabagApiTestCase
        $this->assertSame(0, $content['is_archived']);
        $this->assertSame(0, $content['is_starred']);
        $this->assertNull($content['starred_at']);
+        $this->assertNull($content['archived_at']);
        $this->assertSame('New title for my article', $content['title']);
-        $this->assertSame(1, $content['user_id']);
+        $this->assertSame($this->getUserId(), $content['user_id']);
        $this->assertCount(2, $content['tags']);
        $this->assertNull($content['origin_url']);
        $this->assertSame('my content', $content['content']);
@@ -505,7 +527,7 @@ class EntryRestControllerTest extends WallabagApiTestCase
    public function testPostSameEntry()
    {
        $em = $this->client->getContainer()->get('doctrine.orm.entity_manager');
-        $entry = new Entry($em->getReference(User::class, 1));
+        $entry = new Entry($em->getReference(User::class, $this->getUserId()));
        $entry->setUrl('https://www.lemonde.fr/pixels/article/2015/03/28/plongee-dans-l-univers-d-ingress-le-jeu-de-google-aux-frontieres-du-reel_4601155_4408996.html');
        $entry->setArchived(true);
        $entry->addTag((new Tag())->setLabel('google'));
@@ -584,7 +606,8 @@ class EntryRestControllerTest extends WallabagApiTestCase
        $this->assertSame(1, $content['is_archived']);
        $this->assertSame(1, $content['is_starred']);
        $this->assertGreaterThanOrEqual($now->getTimestamp(), (new \DateTime($content['starred_at']))->getTimestamp());
-        $this->assertSame(1, $content['user_id']);
+        $this->assertGreaterThanOrEqual($now->getTimestamp(), (new \DateTime($content['archived_at']))->getTimestamp());
+        $this->assertSame($this->getUserId(), $content['user_id']);
    }
    public function testPostArchivedAndStarredEntryWithoutQuotes()
@@ -633,7 +656,7 @@ class EntryRestControllerTest extends WallabagApiTestCase
        $entry = $this->client->getContainer()
            ->get('doctrine.orm.entity_manager')
            ->getRepository('WallabagCoreBundle:Entry')
-            ->findOneByUser(1);
+            ->findOneByUser($this->getUserId());
        if (!$entry) {
            $this->markTestSkipped('No content found in db.');
@@ -660,7 +683,7 @@ class EntryRestControllerTest extends WallabagApiTestCase
        $this->assertSame($entry->getUrl(), $content['url']);
        $this->assertSame('New awesome title', $content['title']);
        $this->assertGreaterThanOrEqual(1, \count($content['tags']), 'We force only one tag');
-        $this->assertSame(1, $content['user_id']);
+        $this->assertSame($this->getUserId(), $content['user_id']);
        $this->assertSame('de_AT', $content['language']);
        $this->assertSame('http://preview.io/picture.jpg', $content['preview_picture']);
        $this->assertContains('sponge', $content['published_by']);
@@ -675,7 +698,7 @@ class EntryRestControllerTest extends WallabagApiTestCase
        $entry = $this->client->getContainer()
            ->get('doctrine.orm.entity_manager')
            ->getRepository('WallabagCoreBundle:Entry')
-            ->findOneByUser(1);
+            ->findOneByUser($this->getUserId());
        if (!$entry) {
            $this->markTestSkipped('No content found in db.');
@@ -709,7 +732,7 @@ class EntryRestControllerTest extends WallabagApiTestCase
        $entry = $this->client->getContainer()
            ->get('doctrine.orm.entity_manager')
            ->getRepository('WallabagCoreBundle:Entry')
-            ->findOneByUser(1);
+            ->findOneByUser($this->getUserId());
        if (!$entry) {
            $this->markTestSkipped('No content found in db.');
@@ -740,7 +763,7 @@ class EntryRestControllerTest extends WallabagApiTestCase
        $entry = $this->client->getContainer()
        ->get('doctrine.orm.entity_manager')
        ->getRepository('WallabagCoreBundle:Entry')
-        ->findOneByUser(1);
+        ->findOneByUser($this->getUserId());
        if (!$entry) {
            $this->markTestSkipped('No content found in db.');
@@ -772,7 +795,7 @@ class EntryRestControllerTest extends WallabagApiTestCase
        $entry = $this->client->getContainer()
            ->get('doctrine.orm.entity_manager')
            ->getRepository('WallabagCoreBundle:Entry')
-            ->findOneByUser(1);
+            ->findOneByUser($this->getUserId());
        if (!$entry) {
            $this->markTestSkipped('No content found in db.');
@@ -817,7 +840,7 @@ class EntryRestControllerTest extends WallabagApiTestCase
        $entry = $this->client->getContainer()
            ->get('doctrine.orm.entity_manager')
            ->getRepository('WallabagCoreBundle:Entry')
-            ->findOneByUser(1);
+            ->findOneByUser($this->getUserId());
        if (!$entry) {
            $this->markTestSkipped('No content found in db.');
@@ -834,7 +857,7 @@ class EntryRestControllerTest extends WallabagApiTestCase
        $content = json_decode($this->client->getResponse()->getContent(), true);
        $this->assertArrayHasKey('tags', $content);
-        $this->assertSame($nbTags + 3, \count($content['tags']));
+        $this->assertCount($nbTags + 3, $content['tags']);
        $entryDB = $this->client->getContainer()
            ->get('doctrine.orm.entity_manager')
@@ -874,7 +897,7 @@ class EntryRestControllerTest extends WallabagApiTestCase
        $content = json_decode($this->client->getResponse()->getContent(), true);
        $this->assertArrayHasKey('tags', $content);
-        $this->assertSame($nbTags - 1, \count($content['tags']));
+        $this->assertCount($nbTags - 1, $content['tags']);
    }
    public function testSaveIsArchivedAfterPost()
@@ -882,7 +905,7 @@ class EntryRestControllerTest extends WallabagApiTestCase
        $entry = $this->client->getContainer()
            ->get('doctrine.orm.entity_manager')
            ->getRepository('WallabagCoreBundle:Entry')
-            ->findOneBy(['user' => 1, 'isArchived' => true]);
+            ->findOneBy(['user' => $this->getUserId(), 'isArchived' => true]);
        if (!$entry) {
            $this->markTestSkipped('No content found in db.');
@@ -904,7 +927,7 @@ class EntryRestControllerTest extends WallabagApiTestCase
        $entry = $this->client->getContainer()
            ->get('doctrine.orm.entity_manager')
            ->getRepository('WallabagCoreBundle:Entry')
-            ->findOneBy(['user' => 1, 'isStarred' => true]);
+            ->findOneBy(['user' => $this->getUserId(), 'isStarred' => true]);
        if (!$entry) {
            $this->markTestSkipped('No content found in db.');
@@ -926,7 +949,7 @@ class EntryRestControllerTest extends WallabagApiTestCase
        $entry = $this->client->getContainer()
            ->get('doctrine.orm.entity_manager')
            ->getRepository('WallabagCoreBundle:Entry')
-            ->findOneBy(['user' => 1, 'isArchived' => true]);
+            ->findOneBy(['user' => $this->getUserId(), 'isArchived' => true]);
        if (!$entry) {
            $this->markTestSkipped('No content found in db.');
@@ -952,7 +975,7 @@ class EntryRestControllerTest extends WallabagApiTestCase
        $entry = $this->client->getContainer()
            ->get('doctrine.orm.entity_manager')
            ->getRepository('WallabagCoreBundle:Entry')
-            ->findOneBy(['user' => 1, 'isStarred' => true]);
+            ->findOneBy(['user' => $this->getUserId(), 'isStarred' => true]);
        if (!$entry) {
            $this->markTestSkipped('No content found in db.');
@@ -971,6 +994,8 @@ class EntryRestControllerTest extends WallabagApiTestCase
    public function dataForEntriesExistWithUrl()
    {
+        $url = hash('sha1', 'http://0.0.0.0/entry2');
        return [
            'with_id' => [
                'url' => '/api/entries/exists?url=http://0.0.0.0/entry2&return_id=1',
@@ -980,6 +1005,14 @@ class EntryRestControllerTest extends WallabagApiTestCase
                'url' => '/api/entries/exists?url=http://0.0.0.0/entry2',
                'expectedValue' => true,
            ],
+            'hashed_url_with_id' => [
+                'url' => '/api/entries/exists?hashed_url=' . $url . '&return_id=1',
+                'expectedValue' => 2,
+            ],
+            'hashed_url_without_id' => [
+                'url' => '/api/entries/exists?hashed_url=' . $url . '',
+                'expectedValue' => true,
+            ],
        ];
    }
@@ -1001,6 +1034,7 @@ class EntryRestControllerTest extends WallabagApiTestCase
    {
        $url1 = 'http://0.0.0.0/entry2';
        $url2 = 'http://0.0.0.0/entry10';
        $this->client->request('GET', '/api/entries/exists?urls[]=' . $url1 . '&urls[]=' . $url2 . '&return_id=1');
        $this->assertSame(200, $this->client->getResponse()->getStatusCode());
@@ -1009,7 +1043,8 @@ class EntryRestControllerTest extends WallabagApiTestCase
        $this->assertArrayHasKey($url1, $content);
        $this->assertArrayHasKey($url2, $content);
-        $this->assertSame(2, $content[$url1]);
+        // it returns a database id, we don't know it, so we only check it's greater than the lowest possible value
+        $this->assertGreaterThan(1, $content[$url1]);
        $this->assertNull($content[$url2]);
    }
@@ -1029,6 +1064,38 @@ class EntryRestControllerTest extends WallabagApiTestCase
        $this->assertFalse($content[$url2]);
    }
+    public function testGetEntriesExistsWithManyUrlsHashed()
+    {
+        $url1 = 'http://0.0.0.0/entry2';
+        $url2 = 'http://0.0.0.0/entry10';
+        $this->client->request('GET', '/api/entries/exists?hashed_urls[]=' . hash('sha1', $url1) . '&hashed_urls[]=' . hash('sha1', $url2) . '&return_id=1');
+        $this->assertSame(200, $this->client->getResponse()->getStatusCode());
+        $content = json_decode($this->client->getResponse()->getContent(), true);
+        $this->assertArrayHasKey(hash('sha1', $url1), $content);
+        $this->assertArrayHasKey(hash('sha1', $url2), $content);
+        $this->assertSame(2, $content[hash('sha1', $url1)]);
+        $this->assertNull($content[hash('sha1', $url2)]);
+    }
+    public function testGetEntriesExistsWithManyUrlsHashedReturnBool()
+    {
+        $url1 = 'http://0.0.0.0/entry2';
+        $url2 = 'http://0.0.0.0/entry10';
+        $this->client->request('GET', '/api/entries/exists?hashed_urls[]=' . hash('sha1', $url1) . '&hashed_urls[]=' . hash('sha1', $url2));
+        $this->assertSame(200, $this->client->getResponse()->getStatusCode());
+        $content = json_decode($this->client->getResponse()->getContent(), true);
+        $this->assertArrayHasKey(hash('sha1', $url1), $content);
+        $this->assertArrayHasKey(hash('sha1', $url2), $content);
+        $this->assertTrue($content[hash('sha1', $url1)]);
+        $this->assertFalse($content[hash('sha1', $url2)]);
+    }
    public function testGetEntriesExistsWhichDoesNotExists()
    {
        $this->client->request('GET', '/api/entries/exists?url=http://google.com/entry2');
@@ -1040,6 +1107,17 @@ class EntryRestControllerTest extends WallabagApiTestCase
        $this->assertFalse($content['exists']);
    }
+    public function testGetEntriesExistsWhichDoesNotExistsWithHashedUrl()
+    {
+        $this->client->request('GET', '/api/entries/exists?hashed_url=' . hash('sha1', 'http://google.com/entry2'));
+        $this->assertSame(200, $this->client->getResponse()->getStatusCode());
+        $content = json_decode($this->client->getResponse()->getContent(), true);
+        $this->assertFalse($content['exists']);
+    }
    public function testGetEntriesExistsWithNoUrl()
    {
        $this->client->request('GET', '/api/entries/exists?url=');
@@ -1047,11 +1125,18 @@ class EntryRestControllerTest extends WallabagApiTestCase
        $this->assertSame(403, $this->client->getResponse()->getStatusCode());
    }
+    public function testGetEntriesExistsWithNoHashedUrl()
+    {
+        $this->client->request('GET', '/api/entries/exists?hashed_url=');
+        $this->assertSame(403, $this->client->getResponse()->getStatusCode());
+    }
    public function testReloadEntryErrorWhileFetching()
    {
        $entry = $this->client->getContainer()->get('doctrine.orm.entity_manager')
            ->getRepository('WallabagCoreBundle:Entry')
-            ->findByUrlAndUserId('http://0.0.0.0/entry4', 1);
+            ->findByUrlAndUserId('http://0.0.0.0/entry4', $this->getUserId());
        if (!$entry) {
            $this->markTestSkipped('No content found in db.');
@@ -1087,7 +1172,7 @@ class EntryRestControllerTest extends WallabagApiTestCase
    {
        $entry = $this->client->getContainer()->get('doctrine.orm.entity_manager')
            ->getRepository('WallabagCoreBundle:Entry')
-            ->findByUrlAndUserId('http://0.0.0.0/entry4', 1);
+            ->findByUrlAndUserId('http://0.0.0.0/entry4', $this->getUserId());
        $tags = $entry->getTags();
@@ -1111,7 +1196,7 @@ class EntryRestControllerTest extends WallabagApiTestCase
        $entry = $this->client->getContainer()->get('doctrine.orm.entity_manager')
            ->getRepository('WallabagCoreBundle:Entry')
-            ->findByUrlAndUserId('http://0.0.0.0/entry4', 1);
+            ->findByUrlAndUserId('http://0.0.0.0/entry4', $this->getUserId());
        $tags = $entry->getTags();
        $this->assertCount(4, $tags);
@@ -1131,7 +1216,7 @@ class EntryRestControllerTest extends WallabagApiTestCase
    public function testDeleteEntriesTagsListAction()
    {
        $em = $this->client->getContainer()->get('doctrine.orm.entity_manager');
-        $entry = new Entry($em->getReference(User::class, 1));
+        $entry = new Entry($em->getReference(User::class, $this->getUserId()));
        $entry->setUrl('http://0.0.0.0/test-entry');
        $entry->addTag((new Tag())->setLabel('foo-tag'));
        $entry->addTag((new Tag())->setLabel('bar-tag'));
@@ -1199,7 +1284,7 @@ class EntryRestControllerTest extends WallabagApiTestCase
    public function testDeleteEntriesListAction()
    {
        $em = $this->client->getContainer()->get('doctrine.orm.entity_manager');
-        $em->persist((new Entry($em->getReference(User::class, 1)))->setUrl('http://0.0.0.0/test-entry1'));
+        $em->persist((new Entry($em->getReference(User::class, $this->getUserId())))->setUrl('http://0.0.0.0/test-entry1'));
        $em->flush();
        $em->clear();
@@ -1257,7 +1342,7 @@ class EntryRestControllerTest extends WallabagApiTestCase
    public function testRePostEntryAndReUsePublishedAt()
    {
        $em = $this->client->getContainer()->get('doctrine.orm.entity_manager');
-        $entry = new Entry($em->getReference(User::class, 1));
+        $entry = new Entry($em->getReference(User::class, $this->getUserId()));
        $entry->setTitle('Antoine de Caunes : « Je veux avoir le droit de tâtonner »');
        $entry->setContent('hihi');
        $entry->setUrl('https://www.lemonde.fr/m-perso/article/2017/06/25/antoine-de-caunes-je-veux-avoir-le-droit-de-tatonner_5150728_4497916.html');
diff --git a/tests/Wallabag/ApiBundle/Controller/SearchRestControllerTest.php b/tests/Wallabag/ApiBundle/Controller/SearchRestControllerTest.php
new file mode 100644
index 00000000..fd524639
--- /dev/null
+++ b/tests/Wallabag/ApiBundle/Controller/SearchRestControllerTest.php
@@ -0,0 +1,69 @@
+<?php
+namespace Tests\Wallabag\ApiBundle\Controller;
+use Tests\Wallabag\ApiBundle\WallabagApiTestCase;
+class SearchRestControllerTest extends WallabagApiTestCase
+{
+    public function testGetSearchWithFullOptions()
+    {
+        $this->client->request('GET', '/api/search', [
+            'page' => 1,
+            'perPage' => 2,
+            'term' => 'entry', // 6 results
+        ]);
+        $this->assertSame(200, $this->client->getResponse()->getStatusCode());
+        $content = json_decode($this->client->getResponse()->getContent(), true);
+        $this->assertGreaterThanOrEqual(1, \count($content));
+        $this->assertArrayHasKey('items', $content['_embedded']);
+        $this->assertGreaterThanOrEqual(0, $content['total']);
+        $this->assertSame(1, $content['page']);
+        $this->assertSame(2, $content['limit']);
+        $this->assertGreaterThanOrEqual(1, $content['pages']);
+        $this->assertArrayHasKey('_links', $content);
+        $this->assertArrayHasKey('self', $content['_links']);
+        $this->assertArrayHasKey('first', $content['_links']);
+        $this->assertArrayHasKey('last', $content['_links']);
+        foreach (['self', 'first', 'last'] as $link) {
+            $this->assertArrayHasKey('href', $content['_links'][$link]);
+            $this->assertContains('term=entry', $content['_links'][$link]['href']);
+        }
+        $this->assertSame('application/json', $this->client->getResponse()->headers->get('Content-Type'));
+    }
+    public function testGetSearchWithNoLimit()
+    {
+        $this->client->request('GET', '/api/search', [
+            'term' => 'entry',
+        ]);
+        $this->assertSame(200, $this->client->getResponse()->getStatusCode());
+        $content = json_decode($this->client->getResponse()->getContent(), true);
+        $this->assertGreaterThanOrEqual(1, \count($content));
+        $this->assertArrayHasKey('items', $content['_embedded']);
+        $this->assertGreaterThanOrEqual(0, $content['total']);
+        $this->assertSame(1, $content['page']);
+        $this->assertGreaterThanOrEqual(1, $content['pages']);
+        $this->assertArrayHasKey('_links', $content);
+        $this->assertArrayHasKey('self', $content['_links']);
+        $this->assertArrayHasKey('first', $content['_links']);
+        $this->assertArrayHasKey('last', $content['_links']);
+        foreach (['self', 'first', 'last'] as $link) {
+            $this->assertArrayHasKey('href', $content['_links'][$link]);
+            $this->assertContains('term=entry', $content['_links'][$link]['href']);
+        }
+        $this->assertSame('application/json', $this->client->getResponse()->headers->get('Content-Type'));
+    }
+}
diff --git a/tests/Wallabag/ApiBundle/Controller/WallabagRestControllerTest.php b/tests/Wallabag/ApiBundle/Controller/WallabagRestControllerTest.php
index ac4d6cdc..8b49c0ae 100644
--- a/tests/Wallabag/ApiBundle/Controller/WallabagRestControllerTest.php
+++ b/tests/Wallabag/ApiBundle/Controller/WallabagRestControllerTest.php
@@ -18,4 +18,21 @@ class WallabagRestControllerTest extends WallabagApiTestCase
        $this->assertSame($client->getContainer()->getParameter('wallabag_core.version'), $content);
    }
+    public function testGetInfo()
+    {
+        // create a new client instead of using $this->client to be sure client isn't authenticated
+        $client = static::createClient();
+        $client->request('GET', '/api/info');
+        $this->assertSame(200, $client->getResponse()->getStatusCode());
+        $content = json_decode($client->getResponse()->getContent(), true);
+        $this->assertArrayHasKey('appname', $content);
+        $this->assertArrayHasKey('version', $content);
+        $this->assertArrayHasKey('allowed_registration', $content);
+        $this->assertSame('wallabag', $content['appname']);
+    }
 }
diff --git a/tests/Wallabag/ApiBundle/WallabagApiTestCase.php b/tests/Wallabag/ApiBundle/WallabagApiTestCase.php
index 8a188e1c..fd2e113e 100644
--- a/tests/Wallabag/ApiBundle/WallabagApiTestCase.php
+++ b/tests/Wallabag/ApiBundle/WallabagApiTestCase.php
@@ -31,9 +31,9 @@ abstract class WallabagApiTestCase extends WebTestCase
        $container = $client->getContainer();
        /** @var $userManager \FOS\UserBundle\Doctrine\UserManager */
-        $userManager = $container->get('fos_user.user_manager');
+        $userManager = $container->get('fos_user.user_manager.test');
        /** @var $loginManager \FOS\UserBundle\Security\LoginManager */
-        $loginManager = $container->get('fos_user.security.login_manager');
+        $loginManager = $container->get('fos_user.security.login_manager.test');
        $firewallName = $container->getParameter('fos_user.firewall_name');
        $this->user = $userManager->findUserBy(['username' => 'admin']);
@@ -48,4 +48,23 @@ abstract class WallabagApiTestCase extends WebTestCase
        return $client;
    }
+    /**
+     * Return the ID for the user admin.
+     * Used because on heavy testing we don't want to re-create the database on each run.
+     * Which means "admin" user won't have id 1 all the time.
+     *
+     * @param string $username
+     *
+     * @return int
+     */
+    protected function getUserId($username = 'admin')
+    {
+        return $this->client
+            ->getContainer()
+            ->get('doctrine.orm.entity_manager')
+            ->getRepository('WallabagUserBundle:User')
+            ->findOneByUserName($username)
+            ->getId();
+    }
 }
diff --git a/tests/Wallabag/CoreBundle/Command/GenerateUrlHashesCommandTest.php b/tests/Wallabag/CoreBundle/Command/GenerateUrlHashesCommandTest.php
new file mode 100644
index 00000000..17eed210
--- /dev/null
+++ b/tests/Wallabag/CoreBundle/Command/GenerateUrlHashesCommandTest.php
@@ -0,0 +1,98 @@
+<?php
+namespace Tests\Wallabag\CoreBundle\Command;
+use Symfony\Bundle\FrameworkBundle\Console\Application;
+use Symfony\Component\Console\Tester\CommandTester;
+use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;
+use Wallabag\CoreBundle\Command\GenerateUrlHashesCommand;
+use Wallabag\CoreBundle\Entity\Entry;
+class GenerateUrlHashesCommandTest extends WallabagCoreTestCase
+{
+    public function testRunGenerateUrlHashesCommand()
+    {
+        $application = new Application($this->getClient()->getKernel());
+        $application->add(new GenerateUrlHashesCommand());
+        $command = $application->find('wallabag:generate-hashed-urls');
+        $tester = new CommandTester($command);
+        $tester->execute([
+            'command' => $command->getName(),
+        ]);
+        $this->assertContains('Generating hashed urls for "3" users', $tester->getDisplay());
+        $this->assertContains('Finished generated hashed urls', $tester->getDisplay());
+    }
+    public function testRunGenerateUrlHashesCommandWithBadUsername()
+    {
+        $application = new Application($this->getClient()->getKernel());
+        $application->add(new GenerateUrlHashesCommand());
+        $command = $application->find('wallabag:generate-hashed-urls');
+        $tester = new CommandTester($command);
+        $tester->execute([
+            'command' => $command->getName(),
+            'username' => 'unknown',
+        ]);
+        $this->assertContains('User "unknown" not found', $tester->getDisplay());
+    }
+    public function testRunGenerateUrlHashesCommandForUser()
+    {
+        $application = new Application($this->getClient()->getKernel());
+        $application->add(new GenerateUrlHashesCommand());
+        $command = $application->find('wallabag:generate-hashed-urls');
+        $tester = new CommandTester($command);
+        $tester->execute([
+            'command' => $command->getName(),
+            'username' => 'admin',
+        ]);
+        $this->assertContains('Generated hashed urls for user: admin', $tester->getDisplay());
+    }
+    public function testGenerateUrls()
+    {
+        $url = 'http://www.lemonde.fr/sport/visuel/2017/05/05/rondelle-prison-blanchissage-comprendre-le-hockey-sur-glace_5122587_3242.html';
+        $client = $this->getClient();
+        $em = $client->getContainer()->get('doctrine.orm.entity_manager');
+        $this->logInAs('admin');
+        $user = $em->getRepository('WallabagUserBundle:User')->findOneById($this->getLoggedInUserId());
+        $entry1 = new Entry($user);
+        $entry1->setUrl($url);
+        $em->persist($entry1);
+        $em->flush();
+        $application = new Application($this->getClient()->getKernel());
+        $application->add(new GenerateUrlHashesCommand());
+        $command = $application->find('wallabag:generate-hashed-urls');
+        $tester = new CommandTester($command);
+        $tester->execute([
+            'command' => $command->getName(),
+            'username' => 'admin',
+        ]);
+        $this->assertContains('Generated hashed urls for user: admin', $tester->getDisplay());
+        $entry = $em->getRepository('WallabagCoreBundle:Entry')->findOneByUrl($url);
+        $this->assertSame($entry->getHashedUrl(), hash('sha1', $url));
+        $query = $em->createQuery('DELETE FROM Wallabag\CoreBundle\Entity\Entry e WHERE e.url = :url');
+        $query->setParameter('url', $url);
+        $query->execute();
+    }
+}
diff --git a/tests/Wallabag/CoreBundle/Command/InstallCommandTest.php b/tests/Wallabag/CoreBundle/Command/InstallCommandTest.php
index bd351b18..d8928451 100644
--- a/tests/Wallabag/CoreBundle/Command/InstallCommandTest.php
+++ b/tests/Wallabag/CoreBundle/Command/InstallCommandTest.php
@@ -18,6 +18,18 @@ use Wallabag\CoreBundle\Command\InstallCommand;
 class InstallCommandTest extends WallabagCoreTestCase
 {
+    public static function setUpBeforeClass()
+    {
+        // disable doctrine-test-bundle
+        StaticDriver::setKeepStaticConnections(false);
+    }
+    public static function tearDownAfterClass()
+    {
+        // enable doctrine-test-bundle
+        StaticDriver::setKeepStaticConnections(true);
+    }
    public function setUp()
    {
        parent::setUp();
@@ -51,9 +63,6 @@ class InstallCommandTest extends WallabagCoreTestCase
            parent::setUp();
        }
-        // disable doctrine-test-bundle
-        StaticDriver::setKeepStaticConnections(false);
        $this->resetDatabase($this->getClient());
    }
@@ -62,6 +71,7 @@ class InstallCommandTest extends WallabagCoreTestCase
        $databasePath = getenv('TEST_DATABASE_PATH');
        // Remove variable environnement
        putenv('TEST_DATABASE_PATH');
        if ($databasePath && file_exists($databasePath)) {
            unlink($databasePath);
        } else {
@@ -71,8 +81,6 @@ class InstallCommandTest extends WallabagCoreTestCase
            $this->resetDatabase($client);
        }
-        // enable doctrine-test-bundle
-        StaticDriver::setKeepStaticConnections(true);
        parent::tearDown();
    }
diff --git a/tests/Wallabag/CoreBundle/Command/ReloadEntryCommandTest.php b/tests/Wallabag/CoreBundle/Command/ReloadEntryCommandTest.php
index b13f6519..c4bd6dac 100644
--- a/tests/Wallabag/CoreBundle/Command/ReloadEntryCommandTest.php
+++ b/tests/Wallabag/CoreBundle/Command/ReloadEntryCommandTest.php
@@ -26,7 +26,7 @@ class ReloadEntryCommandTest extends WallabagCoreTestCase
    {
        parent::setUp();
-        $userRepository = $this->getClient()->getContainer()->get('wallabag_user.user_repository');
+        $userRepository = $this->getClient()->getContainer()->get('wallabag_user.user_repository.test');
        $user = $userRepository->findOneByUserName('admin');
        $this->adminEntry = new Entry($user);
@@ -60,7 +60,7 @@ class ReloadEntryCommandTest extends WallabagCoreTestCase
        $reloadedEntries = $this->getClient()
            ->getContainer()
-            ->get('wallabag_core.entry_repository')
+            ->get('wallabag_core.entry_repository.test')
            ->findById([$this->adminEntry->getId(), $this->bobEntry->getId()]);
        foreach ($reloadedEntries as $reloadedEntry) {
@@ -84,7 +84,7 @@ class ReloadEntryCommandTest extends WallabagCoreTestCase
            'interactive' => false,
        ]);
-        $entryRepository = $this->getClient()->getContainer()->get('wallabag_core.entry_repository');
+        $entryRepository = $this->getClient()->getContainer()->get('wallabag_core.entry_repository.test');
        $reloadedAdminEntry = $entryRepository->find($this->adminEntry->getId());
        $this->assertNotEmpty($reloadedAdminEntry->getContent());
diff --git a/tests/Wallabag/CoreBundle/Command/ShowUserCommandTest.php b/tests/Wallabag/CoreBundle/Command/ShowUserCommandTest.php
index 9b34f2a0..ed383a2c 100644
--- a/tests/Wallabag/CoreBundle/Command/ShowUserCommandTest.php
+++ b/tests/Wallabag/CoreBundle/Command/ShowUserCommandTest.php
@@ -59,7 +59,8 @@ class ShowUserCommandTest extends WallabagCoreTestCase
        $this->assertContains('Username: admin', $tester->getDisplay());
        $this->assertContains('Email: bigboss@wallabag.org', $tester->getDisplay());
        $this->assertContains('Display name: Big boss', $tester->getDisplay());
-        $this->assertContains('2FA activated: no', $tester->getDisplay());
+        $this->assertContains('2FA (email) activated', $tester->getDisplay());
+        $this->assertContains('2FA (OTP) activated', $tester->getDisplay());
    }
    public function testShowUser()
diff --git a/tests/Wallabag/CoreBundle/Controller/ConfigControllerTest.php b/tests/Wallabag/CoreBundle/Controller/ConfigControllerTest.php
index e07c57dd..d8478ce3 100644
--- a/tests/Wallabag/CoreBundle/Controller/ConfigControllerTest.php
+++ b/tests/Wallabag/CoreBundle/Controller/ConfigControllerTest.php
@@ -1,6 +1,6 @@
 <?php
-namespace tests\Wallabag\CoreBundle\Controller;
+namespace Tests\Wallabag\CoreBundle\Controller;
 use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;
 use Wallabag\AnnotationBundle\Entity\Annotation;
@@ -33,7 +33,7 @@ class ConfigControllerTest extends WallabagCoreTestCase
        $this->assertCount(1, $crawler->filter('button[id=config_save]'));
        $this->assertCount(1, $crawler->filter('button[id=change_passwd_save]'));
        $this->assertCount(1, $crawler->filter('button[id=update_user_save]'));
-        $this->assertCount(1, $crawler->filter('button[id=rss_config_save]'));
+        $this->assertCount(1, $crawler->filter('button[id=feed_config_save]'));
    }
    public function testUpdate()
@@ -297,7 +297,7 @@ class ConfigControllerTest extends WallabagCoreTestCase
        $this->assertContains('flashes.config.notice.user_updated', $alert[0]);
    }
-    public function testRssUpdateResetToken()
+    public function testFeedUpdateResetToken()
    {
        $this->logInAs('admin');
        $client = $this->getClient();
@@ -313,7 +313,7 @@ class ConfigControllerTest extends WallabagCoreTestCase
        }
        $config = $user->getConfig();
-        $config->setRssToken(null);
+        $config->setFeedToken(null);
        $em->persist($config);
        $em->flush();
@@ -322,7 +322,7 @@ class ConfigControllerTest extends WallabagCoreTestCase
        $this->assertSame(200, $client->getResponse()->getStatusCode());
        $this->assertGreaterThan(1, $body = $crawler->filter('body')->extract(['_text']));
-        $this->assertContains('config.form_rss.no_token', $body[0]);
+        $this->assertContains('config.form_feed.no_token', $body[0]);
        $client->request('GET', '/generate-token');
        $this->assertSame(302, $client->getResponse()->getStatusCode());
@@ -330,7 +330,7 @@ class ConfigControllerTest extends WallabagCoreTestCase
        $crawler = $client->followRedirect();
        $this->assertGreaterThan(1, $body = $crawler->filter('body')->extract(['_text']));
-        $this->assertNotContains('config.form_rss.no_token', $body[0]);
+        $this->assertNotContains('config.form_feed.no_token', $body[0]);
    }
    public function testGenerateTokenAjax()
@@ -351,7 +351,7 @@ class ConfigControllerTest extends WallabagCoreTestCase
        $this->assertArrayHasKey('token', $content);
    }
-    public function testRssUpdate()
+    public function testFeedUpdate()
    {
        $this->logInAs('admin');
        $client = $this->getClient();
@@ -360,10 +360,10 @@ class ConfigControllerTest extends WallabagCoreTestCase
        $this->assertSame(200, $client->getResponse()->getStatusCode());
-        $form = $crawler->filter('button[id=rss_config_save]')->form();
+        $form = $crawler->filter('button[id=feed_config_save]')->form();
        $data = [
-            'rss_config[rss_limit]' => 12,
+            'feed_config[feed_limit]' => 12,
        ];
        $client->submit($form, $data);
@@ -372,31 +372,31 @@ class ConfigControllerTest extends WallabagCoreTestCase
        $crawler = $client->followRedirect();
-        $this->assertContains('flashes.config.notice.rss_updated', $crawler->filter('body')->extract(['_text'])[0]);
+        $this->assertContains('flashes.config.notice.feed_updated', $crawler->filter('body')->extract(['_text'])[0]);
    }
-    public function dataForRssFailed()
+    public function dataForFeedFailed()
    {
        return [
            [
                [
-                    'rss_config[rss_limit]' => 0,
+                    'feed_config[feed_limit]' => 0,
                ],
                'This value should be 1 or more.',
            ],
            [
                [
-                    'rss_config[rss_limit]' => 1000000000000,
+                    'feed_config[feed_limit]' => 1000000000000,
                ],
-                'validator.rss_limit_too_high',
+                'validator.feed_limit_too_high',
            ],
        ];
    }
    /**
-     * @dataProvider dataForRssFailed
+     * @dataProvider dataForFeedFailed
     */
-    public function testRssFailed($data, $expectedMessage)
+    public function testFeedFailed($data, $expectedMessage)
    {
        $this->logInAs('admin');
        $client = $this->getClient();
@@ -405,7 +405,7 @@ class ConfigControllerTest extends WallabagCoreTestCase
        $this->assertSame(200, $client->getResponse()->getStatusCode());
-        $form = $crawler->filter('button[id=rss_config_save]')->form();
+        $form = $crawler->filter('button[id=feed_config_save]')->form();
        $crawler = $client->submit($form, $data);
@@ -849,7 +849,7 @@ class ConfigControllerTest extends WallabagCoreTestCase
        $entryArchived->setContent('Youhou');
        $entryArchived->setTitle('Youhou');
        $entryArchived->addTag($tagArchived);
-        $entryArchived->setArchived(true);
+        $entryArchived->updateArchived(true);
        $em->persist($entryArchived);
        $annotationArchived = new Annotation($user);
@@ -965,4 +965,120 @@ class ConfigControllerTest extends WallabagCoreTestCase
        $client->request('GET', '/config/view-mode');
    }
+    public function testChangeLocaleWithoutReferer()
+    {
+        $client = $this->getClient();
+        $client->request('GET', '/locale/de');
+        $client->followRedirect();
+        $this->assertSame('de', $client->getRequest()->getLocale());
+        $this->assertSame('de', $client->getContainer()->get('session')->get('_locale'));
+    }
+    public function testChangeLocaleWithReferer()
+    {
+        $client = $this->getClient();
+        $client->request('GET', '/login');
+        $client->request('GET', '/locale/de');
+        $client->followRedirect();
+        $this->assertSame('de', $client->getRequest()->getLocale());
+        $this->assertSame('de', $client->getContainer()->get('session')->get('_locale'));
+    }
+    public function testChangeLocaleToBadLocale()
+    {
+        $client = $this->getClient();
+        $client->request('GET', '/login');
+        $client->request('GET', '/locale/yuyuyuyu');
+        $client->followRedirect();
+        $this->assertNotSame('yuyuyuyu', $client->getRequest()->getLocale());
+        $this->assertNotSame('yuyuyuyu', $client->getContainer()->get('session')->get('_locale'));
+    }
+    public function testUserEnable2faEmail()
+    {
+        $this->logInAs('admin');
+        $client = $this->getClient();
+        $crawler = $client->request('GET', '/config/otp/email');
+        $this->assertSame(302, $client->getResponse()->getStatusCode());
+        $crawler = $client->followRedirect();
+        $this->assertGreaterThan(1, $alert = $crawler->filter('body')->extract(['_text']));
+        $this->assertContains('flashes.config.notice.otp_enabled', $alert[0]);
+        // restore user
+        $em = $this->getEntityManager();
+        $user = $em
+            ->getRepository('WallabagUserBundle:User')
+            ->findOneByUsername('admin');
+        $this->assertTrue($user->isEmailTwoFactor());
+        $user->setEmailTwoFactor(false);
+        $em->persist($user);
+        $em->flush();
+    }
+    public function testUserEnable2faGoogle()
+    {
+        $this->logInAs('admin');
+        $client = $this->getClient();
+        $crawler = $client->request('GET', '/config/otp/app');
+        $this->assertSame(200, $client->getResponse()->getStatusCode());
+        // restore user
+        $em = $this->getEntityManager();
+        $user = $em
+            ->getRepository('WallabagUserBundle:User')
+            ->findOneByUsername('admin');
+        $this->assertTrue($user->isGoogleTwoFactor());
+        $this->assertGreaterThan(0, $user->getBackupCodes());
+        $user->setGoogleAuthenticatorSecret(false);
+        $user->setBackupCodes(null);
+        $em->persist($user);
+        $em->flush();
+    }
+    public function testUserEnable2faGoogleCancel()
+    {
+        $this->logInAs('admin');
+        $client = $this->getClient();
+        $crawler = $client->request('GET', '/config/otp/app');
+        $this->assertSame(200, $client->getResponse()->getStatusCode());
+        // restore user
+        $em = $this->getEntityManager();
+        $user = $em
+            ->getRepository('WallabagUserBundle:User')
+            ->findOneByUsername('admin');
+        $this->assertTrue($user->isGoogleTwoFactor());
+        $this->assertGreaterThan(0, $user->getBackupCodes());
+        $crawler = $client->request('GET', '/config/otp/app/cancel');
+        $this->assertSame(302, $client->getResponse()->getStatusCode());
+        $user = $em
+            ->getRepository('WallabagUserBundle:User')
+            ->findOneByUsername('admin');
+        $this->assertFalse($user->isGoogleTwoFactor());
+        $this->assertEmpty($user->getBackupCodes());
+    }
 }
diff --git a/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php b/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php
index 265e4205..9dee9891 100644
--- a/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php
+++ b/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php
@@ -522,9 +522,12 @@ class EntryControllerTest extends WallabagCoreTestCase
        $crawler = $client->followRedirect();
-        $this->assertGreaterThan(1, $title = $crawler->filter('div[id=article] h1')->extract(['_text']));
+        $title = $crawler->filter('div[id=article] h1')->extract(['_text']);
+        $this->assertGreaterThan(1, $title);
        $this->assertContains('My updated title hehe :)', $title[0]);
-        $this->assertSame(1, \count($stats = $crawler->filter('div[class=tools] ul[class=stats] li a[class=tool]')->extract(['_text'])));
+        $stats = $crawler->filter('div[class=tools] ul[class=stats] li a[class=tool]')->extract(['_text']);
+        $this->assertCount(1, $stats);
        $this->assertNotContains('example.io', trim($stats[0]));
    }
@@ -620,7 +623,7 @@ class EntryControllerTest extends WallabagCoreTestCase
        $content->setMimetype('text/html');
        $content->setTitle('test title entry');
        $content->setContent('This is my content /o/');
-        $content->setArchived(true);
+        $content->updateArchived(true);
        $content->setLanguage('fr');
        $em->persist($content);
@@ -773,7 +776,7 @@ class EntryControllerTest extends WallabagCoreTestCase
        $entry = new Entry($this->getLoggedInUser());
        $entry->setUrl($this->url);
-        $entry->setArchived(false);
+        $entry->updateArchived(false);
        $this->getEntityManager()->persist($entry);
        $this->getEntityManager()->flush();
@@ -984,8 +987,13 @@ class EntryControllerTest extends WallabagCoreTestCase
        $client->request('GET', '/share/' . $content->getId());
        $this->assertSame(302, $client->getResponse()->getStatusCode());
-        // follow link with uid
+        $shareUrl = $client->getResponse()->getTargetUrl();
-        $crawler = $client->followRedirect();
+        // use a new client to have a fresh empty session (instead of a logged one from the previous client)
+        $client->restart();
+        $client->request('GET', $shareUrl);
        $this->assertSame(200, $client->getResponse()->getStatusCode());
        $this->assertContains('max-age=25200', $client->getResponse()->headers->get('cache-control'));
        $this->assertContains('public', $client->getResponse()->headers->get('cache-control'));
@@ -1001,9 +1009,6 @@ class EntryControllerTest extends WallabagCoreTestCase
        $client->request('GET', '/share/' . $content->getUid());
        $this->assertSame(404, $client->getResponse()->getStatusCode());
-        $client->request('GET', '/view/' . $content->getId());
-        $this->assertContains('no-cache', $client->getResponse()->headers->get('cache-control'));
        // removing the share
        $client->request('GET', '/share/delete/' . $content->getId());
        $this->assertSame(302, $client->getResponse()->getStatusCode());
@@ -1244,7 +1249,7 @@ class EntryControllerTest extends WallabagCoreTestCase
        $entry = new Entry($this->getLoggedInUser());
        $entry->setUrl('http://0.0.0.0/foo/baz/qux');
        $entry->setTitle('Le manège');
-        $entry->setArchived(true);
+        $entry->updateArchived(true);
        $this->getEntityManager()->persist($entry);
        $this->getEntityManager()->flush();
@@ -1274,7 +1279,7 @@ class EntryControllerTest extends WallabagCoreTestCase
        $entry = new Entry($this->getLoggedInUser());
        $entry->setUrl('http://domain/qux');
        $entry->setTitle('Le manège');
-        $entry->setArchived(true);
+        $entry->updateArchived(true);
        $this->getEntityManager()->persist($entry);
        $this->getEntityManager()->flush();
@@ -1325,10 +1330,6 @@ class EntryControllerTest extends WallabagCoreTestCase
                'http://www.hao123.com/shequ?__noscript__-=1',
                'zh_CN',
            ],
-            'ru' => [
-                'https://www.kp.ru/daily/26879.7/3921982/',
-                'ru',
-            ],
            'pt_BR' => [
                'https://politica.estadao.com.br/noticias/eleicoes,campanha-catatonica,70002491983',
                'pt_BR',
@@ -1494,4 +1495,30 @@ class EntryControllerTest extends WallabagCoreTestCase
        $this->assertSame(sprintf('/remove-tag/%s/%s', $entry->getId(), $tag->getId()), $link);
    }
+    public function testRandom()
+    {
+        $this->logInAs('admin');
+        $client = $this->getClient();
+        $client->request('GET', '/unread/random');
+        $this->assertSame(302, $client->getResponse()->getStatusCode());
+        $this->assertContains('/view/', $client->getResponse()->getTargetUrl(), 'Unread random');
+        $client->request('GET', '/starred/random');
+        $this->assertSame(302, $client->getResponse()->getStatusCode());
+        $this->assertContains('/view/', $client->getResponse()->getTargetUrl(), 'Starred random');
+        $client->request('GET', '/archive/random');
+        $this->assertSame(302, $client->getResponse()->getStatusCode());
+        $this->assertContains('/view/', $client->getResponse()->getTargetUrl(), 'Archive random');
+        $client->request('GET', '/untagged/random');
+        $this->assertSame(302, $client->getResponse()->getStatusCode());
+        $this->assertContains('/view/', $client->getResponse()->getTargetUrl(), 'Untagged random');
+        $client->request('GET', '/all/random');
+        $this->assertSame(302, $client->getResponse()->getStatusCode());
+        $this->assertContains('/view/', $client->getResponse()->getTargetUrl(), 'All random');
+    }
 }
diff --git a/tests/Wallabag/CoreBundle/Controller/ExportControllerTest.php b/tests/Wallabag/CoreBundle/Controller/ExportControllerTest.php
index 0c3d4c83..d7ce7c45 100644
--- a/tests/Wallabag/CoreBundle/Controller/ExportControllerTest.php
+++ b/tests/Wallabag/CoreBundle/Controller/ExportControllerTest.php
@@ -180,7 +180,7 @@ class ExportControllerTest extends WallabagCoreTestCase
        $this->assertGreaterThan(1, $csv);
        // +1 for title line
-        $this->assertSame(\count($contentInDB) + 1, \count($csv));
+        $this->assertCount(\count($contentInDB) + 1, $csv);
        $this->assertSame('Title;URL;Content;Tags;"MIME Type";Language;"Creation date"', $csv[0]);
        $this->assertContains($contentInDB[0]['title'], $csv[1]);
        $this->assertContains($contentInDB[0]['url'], $csv[1]);
diff --git a/tests/Wallabag/CoreBundle/Controller/FeedControllerTest.php b/tests/Wallabag/CoreBundle/Controller/FeedControllerTest.php
new file mode 100644
index 00000000..d52d7bb8
--- /dev/null
+++ b/tests/Wallabag/CoreBundle/Controller/FeedControllerTest.php
@@ -0,0 +1,261 @@
+<?php
+namespace Tests\Wallabag\CoreBundle\Controller;
+use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;
+class FeedControllerTest extends WallabagCoreTestCase
+{
+    public function validateDom($xml, $type, $nb = null, $tagValue = null)
+    {
+        $doc = new \DOMDocument();
+        $doc->loadXML($xml);
+        $xpath = new \DOMXPath($doc);
+        $xpath->registerNamespace('a', 'http://www.w3.org/2005/Atom');
+        if (null === $nb) {
+            $this->assertGreaterThan(0, $xpath->query('//a:entry')->length);
+        } else {
+            $this->assertSame($nb, $xpath->query('//a:entry')->length);
+        }
+        $this->assertSame(1, $xpath->query('/a:feed')->length);
+        $this->assertSame(1, $xpath->query('/a:feed/a:title')->length);
+        $this->assertContains('favicon.ico', $xpath->query('/a:feed/a:icon')->item(0)->nodeValue);
+        $this->assertContains('logo-square.png', $xpath->query('/a:feed/a:logo')->item(0)->nodeValue);
+        $this->assertSame(1, $xpath->query('/a:feed/a:updated')->length);
+        $this->assertSame(1, $xpath->query('/a:feed/a:generator')->length);
+        $this->assertSame('wallabag', $xpath->query('/a:feed/a:generator')->item(0)->nodeValue);
+        $this->assertSame('admin', $xpath->query('/a:feed/a:author/a:name')->item(0)->nodeValue);
+        $this->assertSame(1, $xpath->query('/a:feed/a:subtitle')->length);
+        if (null !== $tagValue && 0 === strpos($type, 'tag')) {
+            $this->assertSame('wallabag — ' . $type . ' ' . $tagValue . ' feed', $xpath->query('/a:feed/a:title')->item(0)->nodeValue);
+            $this->assertSame('Atom feed for entries tagged with ' . $tagValue, $xpath->query('/a:feed/a:subtitle')->item(0)->nodeValue);
+        } else {
+            $this->assertSame('wallabag — ' . $type . ' feed', $xpath->query('/a:feed/a:title')->item(0)->nodeValue);
+            $this->assertSame('Atom feed for ' . $type . ' entries', $xpath->query('/a:feed/a:subtitle')->item(0)->nodeValue);
+        }
+        $this->assertSame(1, $xpath->query('/a:feed/a:link[@rel="self"]')->length);
+        $this->assertContains($type, $xpath->query('/a:feed/a:link[@rel="self"]')->item(0)->getAttribute('href'));
+        $this->assertSame(1, $xpath->query('/a:feed/a:link[@rel="last"]')->length);
+        foreach ($xpath->query('//a:entry') as $item) {
+            $this->assertSame(1, $xpath->query('a:title', $item)->length);
+            $this->assertSame(1, $xpath->query('a:link[@rel="via"]', $item)->length);
+            $this->assertSame(1, $xpath->query('a:link[@rel="alternate"]', $item)->length);
+            $this->assertSame(1, $xpath->query('a:id', $item)->length);
+            $this->assertSame(1, $xpath->query('a:published', $item)->length);
+            $this->assertSame(1, $xpath->query('a:content', $item)->length);
+        }
+    }
+    public function dataForBadUrl()
+    {
+        return [
+            [
+                '/feed/admin/YZIOAUZIAO/unread',
+            ],
+            [
+                '/feed/wallace/YZIOAUZIAO/starred',
+            ],
+            [
+                '/feed/wallace/YZIOAUZIAO/archives',
+            ],
+            [
+                '/feed/wallace/YZIOAUZIAO/all',
+            ],
+        ];
+    }
+    /**
+     * @dataProvider dataForBadUrl
+     */
+    public function testBadUrl($url)
+    {
+        $client = $this->getClient();
+        $client->request('GET', $url);
+        $this->assertSame(404, $client->getResponse()->getStatusCode());
+    }
+    public function testUnread()
+    {
+        $client = $this->getClient();
+        $em = $client->getContainer()->get('doctrine.orm.entity_manager');
+        $user = $em
+            ->getRepository('WallabagUserBundle:User')
+            ->findOneByUsername('admin');
+        $config = $user->getConfig();
+        $config->setFeedToken('SUPERTOKEN');
+        $config->setFeedLimit(2);
+        $em->persist($config);
+        $em->flush();
+        $client->request('GET', '/feed/admin/SUPERTOKEN/unread');
+        $this->assertSame(200, $client->getResponse()->getStatusCode());
+        $this->validateDom($client->getResponse()->getContent(), 'unread', 2);
+    }
+    public function testStarred()
+    {
+        $client = $this->getClient();
+        $em = $client->getContainer()->get('doctrine.orm.entity_manager');
+        $user = $em
+            ->getRepository('WallabagUserBundle:User')
+            ->findOneByUsername('admin');
+        $config = $user->getConfig();
+        $config->setFeedToken('SUPERTOKEN');
+        $config->setFeedLimit(1);
+        $em->persist($config);
+        $em->flush();
+        $client = $this->getClient();
+        $client->request('GET', '/feed/admin/SUPERTOKEN/starred');
+        $this->assertSame(200, $client->getResponse()->getStatusCode(), 1);
+        $this->validateDom($client->getResponse()->getContent(), 'starred');
+    }
+    public function testArchives()
+    {
+        $client = $this->getClient();
+        $em = $client->getContainer()->get('doctrine.orm.entity_manager');
+        $user = $em
+            ->getRepository('WallabagUserBundle:User')
+            ->findOneByUsername('admin');
+        $config = $user->getConfig();
+        $config->setFeedToken('SUPERTOKEN');
+        $config->setFeedLimit(null);
+        $em->persist($config);
+        $em->flush();
+        $client = $this->getClient();
+        $client->request('GET', '/feed/admin/SUPERTOKEN/archive');
+        $this->assertSame(200, $client->getResponse()->getStatusCode());
+        $this->validateDom($client->getResponse()->getContent(), 'archive');
+    }
+    public function testAll()
+    {
+        $client = $this->getClient();
+        $em = $client->getContainer()->get('doctrine.orm.entity_manager');
+        $user = $em
+            ->getRepository('WallabagUserBundle:User')
+            ->findOneByUsername('admin');
+        $config = $user->getConfig();
+        $config->setFeedToken('SUPERTOKEN');
+        $config->setFeedLimit(null);
+        $em->persist($config);
+        $em->flush();
+        $client = $this->getClient();
+        $client->request('GET', '/feed/admin/SUPERTOKEN/all');
+        $this->assertSame(200, $client->getResponse()->getStatusCode());
+        $this->validateDom($client->getResponse()->getContent(), 'all');
+    }
+    public function testPagination()
+    {
+        $client = $this->getClient();
+        $em = $client->getContainer()->get('doctrine.orm.entity_manager');
+        $user = $em
+            ->getRepository('WallabagUserBundle:User')
+            ->findOneByUsername('admin');
+        $config = $user->getConfig();
+        $config->setFeedToken('SUPERTOKEN');
+        $config->setFeedLimit(1);
+        $em->persist($config);
+        $em->flush();
+        $client = $this->getClient();
+        $client->request('GET', '/feed/admin/SUPERTOKEN/unread');
+        $this->assertSame(200, $client->getResponse()->getStatusCode());
+        $this->validateDom($client->getResponse()->getContent(), 'unread');
+        $client->request('GET', '/feed/admin/SUPERTOKEN/unread/2');
+        $this->assertSame(200, $client->getResponse()->getStatusCode());
+        $this->validateDom($client->getResponse()->getContent(), 'unread');
+        $client->request('GET', '/feed/admin/SUPERTOKEN/unread/3000');
+        $this->assertSame(302, $client->getResponse()->getStatusCode());
+    }
+    public function testTags()
+    {
+        $client = $this->getClient();
+        $em = $client->getContainer()->get('doctrine.orm.entity_manager');
+        $user = $em
+            ->getRepository('WallabagUserBundle:User')
+            ->findOneByUsername('admin');
+        $config = $user->getConfig();
+        $config->setFeedToken('SUPERTOKEN');
+        $config->setFeedLimit(null);
+        $em->persist($config);
+        $em->flush();
+        $client = $this->getClient();
+        $client->request('GET', '/feed/admin/SUPERTOKEN/tags/foo');
+        $this->assertSame(200, $client->getResponse()->getStatusCode());
+        $this->validateDom($client->getResponse()->getContent(), 'tag', 2, 'foo');
+        $client->request('GET', '/feed/admin/SUPERTOKEN/tags/foo/3000');
+        $this->assertSame(302, $client->getResponse()->getStatusCode());
+    }
+    public function dataForRedirect()
+    {
+        return [
+            [
+                '/admin/YZIOAUZIAO/unread.xml',
+            ],
+            [
+                '/admin/YZIOAUZIAO/starred.xml',
+            ],
+            [
+                '/admin/YZIOAUZIAO/archive.xml',
+            ],
+            [
+                '/admin/YZIOAUZIAO/all.xml',
+            ],
+            [
+                '/admin/YZIOAUZIAO/tags/foo.xml',
+            ],
+        ];
+    }
+    /**
+     * @dataProvider dataForRedirect
+     */
+    public function testRedirectFromRssToAtom($url)
+    {
+        $client = $this->getClient();
+        $client->request('GET', $url);
+        $this->assertSame(301, $client->getResponse()->getStatusCode());
+    }
+}
diff --git a/tests/Wallabag/CoreBundle/Controller/RssControllerTest.php b/tests/Wallabag/CoreBundle/Controller/RssControllerTest.php
deleted file mode 100644
index 2af6e14f..00000000
--- a/tests/Wallabag/CoreBundle/Controller/RssControllerTest.php
+++ /dev/null
@@ -1,221 +0,0 @@
-<?php
-namespace Tests\Wallabag\CoreBundle\Controller;
-use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;
-class RssControllerTest extends WallabagCoreTestCase
-{
-    public function validateDom($xml, $type, $urlPagination, $nb = null)
-    {
-        $doc = new \DOMDocument();
-        $doc->loadXML($xml);
-        $xpath = new \DOMXpath($doc);
-        if (null === $nb) {
-            $this->assertGreaterThan(0, $xpath->query('//item')->length);
-        } else {
-            $this->assertSame($nb, $xpath->query('//item')->length);
-        }
-        $this->assertSame(1, $xpath->query('/rss')->length);
-        $this->assertSame(1, $xpath->query('/rss/channel')->length);
-        $this->assertSame(1, $xpath->query('/rss/channel/title')->length);
-        $this->assertSame('wallabag - ' . $type . ' feed', $xpath->query('/rss/channel/title')->item(0)->nodeValue);
-        $this->assertSame(1, $xpath->query('/rss/channel/pubDate')->length);
-        $this->assertSame(1, $xpath->query('/rss/channel/generator')->length);
-        $this->assertSame('wallabag', $xpath->query('/rss/channel/generator')->item(0)->nodeValue);
-        $this->assertSame(1, $xpath->query('/rss/channel/description')->length);
-        $this->assertSame('wallabag ' . $type . ' elements', $xpath->query('/rss/channel/description')->item(0)->nodeValue);
-        $this->assertSame(1, $xpath->query('/rss/channel/link[@rel="self"]')->length);
-        $this->assertContains($urlPagination . '.xml', $xpath->query('/rss/channel/link[@rel="self"]')->item(0)->getAttribute('href'));
-        $this->assertSame(1, $xpath->query('/rss/channel/link[@rel="last"]')->length);
-        $this->assertContains($urlPagination . '.xml?page=', $xpath->query('/rss/channel/link[@rel="last"]')->item(0)->getAttribute('href'));
-        foreach ($xpath->query('//item') as $item) {
-            $this->assertSame(1, $xpath->query('title', $item)->length);
-            $this->assertSame(1, $xpath->query('source', $item)->length);
-            $this->assertSame(1, $xpath->query('link', $item)->length);
-            $this->assertSame(1, $xpath->query('guid', $item)->length);
-            $this->assertSame(1, $xpath->query('pubDate', $item)->length);
-            $this->assertSame(1, $xpath->query('description', $item)->length);
-        }
-    }
-    public function dataForBadUrl()
-    {
-        return [
-            [
-                '/admin/YZIOAUZIAO/unread.xml',
-            ],
-            [
-                '/wallace/YZIOAUZIAO/starred.xml',
-            ],
-            [
-                '/wallace/YZIOAUZIAO/archives.xml',
-            ],
-            [
-                '/wallace/YZIOAUZIAO/all.xml',
-            ],
-        ];
-    }
-    /**
-     * @dataProvider dataForBadUrl
-     */
-    public function testBadUrl($url)
-    {
-        $client = $this->getClient();
-        $client->request('GET', $url);
-        $this->assertSame(404, $client->getResponse()->getStatusCode());
-    }
-    public function testUnread()
-    {
-        $client = $this->getClient();
-        $em = $client->getContainer()->get('doctrine.orm.entity_manager');
-        $user = $em
-            ->getRepository('WallabagUserBundle:User')
-            ->findOneByUsername('admin');
-        $config = $user->getConfig();
-        $config->setRssToken('SUPERTOKEN');
-        $config->setRssLimit(2);
-        $em->persist($config);
-        $em->flush();
-        $client->request('GET', '/admin/SUPERTOKEN/unread.xml');
-        $this->assertSame(200, $client->getResponse()->getStatusCode());
-        $this->validateDom($client->getResponse()->getContent(), 'unread', 'unread', 2);
-    }
-    public function testStarred()
-    {
-        $client = $this->getClient();
-        $em = $client->getContainer()->get('doctrine.orm.entity_manager');
-        $user = $em
-            ->getRepository('WallabagUserBundle:User')
-            ->findOneByUsername('admin');
-        $config = $user->getConfig();
-        $config->setRssToken('SUPERTOKEN');
-        $config->setRssLimit(1);
-        $em->persist($config);
-        $em->flush();
-        $client = $this->getClient();
-        $client->request('GET', '/admin/SUPERTOKEN/starred.xml');
-        $this->assertSame(200, $client->getResponse()->getStatusCode(), 1);
-        $this->validateDom($client->getResponse()->getContent(), 'starred', 'starred');
-    }
-    public function testArchives()
-    {
-        $client = $this->getClient();
-        $em = $client->getContainer()->get('doctrine.orm.entity_manager');
-        $user = $em
-            ->getRepository('WallabagUserBundle:User')
-            ->findOneByUsername('admin');
-        $config = $user->getConfig();
-        $config->setRssToken('SUPERTOKEN');
-        $config->setRssLimit(null);
-        $em->persist($config);
-        $em->flush();
-        $client = $this->getClient();
-        $client->request('GET', '/admin/SUPERTOKEN/archive.xml');
-        $this->assertSame(200, $client->getResponse()->getStatusCode());
-        $this->validateDom($client->getResponse()->getContent(), 'archive', 'archive');
-    }
-    public function testAll()
-    {
-        $client = $this->getClient();
-        $em = $client->getContainer()->get('doctrine.orm.entity_manager');
-        $user = $em
-            ->getRepository('WallabagUserBundle:User')
-            ->findOneByUsername('admin');
-        $config = $user->getConfig();
-        $config->setRssToken('SUPERTOKEN');
-        $config->setRssLimit(null);
-        $em->persist($config);
-        $em->flush();
-        $client = $this->getClient();
-        $client->request('GET', '/admin/SUPERTOKEN/all.xml');
-        $this->assertSame(200, $client->getResponse()->getStatusCode());
-        $this->validateDom($client->getResponse()->getContent(), 'all', 'all');
-    }
-    public function testPagination()
-    {
-        $client = $this->getClient();
-        $em = $client->getContainer()->get('doctrine.orm.entity_manager');
-        $user = $em
-            ->getRepository('WallabagUserBundle:User')
-            ->findOneByUsername('admin');
-        $config = $user->getConfig();
-        $config->setRssToken('SUPERTOKEN');
-        $config->setRssLimit(1);
-        $em->persist($config);
-        $em->flush();
-        $client = $this->getClient();
-        $client->request('GET', '/admin/SUPERTOKEN/unread.xml');
-        $this->assertSame(200, $client->getResponse()->getStatusCode());
-        $this->validateDom($client->getResponse()->getContent(), 'unread', 'unread');
-        $client->request('GET', '/admin/SUPERTOKEN/unread.xml?page=2');
-        $this->assertSame(200, $client->getResponse()->getStatusCode());
-        $this->validateDom($client->getResponse()->getContent(), 'unread', 'unread');
-        $client->request('GET', '/admin/SUPERTOKEN/unread.xml?page=3000');
-        $this->assertSame(302, $client->getResponse()->getStatusCode());
-    }
-    public function testTags()
-    {
-        $client = $this->getClient();
-        $em = $client->getContainer()->get('doctrine.orm.entity_manager');
-        $user = $em
-            ->getRepository('WallabagUserBundle:User')
-            ->findOneByUsername('admin');
-        $config = $user->getConfig();
-        $config->setRssToken('SUPERTOKEN');
-        $config->setRssLimit(null);
-        $em->persist($config);
-        $em->flush();
-        $client = $this->getClient();
-        $client->request('GET', '/admin/SUPERTOKEN/tags/foo.xml');
-        $this->assertSame(200, $client->getResponse()->getStatusCode());
-        $this->validateDom($client->getResponse()->getContent(), 'tag (foo)', 'tags/foo');
-        $client->request('GET', '/admin/SUPERTOKEN/tags/foo.xml?page=3000');
-        $this->assertSame(302, $client->getResponse()->getStatusCode());
-    }
-}
diff --git a/tests/Wallabag/CoreBundle/Controller/SecurityControllerTest.php b/tests/Wallabag/CoreBundle/Controller/SecurityControllerTest.php
index 395208a2..93019b1f 100644
--- a/tests/Wallabag/CoreBundle/Controller/SecurityControllerTest.php
+++ b/tests/Wallabag/CoreBundle/Controller/SecurityControllerTest.php
@@ -13,7 +13,7 @@ class SecurityControllerTest extends WallabagCoreTestCase
        $client->followRedirects();
        $crawler = $client->request('GET', '/config');
-        $this->assertContains('config.form_rss.description', $crawler->filter('body')->extract(['_text'])[0]);
+        $this->assertContains('config.form_feed.description', $crawler->filter('body')->extract(['_text'])[0]);
    }
    public function testLoginWithout2Factor()
@@ -23,10 +23,10 @@ class SecurityControllerTest extends WallabagCoreTestCase
        $client->followRedirects();
        $crawler = $client->request('GET', '/config');
-        $this->assertContains('config.form_rss.description', $crawler->filter('body')->extract(['_text'])[0]);
+        $this->assertContains('config.form_feed.description', $crawler->filter('body')->extract(['_text'])[0]);
    }
-    public function testLoginWith2Factor()
+    public function testLoginWith2FactorEmail()
    {
        $client = $this->getClient();
@@ -42,7 +42,7 @@ class SecurityControllerTest extends WallabagCoreTestCase
        $user = $em
            ->getRepository('WallabagUserBundle:User')
            ->findOneByUsername('admin');
-        $user->setTwoFactorAuthentication(true);
+        $user->setEmailTwoFactor(true);
        $em->persist($user);
        $em->flush();
@@ -54,12 +54,12 @@ class SecurityControllerTest extends WallabagCoreTestCase
        $user = $em
            ->getRepository('WallabagUserBundle:User')
            ->findOneByUsername('admin');
-        $user->setTwoFactorAuthentication(false);
+        $user->setEmailTwoFactor(false);
        $em->persist($user);
        $em->flush();
    }
-    public function testTrustedComputer()
+    public function testLoginWith2FactorGoogle()
    {
        $client = $this->getClient();
@@ -69,15 +69,27 @@ class SecurityControllerTest extends WallabagCoreTestCase
            return;
        }
+        $client->followRedirects();
        $em = $client->getContainer()->get('doctrine.orm.entity_manager');
        $user = $em
            ->getRepository('WallabagUserBundle:User')
            ->findOneByUsername('admin');
+        $user->setGoogleAuthenticatorSecret('26LDIHYGHNELOQEM');
+        $em->persist($user);
+        $em->flush();
+        $this->logInAsUsingHttp('admin');
+        $crawler = $client->request('GET', '/config');
+        $this->assertContains('scheb_two_factor.trusted', $crawler->filter('body')->extract(['_text'])[0]);
-        $date = new \DateTime();
+        // restore user
-        $user->addTrustedComputer('ABCDEF', $date->add(new \DateInterval('P1M')));
+        $user = $em
-        $this->assertTrue($user->isTrustedComputer('ABCDEF'));
+            ->getRepository('WallabagUserBundle:User')
-        $this->assertFalse($user->isTrustedComputer('FEDCBA'));
+            ->findOneByUsername('admin');
+        $user->setGoogleAuthenticatorSecret(null);
+        $em->persist($user);
+        $em->flush();
    }
    public function testEnabledRegistration()
diff --git a/tests/Wallabag/CoreBundle/Controller/TagControllerTest.php b/tests/Wallabag/CoreBundle/Controller/TagControllerTest.php
index 768f4c07..be17dcf5 100644
--- a/tests/Wallabag/CoreBundle/Controller/TagControllerTest.php
+++ b/tests/Wallabag/CoreBundle/Controller/TagControllerTest.php
@@ -176,4 +176,49 @@ class TagControllerTest extends WallabagCoreTestCase
        $em->remove($tag);
        $em->flush();
    }
+    public function testRenameTagUsingTheFormInsideTagList()
+    {
+        $this->logInAs('admin');
+        $client = $this->getClient();
+        $tag = new Tag();
+        $tag->setLabel($this->tagName);
+        $entry = new Entry($this->getLoggedInUser());
+        $entry->setUrl('http://0.0.0.0/foo');
+        $entry->addTag($tag);
+        $this->getEntityManager()->persist($entry);
+        $this->getEntityManager()->flush();
+        $this->getEntityManager()->clear();
+        // We make a first request to set an history and test redirection after tag deletion
+        $crawler = $client->request('GET', '/tag/list');
+        $form = $crawler->filter('#tag-' . $tag->getId() . ' form')->form();
+        $data = [
+            'tag[label]' => 'specific label',
+        ];
+        $client->submit($form, $data);
+        $this->assertSame(302, $client->getResponse()->getStatusCode());
+        $freshEntry = $client->getContainer()
+            ->get('doctrine.orm.entity_manager')
+            ->getRepository('WallabagCoreBundle:Entry')
+            ->find($entry->getId());
+        $tags = $freshEntry->getTags()->toArray();
+        foreach ($tags as $key => $item) {
+            $tags[$key] = $item->getLabel();
+        }
+        $this->assertFalse(array_search($tag->getLabel(), $tags, true), 'Previous tag is not attach to entry anymore.');
+        $newTag = $client->getContainer()
+            ->get('doctrine.orm.entity_manager')
+            ->getRepository('WallabagCoreBundle:Tag')
+            ->findOneByLabel('specific label');
+        $this->assertInstanceOf(Tag::class, $newTag, 'Tag "specific label" exists.');
+        $this->assertTrue($newTag->hasEntry($freshEntry), 'Tag "specific label" is assigned to the entry.');
+    }
 }
diff --git a/tests/Wallabag/CoreBundle/Event/Listener/UserLocaleListenerTest.php b/tests/Wallabag/CoreBundle/Event/Listener/UserLocaleListenerTest.php
index 93edfde8..ff0a9602 100644
--- a/tests/Wallabag/CoreBundle/Event/Listener/UserLocaleListenerTest.php
+++ b/tests/Wallabag/CoreBundle/Event/Listener/UserLocaleListenerTest.php
@@ -56,4 +56,27 @@ class UserLocaleListenerTest extends TestCase
        $this->assertNull($session->get('_locale'));
    }
+    public function testWithLanguageFromSession()
+    {
+        $session = new Session(new MockArraySessionStorage());
+        $listener = new UserLocaleListener($session);
+        $session->set('_locale', 'de');
+        $user = new User();
+        $user->setEnabled(true);
+        $config = new Config($user);
+        $config->setLanguage('fr');
+        $user->setConfig($config);
+        $userToken = new UsernamePasswordToken($user, '', 'test');
+        $request = Request::create('/');
+        $event = new InteractiveLoginEvent($request, $userToken);
+        $listener->onInteractiveLogin($event);
+        $this->assertSame('de', $session->get('_locale'));
+    }
 }
diff --git a/tests/Wallabag/CoreBundle/GuzzleSiteAuthenticator/GrabySiteConfigBuilderTest.php b/tests/Wallabag/CoreBundle/GuzzleSiteAuthenticator/GrabySiteConfigBuilderTest.php
index 845762dc..9e0a9136 100644
--- a/tests/Wallabag/CoreBundle/GuzzleSiteAuthenticator/GrabySiteConfigBuilderTest.php
+++ b/tests/Wallabag/CoreBundle/GuzzleSiteAuthenticator/GrabySiteConfigBuilderTest.php
@@ -12,6 +12,8 @@ use Wallabag\CoreBundle\GuzzleSiteAuthenticator\GrabySiteConfigBuilder;
 class GrabySiteConfigBuilderTest extends WallabagCoreTestCase
 {
+    private $builder;
    public function testBuildConfigExists()
    {
        $grabyConfigBuilderMock = $this->getMockBuilder('Graby\SiteConfig\ConfigBuilder')
@@ -29,7 +31,7 @@ class GrabySiteConfigBuilderTest extends WallabagCoreTestCase
        $grabyConfigBuilderMock
            ->method('buildForHost')
            ->with('api.example.com')
-            ->will($this->returnValue($grabySiteConfig));
+            ->willReturn($grabySiteConfig);
        $logger = new Logger('foo');
        $handler = new TestHandler();
@@ -88,7 +90,7 @@ class GrabySiteConfigBuilderTest extends WallabagCoreTestCase
        $grabyConfigBuilderMock
            ->method('buildForHost')
            ->with('unknown.com')
-            ->will($this->returnValue(new GrabySiteConfig()));
+            ->willReturn(new GrabySiteConfig());
        $logger = new Logger('foo');
        $handler = new TestHandler();
@@ -130,6 +132,73 @@ class GrabySiteConfigBuilderTest extends WallabagCoreTestCase
        $this->assertCount(1, $records, 'One log was recorded');
    }
+    public function testBuildConfigWithBadExtraFields()
+    {
+        $grabyConfigBuilderMock = $this->getMockBuilder('Graby\SiteConfig\ConfigBuilder')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $grabySiteConfig = new GrabySiteConfig();
+        $grabySiteConfig->requires_login = true;
+        $grabySiteConfig->login_uri = 'http://www.example.com/login';
+        $grabySiteConfig->login_username_field = 'login';
+        $grabySiteConfig->login_password_field = 'password';
+        $grabySiteConfig->login_extra_fields = ['field'];
+        $grabySiteConfig->not_logged_in_xpath = '//div[@class="need-login"]';
+        $grabyConfigBuilderMock
+            ->method('buildForHost')
+            ->with('example.com')
+            ->willReturn($grabySiteConfig);
+        $logger = new Logger('foo');
+        $handler = new TestHandler();
+        $logger->pushHandler($handler);
+        $siteCrentialRepo = $this->getMockBuilder('Wallabag\CoreBundle\Repository\SiteCredentialRepository')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $siteCrentialRepo->expects($this->once())
+            ->method('findOneByHostsAndUser')
+            ->with(['example.com', '.com'], 1)
+            ->willReturn(['username' => 'foo', 'password' => 'bar']);
+        $user = $this->getMockBuilder('Wallabag\UserBundle\Entity\User')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $user->expects($this->once())
+            ->method('getId')
+            ->willReturn(1);
+        $token = new UsernamePasswordToken($user, 'pass', 'provider');
+        $tokenStorage = new TokenStorage();
+        $tokenStorage->setToken($token);
+        $this->builder = new GrabySiteConfigBuilder(
+            $grabyConfigBuilderMock,
+            $tokenStorage,
+            $siteCrentialRepo,
+            $logger
+        );
+        $config = $this->builder->buildForHost('www.example.com');
+        $this->assertSame('example.com', $config->getHost());
+        $this->assertTrue($config->requiresLogin());
+        $this->assertSame('http://www.example.com/login', $config->getLoginUri());
+        $this->assertSame('login', $config->getUsernameField());
+        $this->assertSame('password', $config->getPasswordField());
+        $this->assertSame([], $config->getExtraFields());
+        $this->assertSame('//div[@class="need-login"]', $config->getNotLoggedInXpath());
+        $this->assertSame('foo', $config->getUsername());
+        $this->assertSame('bar', $config->getPassword());
+        $records = $handler->getRecords();
+        $this->assertCount(1, $records, 'One log was recorded');
+    }
    public function testBuildConfigUserNotDefined()
    {
        $grabyConfigBuilderMock = $this->getMockBuilder('\Graby\SiteConfig\ConfigBuilder')
@@ -139,7 +208,7 @@ class GrabySiteConfigBuilderTest extends WallabagCoreTestCase
        $grabyConfigBuilderMock
            ->method('buildForHost')
            ->with('unknown.com')
-            ->will($this->returnValue(new GrabySiteConfig()));
+            ->willReturn(new GrabySiteConfig());
        $logger = new Logger('foo');
        $handler = new TestHandler();
@@ -210,7 +279,7 @@ class GrabySiteConfigBuilderTest extends WallabagCoreTestCase
        $grabyConfigBuilderMock
            ->method('buildForHost')
            ->with($host)
-            ->will($this->returnValue($grabySiteConfig));
+            ->willReturn($grabySiteConfig);
        $user = $this->getMockBuilder('Wallabag\UserBundle\Entity\User')
            ->disableOriginalConstructor()
diff --git a/tests/Wallabag/CoreBundle/Helper/ContentProxyTest.php b/tests/Wallabag/CoreBundle/Helper/ContentProxyTest.php
index 3dd9273c..9ce72c79 100644
--- a/tests/Wallabag/CoreBundle/Helper/ContentProxyTest.php
+++ b/tests/Wallabag/CoreBundle/Helper/ContentProxyTest.php
@@ -36,7 +36,9 @@ class ContentProxyTest extends TestCase
                'html' => false,
                'title' => '',
                'url' => '',
-                'content_type' => '',
+                'headers' => [
+                    'content-type' => '',
+                ],
                'language' => '',
            ]);
@@ -71,7 +73,9 @@ class ContentProxyTest extends TestCase
                'html' => false,
                'title' => '',
                'url' => '',
-                'content_type' => '',
+                'headers' => [
+                    'content-type' => '',
+                ],
                'language' => '',
            ]);
@@ -104,15 +108,14 @@ class ContentProxyTest extends TestCase
            ->method('fetchContent')
            ->willReturn([
                'html' => false,
-                'title' => '',
+                'title' => 'my title',
                'url' => '',
-                'content_type' => '',
+                'headers' => [
+                    'content-type' => '',
+                ],
                'language' => '',
                'status' => '',
-                'open_graph' => [
+                'description' => 'desc',
-                    'og_title' => 'my title',
-                    'og_description' => 'desc',
-                ],
            ]);
        $proxy = new ContentProxy($graby, $tagger, $this->getValidator(), $this->getLogger(), $this->fetchingErrorMessage);
@@ -147,13 +150,12 @@ class ContentProxyTest extends TestCase
                'html' => str_repeat('this is my content', 325),
                'title' => 'this is my title',
                'url' => 'http://1.1.1.1',
-                'content_type' => 'text/html',
                'language' => 'fr',
                'status' => '200',
-                'open_graph' => [
+                'description' => 'OG desc',
-                    'og_title' => 'my OG title',
+                'image' => 'http://3.3.3.3/cover.jpg',
-                    'og_description' => 'OG desc',
+                'headers' => [
-                    'og_image' => 'http://3.3.3.3/cover.jpg',
+                    'content-type' => 'text/html',
                ],
            ]);
@@ -163,7 +165,7 @@ class ContentProxyTest extends TestCase
        $this->assertSame('http://1.1.1.1', $entry->getUrl());
        $this->assertSame('this is my title', $entry->getTitle());
-        $this->assertContains('this is my content', $entry->getContent());
+        $this->assertContains('content', $entry->getContent());
        $this->assertSame('http://3.3.3.3/cover.jpg', $entry->getPreviewPicture());
        $this->assertSame('text/html', $entry->getMimetype());
        $this->assertSame('fr', $entry->getLanguage());
@@ -189,13 +191,12 @@ class ContentProxyTest extends TestCase
                'html' => str_repeat('this is my content', 325),
                'title' => 'this is my title',
                'url' => 'http://1.1.1.1',
-                'content_type' => 'text/html',
                'language' => 'fr',
                'status' => '200',
-                'open_graph' => [
+                'description' => 'OG desc',
-                    'og_title' => 'my OG title',
+                'image' => null,
-                    'og_description' => 'OG desc',
+                'headers' => [
-                    'og_image' => null,
+                    'content-type' => 'text/html',
                ],
            ]);
@@ -205,7 +206,7 @@ class ContentProxyTest extends TestCase
        $this->assertSame('http://1.1.1.1', $entry->getUrl());
        $this->assertSame('this is my title', $entry->getTitle());
-        $this->assertContains('this is my content', $entry->getContent());
+        $this->assertContains('content', $entry->getContent());
        $this->assertNull($entry->getPreviewPicture());
        $this->assertSame('text/html', $entry->getMimetype());
        $this->assertSame('fr', $entry->getLanguage());
@@ -214,6 +215,86 @@ class ContentProxyTest extends TestCase
        $this->assertSame('1.1.1.1', $entry->getDomainName());
    }
+    public function testWithContentAndContentImage()
+    {
+        $tagger = $this->getTaggerMock();
+        $tagger->expects($this->once())
+            ->method('tag');
+        $graby = $this->getMockBuilder('Graby\Graby')
+            ->setMethods(['fetchContent'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $graby->expects($this->any())
+            ->method('fetchContent')
+            ->willReturn([
+                'html' => "<h1>Test</h1><p><img src='http://3.3.3.3/cover.jpg'/></p>",
+                'title' => 'this is my title',
+                'url' => 'http://1.1.1.1',
+                'headers' => [
+                    'content-type' => 'text/html',
+                ],
+                'language' => 'fr',
+                'status' => '200',
+                'image' => null,
+            ]);
+        $proxy = new ContentProxy($graby, $tagger, $this->getValidator(), $this->getLogger(), $this->fetchingErrorMessage);
+        $entry = new Entry(new User());
+        $proxy->updateEntry($entry, 'http://0.0.0.0');
+        $this->assertSame('http://1.1.1.1', $entry->getUrl());
+        $this->assertSame('this is my title', $entry->getTitle());
+        $this->assertSame("<h1>Test</h1><p><img src='http://3.3.3.3/cover.jpg'/></p>", $entry->getContent());
+        $this->assertSame('http://3.3.3.3/cover.jpg', $entry->getPreviewPicture());
+        $this->assertSame('text/html', $entry->getMimetype());
+        $this->assertSame('fr', $entry->getLanguage());
+        $this->assertSame('200', $entry->getHttpStatus());
+        $this->assertSame(0.0, $entry->getReadingTime());
+        $this->assertSame('1.1.1.1', $entry->getDomainName());
+    }
+    public function testWithContentImageAndOgImage()
+    {
+        $tagger = $this->getTaggerMock();
+        $tagger->expects($this->once())
+            ->method('tag');
+        $graby = $this->getMockBuilder('Graby\Graby')
+            ->setMethods(['fetchContent'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $graby->expects($this->any())
+            ->method('fetchContent')
+            ->willReturn([
+                'html' => "<h1>Test</h1><p><img src='http://3.3.3.3/nevermind.jpg'/></p>",
+                'title' => 'this is my title',
+                'url' => 'http://1.1.1.1',
+                'headers' => [
+                    'content-type' => 'text/html',
+                ],
+                'language' => 'fr',
+                'status' => '200',
+                'image' => 'http://3.3.3.3/cover.jpg',
+            ]);
+        $proxy = new ContentProxy($graby, $tagger, $this->getValidator(), $this->getLogger(), $this->fetchingErrorMessage);
+        $entry = new Entry(new User());
+        $proxy->updateEntry($entry, 'http://0.0.0.0');
+        $this->assertSame('http://1.1.1.1', $entry->getUrl());
+        $this->assertSame('this is my title', $entry->getTitle());
+        $this->assertSame("<h1>Test</h1><p><img src='http://3.3.3.3/nevermind.jpg'/></p>", $entry->getContent());
+        $this->assertSame('http://3.3.3.3/cover.jpg', $entry->getPreviewPicture());
+        $this->assertSame('text/html', $entry->getMimetype());
+        $this->assertSame('fr', $entry->getLanguage());
+        $this->assertSame('200', $entry->getHttpStatus());
+        $this->assertSame(0.0, $entry->getReadingTime());
+        $this->assertSame('1.1.1.1', $entry->getDomainName());
+    }
    public function testWithContentAndBadLanguage()
    {
        $tagger = $this->getTaggerMock();
@@ -236,9 +317,11 @@ class ContentProxyTest extends TestCase
                'html' => str_repeat('this is my content', 325),
                'title' => 'this is my title',
                'url' => 'http://1.1.1.1',
-                'content_type' => 'text/html',
                'language' => 'dontexist',
                'status' => '200',
+                'headers' => [
+                    'content-type' => 'text/html',
+                ],
            ]);
        $proxy = new ContentProxy($graby, $tagger, $validator, $this->getLogger(), $this->fetchingErrorMessage);
@@ -247,7 +330,7 @@ class ContentProxyTest extends TestCase
        $this->assertSame('http://1.1.1.1', $entry->getUrl());
        $this->assertSame('this is my title', $entry->getTitle());
-        $this->assertContains('this is my content', $entry->getContent());
+        $this->assertContains('content', $entry->getContent());
        $this->assertSame('text/html', $entry->getMimetype());
        $this->assertNull($entry->getLanguage());
        $this->assertSame('200', $entry->getHttpStatus());
@@ -280,14 +363,13 @@ class ContentProxyTest extends TestCase
                'html' => str_repeat('this is my content', 325),
                'title' => 'this is my title',
                'url' => 'http://1.1.1.1',
-                'content_type' => 'text/html',
+                'headers' => [
+                    'content-type' => 'text/html',
+                ],
                'language' => 'fr',
                'status' => '200',
-                'open_graph' => [
+                'description' => 'OG desc',
-                    'og_title' => 'my OG title',
+                'image' => 'https://',
-                    'og_description' => 'OG desc',
-                    'og_image' => 'https://',
-                ],
            ]);
        $proxy = new ContentProxy($graby, $tagger, $validator, $this->getLogger(), $this->fetchingErrorMessage);
@@ -296,7 +378,7 @@ class ContentProxyTest extends TestCase
        $this->assertSame('http://1.1.1.1', $entry->getUrl());
        $this->assertSame('this is my title', $entry->getTitle());
-        $this->assertContains('this is my content', $entry->getContent());
+        $this->assertContains('content', $entry->getContent());
        $this->assertNull($entry->getPreviewPicture());
        $this->assertSame('text/html', $entry->getMimetype());
        $this->assertSame('fr', $entry->getLanguage());
@@ -320,19 +402,19 @@ class ContentProxyTest extends TestCase
                'html' => str_repeat('this is my content', 325),
                'title' => 'this is my title',
                'url' => 'http://1.1.1.1',
-                'content_type' => 'text/html',
                'language' => 'fr',
                'date' => '1395635872',
                'authors' => ['Jeremy', 'Nico', 'Thomas'],
-                'all_headers' => [
+                'headers' => [
-                    'Cache-Control' => 'no-cache',
+                    'cache-control' => 'no-cache',
+                    'content-type' => 'text/html',
                ],
            ]
        );
        $this->assertSame('http://1.1.1.1', $entry->getUrl());
        $this->assertSame('this is my title', $entry->getTitle());
-        $this->assertContains('this is my content', $entry->getContent());
+        $this->assertContains('content', $entry->getContent());
        $this->assertSame('text/html', $entry->getMimetype());
        $this->assertSame('fr', $entry->getLanguage());
        $this->assertSame(4.0, $entry->getReadingTime());
@@ -363,15 +445,17 @@ class ContentProxyTest extends TestCase
                'html' => str_repeat('this is my content', 325),
                'title' => 'this is my title',
                'url' => 'http://1.1.1.1',
-                'content_type' => 'text/html',
                'language' => 'fr',
                'date' => '2016-09-08T11:55:58+0200',
+                'headers' => [
+                    'content-type' => 'text/html',
+                ],
            ]
        );
        $this->assertSame('http://1.1.1.1', $entry->getUrl());
        $this->assertSame('this is my title', $entry->getTitle());
-        $this->assertContains('this is my content', $entry->getContent());
+        $this->assertContains('content', $entry->getContent());
        $this->assertSame('text/html', $entry->getMimetype());
        $this->assertSame('fr', $entry->getLanguage());
        $this->assertSame(4.0, $entry->getReadingTime());
@@ -398,15 +482,17 @@ class ContentProxyTest extends TestCase
                'html' => str_repeat('this is my content', 325),
                'title' => 'this is my title',
                'url' => 'http://1.1.1.1',
-                'content_type' => 'text/html',
                'language' => 'fr',
                'date' => '01 02 2012',
+                'headers' => [
+                    'content-type' => 'text/html',
+                ],
            ]
        );
        $this->assertSame('http://1.1.1.1', $entry->getUrl());
        $this->assertSame('this is my title', $entry->getTitle());
-        $this->assertContains('this is my content', $entry->getContent());
+        $this->assertContains('content', $entry->getContent());
        $this->assertSame('text/html', $entry->getMimetype());
        $this->assertSame('fr', $entry->getLanguage());
        $this->assertSame(4.0, $entry->getReadingTime());
@@ -415,7 +501,7 @@ class ContentProxyTest extends TestCase
        $records = $handler->getRecords();
-        $this->assertCount(1, $records);
+        $this->assertCount(3, $records);
        $this->assertContains('Error while defining date', $records[0]['message']);
    }
@@ -435,8 +521,10 @@ class ContentProxyTest extends TestCase
                'html' => str_repeat('this is my content', 325),
                'title' => 'this is my title',
                'url' => 'http://1.1.1.1',
-                'content_type' => 'text/html',
                'language' => 'fr',
+                'headers' => [
+                    'content-type' => 'text/html',
+                ],
            ]
        );
@@ -475,13 +563,13 @@ class ContentProxyTest extends TestCase
                'html' => $html,
                'title' => 'this is my title',
                'url' => 'http://1.1.1.1',
-                'content_type' => 'text/html',
                'language' => 'fr',
                'status' => '200',
-                'open_graph' => [
+                //'og_title' => 'my OG title',
-                    'og_title' => 'my OG title',
+                'description' => 'OG desc',
-                    'og_description' => 'OG desc',
+                'image' => 'http://3.3.3.3/cover.jpg',
-                    'og_image' => 'http://3.3.3.3/cover.jpg',
+                'headers' => [
+                    'content-type' => 'text/html',
                ],
            ]
        );
@@ -513,9 +601,10 @@ class ContentProxyTest extends TestCase
                'html' => '<p><img src="http://1.1.1.1/image.jpg" /></p>',
                'title' => 'this is my title',
                'url' => 'http://1.1.1.1/image.jpg',
-                'content_type' => 'image/jpeg',
                'status' => '200',
-                'open_graph' => [],
+                'headers' => [
+                    'content-type' => 'image/jpeg',
+                ],
            ]);
        $proxy = new ContentProxy($graby, $tagger, $this->getValidator(), $this->getLogger(), $this->fetchingErrorMessage);
@@ -553,7 +642,9 @@ class ContentProxyTest extends TestCase
                'html' => false,
                'title' => $actualTitle,
                'url' => '',
-                'content_type' => 'text/html',
+                'headers' => [
+                    'content-type' => 'text/html',
+                ],
                'language' => '',
            ]);
@@ -588,7 +679,9 @@ class ContentProxyTest extends TestCase
                'html' => false,
                'title' => $actualTitle,
                'url' => '',
-                'content_type' => 'text/html',
+                'headers' => [
+                    'content-type' => 'text/html',
+                ],
                'language' => '',
            ]);
@@ -622,7 +715,9 @@ class ContentProxyTest extends TestCase
                'html' => false,
                'title' => $actualTitle,
                'url' => '',
-                'content_type' => 'application/pdf',
+                'headers' => [
+                    'content-type' => 'application/pdf',
+                ],
                'language' => '',
            ]);
@@ -656,7 +751,9 @@ class ContentProxyTest extends TestCase
                'html' => false,
                'title' => $actualTitle,
                'url' => '',
-                'content_type' => 'application/pdf',
+                'headers' => [
+                    'content-type' => 'application/pdf',
+                ],
                'language' => '',
            ]);
@@ -690,7 +787,9 @@ class ContentProxyTest extends TestCase
                'html' => false,
                'title' => $actualTitle,
                'url' => '',
-                'content_type' => 'application/pdf',
+                'headers' => [
+                    'content-type' => 'application/pdf',
+                ],
                'language' => '',
            ]);
@@ -725,7 +824,9 @@ class ContentProxyTest extends TestCase
                'html' => false,
                'title' => $actualTitle,
                'url' => '',
-                'content_type' => 'application/pdf',
+                'headers' => [
+                    'content-type' => 'application/pdf',
+                ],
                'language' => '',
            ]);
@@ -855,7 +956,9 @@ class ContentProxyTest extends TestCase
                'html' => false,
                'title' => '',
                'url' => $content_url,
-                'content_type' => '',
+                'headers' => [
+                    'content-type' => '',
+                ],
                'language' => '',
            ],
            true
@@ -886,7 +989,9 @@ class ContentProxyTest extends TestCase
    }
    /**
-     * https://stackoverflow.com/a/18506801.
+     * Convert hex to string.
+     *
+     * @see https://stackoverflow.com/a/18506801
     *
     * @param $hex
     *
diff --git a/tests/Wallabag/CoreBundle/Helper/DownloadImagesTest.php b/tests/Wallabag/CoreBundle/Helper/DownloadImagesTest.php
index cda5f843..3c720425 100644
--- a/tests/Wallabag/CoreBundle/Helper/DownloadImagesTest.php
+++ b/tests/Wallabag/CoreBundle/Helper/DownloadImagesTest.php
@@ -2,10 +2,8 @@
 namespace Tests\Wallabag\CoreBundle\Helper;
-use GuzzleHttp\Client;
+use GuzzleHttp\Psr7\Response;
-use GuzzleHttp\Message\Response;
+use Http\Mock\Client as HttpMockClient;
-use GuzzleHttp\Stream\Stream;
-use GuzzleHttp\Subscriber\Mock;
 use Monolog\Handler\TestHandler;
 use Monolog\Logger;
 use PHPUnit\Framework\TestCase;
@@ -32,18 +30,14 @@ class DownloadImagesTest extends TestCase
     */
    public function testProcessHtml($html, $url)
    {
-        $client = new Client();
+        $httpMockClient = new HttpMockClient();
-        $mock = new Mock([
+        $httpMockClient->addResponse(new Response(200, ['content-type' => 'image/png'], file_get_contents(__DIR__ . '/../fixtures/unnamed.png')));
-            new Response(200, ['content-type' => 'image/png'], Stream::factory(file_get_contents(__DIR__ . '/../fixtures/unnamed.png'))),
-        ]);
-        $client->getEmitter()->attach($mock);
        $logHandler = new TestHandler();
        $logger = new Logger('test', [$logHandler]);
-        $download = new DownloadImages($client, sys_get_temp_dir() . '/wallabag_test', 'http://wallabag.io/', $logger);
+        $download = new DownloadImages($httpMockClient, sys_get_temp_dir() . '/wallabag_test', 'http://wallabag.io/', $logger);
        $res = $download->processHtml(123, $html, $url);
@@ -53,18 +47,13 @@ class DownloadImagesTest extends TestCase
    public function testProcessHtmlWithBadImage()
    {
-        $client = new Client();
+        $httpMockClient = new HttpMockClient();
+        $httpMockClient->addResponse(new Response(200, ['content-type' => 'application/json'], ''));
-        $mock = new Mock([
-            new Response(200, ['content-type' => 'application/json'], Stream::factory('')),
-        ]);
-        $client->getEmitter()->attach($mock);
        $logHandler = new TestHandler();
        $logger = new Logger('test', [$logHandler]);
-        $download = new DownloadImages($client, sys_get_temp_dir() . '/wallabag_test', 'http://wallabag.io/', $logger);
+        $download = new DownloadImages($httpMockClient, sys_get_temp_dir() . '/wallabag_test', 'http://wallabag.io/', $logger);
        $res = $download->processHtml(123, '<div><img src="http://i.imgur.com/T9qgcHc.jpg" /></div>', 'http://imgur.com/gallery/WxtWY');
        $this->assertContains('http://i.imgur.com/T9qgcHc.jpg', $res, 'Image were not replace because of content-type');
@@ -85,18 +74,13 @@ class DownloadImagesTest extends TestCase
     */
    public function testProcessSingleImage($header, $extension)
    {
-        $client = new Client();
+        $httpMockClient = new HttpMockClient();
+        $httpMockClient->addResponse(new Response(200, ['content-type' => $header], file_get_contents(__DIR__ . '/../fixtures/unnamed.png')));
-        $mock = new Mock([
-            new Response(200, ['content-type' => $header], Stream::factory(file_get_contents(__DIR__ . '/../fixtures/unnamed.png'))),
-        ]);
-        $client->getEmitter()->attach($mock);
        $logHandler = new TestHandler();
        $logger = new Logger('test', [$logHandler]);
-        $download = new DownloadImages($client, sys_get_temp_dir() . '/wallabag_test', 'http://wallabag.io/', $logger);
+        $download = new DownloadImages($httpMockClient, sys_get_temp_dir() . '/wallabag_test', 'http://wallabag.io/', $logger);
        $res = $download->processSingleImage(123, 'T9qgcHc.jpg', 'http://imgur.com/gallery/WxtWY');
        $this->assertContains('/assets/images/9/b/9b0ead26/ebe60399.' . $extension, $res);
@@ -104,18 +88,13 @@ class DownloadImagesTest extends TestCase
    public function testProcessSingleImageWithBadUrl()
    {
-        $client = new Client();
+        $httpMockClient = new HttpMockClient();
+        $httpMockClient->addResponse(new Response(404, []));
-        $mock = new Mock([
-            new Response(404, []),
-        ]);
-        $client->getEmitter()->attach($mock);
        $logHandler = new TestHandler();
        $logger = new Logger('test', [$logHandler]);
-        $download = new DownloadImages($client, sys_get_temp_dir() . '/wallabag_test', 'http://wallabag.io/', $logger);
+        $download = new DownloadImages($httpMockClient, sys_get_temp_dir() . '/wallabag_test', 'http://wallabag.io/', $logger);
        $res = $download->processSingleImage(123, 'T9qgcHc.jpg', 'http://imgur.com/gallery/WxtWY');
        $this->assertFalse($res, 'Image can not be found, so it will not be replaced');
@@ -123,18 +102,13 @@ class DownloadImagesTest extends TestCase
    public function testProcessSingleImageWithBadImage()
    {
-        $client = new Client();
+        $httpMockClient = new HttpMockClient();
+        $httpMockClient->addResponse(new Response(200, ['content-type' => 'image/png'], ''));
-        $mock = new Mock([
-            new Response(200, ['content-type' => 'image/png'], Stream::factory('')),
-        ]);
-        $client->getEmitter()->attach($mock);
        $logHandler = new TestHandler();
        $logger = new Logger('test', [$logHandler]);
-        $download = new DownloadImages($client, sys_get_temp_dir() . '/wallabag_test', 'http://wallabag.io/', $logger);
+        $download = new DownloadImages($httpMockClient, sys_get_temp_dir() . '/wallabag_test', 'http://wallabag.io/', $logger);
        $res = $download->processSingleImage(123, 'http://i.imgur.com/T9qgcHc.jpg', 'http://imgur.com/gallery/WxtWY');
        $this->assertFalse($res, 'Image can not be loaded, so it will not be replaced');
@@ -142,18 +116,13 @@ class DownloadImagesTest extends TestCase
    public function testProcessSingleImageFailAbsolute()
    {
-        $client = new Client();
+        $httpMockClient = new HttpMockClient();
+        $httpMockClient->addResponse(new Response(200, ['content-type' => 'image/png'], file_get_contents(__DIR__ . '/../fixtures/unnamed.png')));
-        $mock = new Mock([
-            new Response(200, ['content-type' => 'image/png'], Stream::factory(file_get_contents(__DIR__ . '/../fixtures/unnamed.png'))),
-        ]);
-        $client->getEmitter()->attach($mock);
        $logHandler = new TestHandler();
        $logger = new Logger('test', [$logHandler]);
-        $download = new DownloadImages($client, sys_get_temp_dir() . '/wallabag_test', 'http://wallabag.io/', $logger);
+        $download = new DownloadImages($httpMockClient, sys_get_temp_dir() . '/wallabag_test', 'http://wallabag.io/', $logger);
        $res = $download->processSingleImage(123, '/i.imgur.com/T9qgcHc.jpg', 'imgur.com/gallery/WxtWY');
        $this->assertFalse($res, 'Absolute image can not be determined, so it will not be replaced');
@@ -161,18 +130,13 @@ class DownloadImagesTest extends TestCase
    public function testProcessRealImage()
    {
-        $client = new Client();
+        $httpMockClient = new HttpMockClient();
+        $httpMockClient->addResponse(new Response(200, ['content-type' => null], file_get_contents(__DIR__ . '/../fixtures/image-no-content-type.jpg')));
-        $mock = new Mock([
-            new Response(200, ['content-type' => null], Stream::factory(file_get_contents(__DIR__ . '/../fixtures/image-no-content-type.jpg'))),
-        ]);
-        $client->getEmitter()->attach($mock);
        $logHandler = new TestHandler();
        $logger = new Logger('test', [$logHandler]);
-        $download = new DownloadImages($client, sys_get_temp_dir() . '/wallabag_test', 'http://wallabag.io/', $logger);
+        $download = new DownloadImages($httpMockClient, sys_get_temp_dir() . '/wallabag_test', 'http://wallabag.io/', $logger);
        $res = $download->processSingleImage(
            123,
@@ -186,20 +150,15 @@ class DownloadImagesTest extends TestCase
    public function testProcessImageWithSrcset()
    {
-        $client = new Client();
+        $httpMockClient = new HttpMockClient();
+        $httpMockClient->addResponse(new Response(200, ['content-type' => null], file_get_contents(__DIR__ . '/../fixtures/image-no-content-type.jpg')));
-        $mock = new Mock([
+        $httpMockClient->addResponse(new Response(200, ['content-type' => null], file_get_contents(__DIR__ . '/../fixtures/image-no-content-type.jpg')));
-            new Response(200, ['content-type' => 'image/jpeg'], Stream::factory(file_get_contents(__DIR__ . '/../fixtures/image-no-content-type.jpg'))),
+        $httpMockClient->addResponse(new Response(200, ['content-type' => null], file_get_contents(__DIR__ . '/../fixtures/image-no-content-type.jpg')));
-            new Response(200, ['content-type' => 'image/jpeg'], Stream::factory(file_get_contents(__DIR__ . '/../fixtures/image-no-content-type.jpg'))),
-            new Response(200, ['content-type' => 'image/jpeg'], Stream::factory(file_get_contents(__DIR__ . '/../fixtures/image-no-content-type.jpg'))),
-        ]);
-        $client->getEmitter()->attach($mock);
        $logHandler = new TestHandler();
        $logger = new Logger('test', [$logHandler]);
-        $download = new DownloadImages($client, sys_get_temp_dir() . '/wallabag_test', 'http://wallabag.io/', $logger);
+        $download = new DownloadImages($httpMockClient, sys_get_temp_dir() . '/wallabag_test', 'http://wallabag.io/', $logger);
        $res = $download->processHtml(123, '<p><img class="alignnone wp-image-1153" src="http://piketty.blog.lemonde.fr/files/2017/10/F1FR-530x375.jpg" alt="" width="628" height="444" srcset="http://piketty.blog.lemonde.fr/files/2017/10/F1FR-530x375.jpg 530w, http://piketty.blog.lemonde.fr/files/2017/10/F1FR-768x543.jpg 768w, http://piketty.blog.lemonde.fr/files/2017/10/F1FR-900x636.jpg 900w" sizes="(max-width: 628px) 100vw, 628px" /></p>', 'http://piketty.blog.lemonde.fr/2017/10/12/budget-2018-la-jeunesse-sacrifiee/');
        $this->assertNotContains('http://piketty.blog.lemonde.fr/', $res, 'Image srcset attribute were not replaced');
@@ -207,20 +166,15 @@ class DownloadImagesTest extends TestCase
    public function testProcessImageWithTrickySrcset()
    {
-        $client = new Client();
+        $httpMockClient = new HttpMockClient();
+        $httpMockClient->addResponse(new Response(200, ['content-type' => null], file_get_contents(__DIR__ . '/../fixtures/image-no-content-type.jpg')));
-        $mock = new Mock([
+        $httpMockClient->addResponse(new Response(200, ['content-type' => null], file_get_contents(__DIR__ . '/../fixtures/image-no-content-type.jpg')));
-            new Response(200, ['content-type' => 'image/jpeg'], Stream::factory(file_get_contents(__DIR__ . '/../fixtures/image-no-content-type.jpg'))),
+        $httpMockClient->addResponse(new Response(200, ['content-type' => null], file_get_contents(__DIR__ . '/../fixtures/image-no-content-type.jpg')));
-            new Response(200, ['content-type' => 'image/jpeg'], Stream::factory(file_get_contents(__DIR__ . '/../fixtures/image-no-content-type.jpg'))),
-            new Response(200, ['content-type' => 'image/jpeg'], Stream::factory(file_get_contents(__DIR__ . '/../fixtures/image-no-content-type.jpg'))),
-        ]);
-        $client->getEmitter()->attach($mock);
        $logHandler = new TestHandler();
        $logger = new Logger('test', [$logHandler]);
-        $download = new DownloadImages($client, sys_get_temp_dir() . '/wallabag_test', 'http://wallabag.io/', $logger);
+        $download = new DownloadImages($httpMockClient, sys_get_temp_dir() . '/wallabag_test', 'http://wallabag.io/', $logger);
        $res = $download->processHtml(123, '<figure id="post-257260" class="align-none media-257260"><img src="https://cdn.css-tricks.com/wp-content/uploads/2017/08/the-critical-request.png" srcset="https://res.cloudinary.com/css-tricks/image/upload/c_scale,w_1000,f_auto,q_auto/v1501594717/the-critical-request_bqdfaa.png 1000w, https://res.cloudinary.com/css-tricks/image/upload/c_scale,w_200,f_auto,q_auto/v1501594717/the-critical-request_bqdfaa.png 200w" sizes="(min-width: 1850px) calc( (100vw - 555px) / 3 )
       (min-width: 1251px) calc( (100vw - 530px) / 2 )
       (min-width: 1086px) calc(100vw - 480px)
@@ -232,18 +186,13 @@ class DownloadImagesTest extends TestCase
    public function testProcessImageWithNullPath()
    {
-        $client = new Client();
+        $httpMockClient = new HttpMockClient();
+        $httpMockClient->addResponse(new Response(200, ['content-type' => null], file_get_contents(__DIR__ . '/../fixtures/image-no-content-type.jpg')));
-        $mock = new Mock([
-            new Response(200, ['content-type' => null], Stream::factory(file_get_contents(__DIR__ . '/../fixtures/image-no-content-type.jpg'))),
-        ]);
-        $client->getEmitter()->attach($mock);
        $logHandler = new TestHandler();
        $logger = new Logger('test', [$logHandler]);
-        $download = new DownloadImages($client, sys_get_temp_dir() . '/wallabag_test', 'http://wallabag.io/', $logger);
+        $download = new DownloadImages($httpMockClient, sys_get_temp_dir() . '/wallabag_test', 'http://wallabag.io/', $logger);
        $res = $download->processSingleImage(
            123,
diff --git a/tests/Wallabag/CoreBundle/Helper/RedirectTest.php b/tests/Wallabag/CoreBundle/Helper/RedirectTest.php
index 04e1a59c..29e12cbe 100644
--- a/tests/Wallabag/CoreBundle/Helper/RedirectTest.php
+++ b/tests/Wallabag/CoreBundle/Helper/RedirectTest.php
@@ -17,6 +17,9 @@ class RedirectTest extends TestCase
    /** @var Redirect */
    private $redirect;
+    /** @var UsernamePasswordToken */
+    private $token;
    public function setUp()
    {
        $this->routerMock = $this->getMockBuilder('Symfony\Component\Routing\Router')
diff --git a/tests/Wallabag/CoreBundle/ParamConverter/UsernameRssTokenConverterTest.php b/tests/Wallabag/CoreBundle/ParamConverter/UsernameFeedTokenConverterTest.php
index b044a700..48c82dde 100644
--- a/tests/Wallabag/CoreBundle/ParamConverter/UsernameRssTokenConverterTest.php
+++ b/tests/Wallabag/CoreBundle/ParamConverter/UsernameFeedTokenConverterTest.php
@@ -1,19 +1,19 @@
 <?php
-namespace Tests\Wallabag\CoreBundle\Command;
+namespace Tests\Wallabag\CoreBundle\ParamConverter;
 use PHPUnit\Framework\TestCase;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
 use Symfony\Component\HttpFoundation\Request;
-use Wallabag\CoreBundle\ParamConverter\UsernameRssTokenConverter;
+use Wallabag\CoreBundle\ParamConverter\UsernameFeedTokenConverter;
 use Wallabag\UserBundle\Entity\User;
-class UsernameRssTokenConverterTest extends TestCase
+class UsernameFeedTokenConverterTest extends TestCase
 {
    public function testSupportsWithNoRegistry()
    {
        $params = new ParamConverter([]);
-        $converter = new UsernameRssTokenConverter();
+        $converter = new UsernameFeedTokenConverter();
        $this->assertFalse($converter->supports($params));
    }
@@ -26,10 +26,10 @@ class UsernameRssTokenConverterTest extends TestCase
        $registry->expects($this->once())
            ->method('getManagers')
-            ->will($this->returnValue([]));
+            ->willReturn([]);
        $params = new ParamConverter([]);
-        $converter = new UsernameRssTokenConverter($registry);
+        $converter = new UsernameFeedTokenConverter($registry);
        $this->assertFalse($converter->supports($params));
    }
@@ -42,10 +42,10 @@ class UsernameRssTokenConverterTest extends TestCase
        $registry->expects($this->once())
            ->method('getManagers')
-            ->will($this->returnValue(['default' => null]));
+            ->willReturn(['default' => null]);
        $params = new ParamConverter([]);
-        $converter = new UsernameRssTokenConverter($registry);
+        $converter = new UsernameFeedTokenConverter($registry);
        $this->assertFalse($converter->supports($params));
    }
@@ -58,7 +58,7 @@ class UsernameRssTokenConverterTest extends TestCase
        $meta->expects($this->once())
            ->method('getName')
-            ->will($this->returnValue('nothingrelated'));
+            ->willReturn('nothingrelated');
        $em = $this->getMockBuilder('Doctrine\Common\Persistence\ObjectManager')
            ->disableOriginalConstructor()
@@ -67,7 +67,7 @@ class UsernameRssTokenConverterTest extends TestCase
        $em->expects($this->once())
            ->method('getClassMetadata')
            ->with('superclass')
-            ->will($this->returnValue($meta));
+            ->willReturn($meta);
        $registry = $this->getMockBuilder('Doctrine\Common\Persistence\ManagerRegistry')
            ->disableOriginalConstructor()
@@ -75,15 +75,15 @@ class UsernameRssTokenConverterTest extends TestCase
        $registry->expects($this->once())
            ->method('getManagers')
-            ->will($this->returnValue(['default' => null]));
+            ->willReturn(['default' => null]);
        $registry->expects($this->once())
            ->method('getManagerForClass')
            ->with('superclass')
-            ->will($this->returnValue($em));
+            ->willReturn($em);
        $params = new ParamConverter(['class' => 'superclass']);
-        $converter = new UsernameRssTokenConverter($registry);
+        $converter = new UsernameFeedTokenConverter($registry);
        $this->assertFalse($converter->supports($params));
    }
@@ -96,7 +96,7 @@ class UsernameRssTokenConverterTest extends TestCase
        $meta->expects($this->once())
            ->method('getName')
-            ->will($this->returnValue('Wallabag\UserBundle\Entity\User'));
+            ->willReturn('Wallabag\UserBundle\Entity\User');
        $em = $this->getMockBuilder('Doctrine\Common\Persistence\ObjectManager')
            ->disableOriginalConstructor()
@@ -105,7 +105,7 @@ class UsernameRssTokenConverterTest extends TestCase
        $em->expects($this->once())
            ->method('getClassMetadata')
            ->with('WallabagUserBundle:User')
-            ->will($this->returnValue($meta));
+            ->willReturn($meta);
        $registry = $this->getMockBuilder('Doctrine\Common\Persistence\ManagerRegistry')
            ->disableOriginalConstructor()
@@ -113,15 +113,15 @@ class UsernameRssTokenConverterTest extends TestCase
        $registry->expects($this->once())
            ->method('getManagers')
-            ->will($this->returnValue(['default' => null]));
+            ->willReturn(['default' => null]);
        $registry->expects($this->once())
            ->method('getManagerForClass')
            ->with('WallabagUserBundle:User')
-            ->will($this->returnValue($em));
+            ->willReturn($em);
        $params = new ParamConverter(['class' => 'WallabagUserBundle:User']);
-        $converter = new UsernameRssTokenConverter($registry);
+        $converter = new UsernameFeedTokenConverter($registry);
        $this->assertTrue($converter->supports($params));
    }
@@ -129,7 +129,7 @@ class UsernameRssTokenConverterTest extends TestCase
    public function testApplyEmptyRequest()
    {
        $params = new ParamConverter([]);
-        $converter = new UsernameRssTokenConverter();
+        $converter = new UsernameFeedTokenConverter();
        $res = $converter->apply(new Request(), $params);
@@ -147,9 +147,9 @@ class UsernameRssTokenConverterTest extends TestCase
            ->getMock();
        $repo->expects($this->once())
-            ->method('findOneByUsernameAndRsstoken')
+            ->method('findOneByUsernameAndFeedToken')
            ->with('test', 'test')
-            ->will($this->returnValue(null));
+            ->willReturn(null);
        $em = $this->getMockBuilder('Doctrine\Common\Persistence\ObjectManager')
            ->disableOriginalConstructor()
@@ -158,7 +158,7 @@ class UsernameRssTokenConverterTest extends TestCase
        $em->expects($this->once())
            ->method('getRepository')
            ->with('WallabagUserBundle:User')
-            ->will($this->returnValue($repo));
+            ->willReturn($repo);
        $registry = $this->getMockBuilder('Doctrine\Common\Persistence\ManagerRegistry')
            ->disableOriginalConstructor()
@@ -167,10 +167,10 @@ class UsernameRssTokenConverterTest extends TestCase
        $registry->expects($this->once())
            ->method('getManagerForClass')
            ->with('WallabagUserBundle:User')
-            ->will($this->returnValue($em));
+            ->willReturn($em);
        $params = new ParamConverter(['class' => 'WallabagUserBundle:User']);
-        $converter = new UsernameRssTokenConverter($registry);
+        $converter = new UsernameFeedTokenConverter($registry);
        $request = new Request([], [], ['username' => 'test', 'token' => 'test']);
        $converter->apply($request, $params);
@@ -185,9 +185,9 @@ class UsernameRssTokenConverterTest extends TestCase
            ->getMock();
        $repo->expects($this->once())
-            ->method('findOneByUsernameAndRsstoken')
+            ->method('findOneByUsernameAndFeedtoken')
            ->with('test', 'test')
-            ->will($this->returnValue($user));
+            ->willReturn($user);
        $em = $this->getMockBuilder('Doctrine\Common\Persistence\ObjectManager')
            ->disableOriginalConstructor()
@@ -196,7 +196,7 @@ class UsernameRssTokenConverterTest extends TestCase
        $em->expects($this->once())
            ->method('getRepository')
            ->with('WallabagUserBundle:User')
-            ->will($this->returnValue($repo));
+            ->willReturn($repo);
        $registry = $this->getMockBuilder('Doctrine\Common\Persistence\ManagerRegistry')
            ->disableOriginalConstructor()
@@ -205,10 +205,10 @@ class UsernameRssTokenConverterTest extends TestCase
        $registry->expects($this->once())
            ->method('getManagerForClass')
            ->with('WallabagUserBundle:User')
-            ->will($this->returnValue($em));
+            ->willReturn($em);
        $params = new ParamConverter(['class' => 'WallabagUserBundle:User', 'name' => 'user']);
-        $converter = new UsernameRssTokenConverter($registry);
+        $converter = new UsernameFeedTokenConverter($registry);
        $request = new Request([], [], ['username' => 'test', 'token' => 'test']);
        $converter->apply($request, $params);
diff --git a/tests/Wallabag/CoreBundle/Twig/WallabagExtensionTest.php b/tests/Wallabag/CoreBundle/Twig/WallabagExtensionTest.php
index bb92f745..39fcec16 100644
--- a/tests/Wallabag/CoreBundle/Twig/WallabagExtensionTest.php
+++ b/tests/Wallabag/CoreBundle/Twig/WallabagExtensionTest.php
@@ -32,6 +32,31 @@ class WallabagExtensionTest extends TestCase
        $this->assertSame('gist.github.com', $extension->removeWww('gist.github.com'));
    }
+    public function testRemoveScheme()
+    {
+        $entryRepository = $this->getMockBuilder('Wallabag\CoreBundle\Repository\EntryRepository')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $tagRepository = $this->getMockBuilder('Wallabag\CoreBundle\Repository\TagRepository')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $tokenStorage = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $translator = $this->getMockBuilder('Symfony\Component\Translation\TranslatorInterface')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $extension = new WallabagExtension($entryRepository, $tagRepository, $tokenStorage, 0, $translator);
+        $this->assertSame('lemonde.fr', $extension->removeScheme('lemonde.fr'));
+        $this->assertSame('gist.github.com', $extension->removeScheme('gist.github.com'));
+        $this->assertSame('gist.github.com', $extension->removeScheme('https://gist.github.com'));
+    }
    public function testRemoveSchemeAndWww()
    {
        $entryRepository = $this->getMockBuilder('Wallabag\CoreBundle\Repository\EntryRepository')
diff --git a/tests/Wallabag/CoreBundle/WallabagCoreTestCase.php b/tests/Wallabag/CoreBundle/WallabagCoreTestCase.php
index 6e1163c5..816d22f4 100644
--- a/tests/Wallabag/CoreBundle/WallabagCoreTestCase.php
+++ b/tests/Wallabag/CoreBundle/WallabagCoreTestCase.php
@@ -84,8 +84,8 @@ abstract class WallabagCoreTestCase extends WebTestCase
        $container = $this->client->getContainer();
        $session = $container->get('session');
-        $userManager = $container->get('fos_user.user_manager');
+        $userManager = $container->get('fos_user.user_manager.test');
-        $loginManager = $container->get('fos_user.security.login_manager');
+        $loginManager = $container->get('fos_user.security.login_manager.test');
        $firewallName = $container->getParameter('fos_user.firewall_name');
        $user = $userManager->findUserBy(['username' => $username]);
diff --git a/tests/Wallabag/ImportBundle/Command/ImportCommandTest.php b/tests/Wallabag/ImportBundle/Command/ImportCommandTest.php
index f95320a4..8e1c528d 100644
--- a/tests/Wallabag/ImportBundle/Command/ImportCommandTest.php
+++ b/tests/Wallabag/ImportBundle/Command/ImportCommandTest.php
@@ -84,6 +84,8 @@ class ImportCommandTest extends WallabagCoreTestCase
    public function testRunImportCommandWithUserId()
    {
+        $this->logInAs('admin');
        $application = new Application($this->getClient()->getKernel());
        $application->add(new ImportCommand());
@@ -92,7 +94,7 @@ class ImportCommandTest extends WallabagCoreTestCase
        $tester = new CommandTester($command);
        $tester->execute([
            'command' => $command->getName(),
-            'username' => 1,
+            'username' => $this->getLoggedInUserId(),
            'filepath' => $application->getKernel()->getContainer()->getParameter('kernel.project_dir') . '/tests/Wallabag/ImportBundle/fixtures/wallabag-v2-read.json',
            '--useUserId' => true,
            '--importer' => 'v2',
diff --git a/tests/Wallabag/ImportBundle/Consumer/AMQPEntryConsumerTest.php b/tests/Wallabag/ImportBundle/Consumer/AMQPEntryConsumerTest.php
index b2141c04..b7f6192d 100644
--- a/tests/Wallabag/ImportBundle/Consumer/AMQPEntryConsumerTest.php
+++ b/tests/Wallabag/ImportBundle/Consumer/AMQPEntryConsumerTest.php
@@ -1,6 +1,6 @@
 <?php
-namespace Tests\Wallabag\ImportBundle\Consumer\AMQP;
+namespace Tests\Wallabag\ImportBundle\Consumer;
 use PhpAmqpLib\Message\AMQPMessage;
 use PHPUnit\Framework\TestCase;
diff --git a/tests/Wallabag/ImportBundle/Consumer/RedisEntryConsumerTest.php b/tests/Wallabag/ImportBundle/Consumer/RedisEntryConsumerTest.php
index 61337e47..e1bd8827 100644
--- a/tests/Wallabag/ImportBundle/Consumer/RedisEntryConsumerTest.php
+++ b/tests/Wallabag/ImportBundle/Consumer/RedisEntryConsumerTest.php
@@ -1,6 +1,6 @@
 <?php
-namespace Tests\Wallabag\ImportBundle\Consumer\AMQP;
+namespace Tests\Wallabag\ImportBundle\Consumer;
 use PHPUnit\Framework\TestCase;
 use Wallabag\CoreBundle\Entity\Entry;
diff --git a/tests/Wallabag/ImportBundle/Controller/ChromeControllerTest.php b/tests/Wallabag/ImportBundle/Controller/ChromeControllerTest.php
index cd3e41e9..d3ffbb6d 100644
--- a/tests/Wallabag/ImportBundle/Controller/ChromeControllerTest.php
+++ b/tests/Wallabag/ImportBundle/Controller/ChromeControllerTest.php
@@ -121,7 +121,7 @@ class ChromeControllerTest extends WallabagCoreTestCase
        $this->assertInstanceOf('Wallabag\CoreBundle\Entity\Entry', $content);
        $this->assertNotEmpty($content->getPreviewPicture(), 'Preview picture for http://www.usinenouvelle.com is ok');
        $this->assertNotEmpty($content->getLanguage(), 'Language for http://www.usinenouvelle.com is ok');
-        $this->assertSame(1, \count($content->getTags()));
+        $this->assertCount(1, $content->getTags());
        $createdAt = $content->getCreatedAt();
        $this->assertSame('2011', $createdAt->format('Y'));
diff --git a/tests/Wallabag/ImportBundle/Controller/FirefoxControllerTest.php b/tests/Wallabag/ImportBundle/Controller/FirefoxControllerTest.php
index dc5ed6d0..3e64f2e5 100644
--- a/tests/Wallabag/ImportBundle/Controller/FirefoxControllerTest.php
+++ b/tests/Wallabag/ImportBundle/Controller/FirefoxControllerTest.php
@@ -122,7 +122,7 @@ class FirefoxControllerTest extends WallabagCoreTestCase
        $this->assertNotEmpty($content->getMimetype(), 'Mimetype for http://lexpansion.lexpress.fr is ok');
        $this->assertNotEmpty($content->getPreviewPicture(), 'Preview picture for http://lexpansion.lexpress.fr is ok');
        $this->assertNotEmpty($content->getLanguage(), 'Language for http://lexpansion.lexpress.fr is ok');
-        $this->assertSame(3, \count($content->getTags()));
+        $this->assertCount(3, $content->getTags());
        $content = $client->getContainer()
            ->get('doctrine.orm.entity_manager')
diff --git a/tests/Wallabag/ImportBundle/Controller/InstapaperControllerTest.php b/tests/Wallabag/ImportBundle/Controller/InstapaperControllerTest.php
index 7390fa88..05347767 100644
--- a/tests/Wallabag/ImportBundle/Controller/InstapaperControllerTest.php
+++ b/tests/Wallabag/ImportBundle/Controller/InstapaperControllerTest.php
@@ -124,7 +124,7 @@ class InstapaperControllerTest extends WallabagCoreTestCase
        $this->assertNotEmpty($content->getPreviewPicture(), 'Preview picture for https://www.liberation.fr is ok');
        $this->assertNotEmpty($content->getLanguage(), 'Language for https://www.liberation.fr is ok');
        $this->assertContains('foot', $content->getTags(), 'It includes the "foot" tag');
-        $this->assertSame(1, \count($content->getTags()));
+        $this->assertCount(1, $content->getTags());
        $this->assertInstanceOf(\DateTime::class, $content->getCreatedAt());
        $content = $client->getContainer()
@@ -138,7 +138,7 @@ class InstapaperControllerTest extends WallabagCoreTestCase
        $this->assertContains('foot', $content->getTags());
        $this->assertContains('test_tag', $content->getTags());
-        $this->assertSame(2, \count($content->getTags()));
+        $this->assertCount(2, $content->getTags());
    }
    public function testImportInstapaperWithFileAndMarkAllAsRead()
diff --git a/tests/Wallabag/ImportBundle/Controller/PinboardControllerTest.php b/tests/Wallabag/ImportBundle/Controller/PinboardControllerTest.php
index 80819f45..15646d55 100644
--- a/tests/Wallabag/ImportBundle/Controller/PinboardControllerTest.php
+++ b/tests/Wallabag/ImportBundle/Controller/PinboardControllerTest.php
@@ -127,7 +127,7 @@ class PinboardControllerTest extends WallabagCoreTestCase
        $this->assertContains('foot', $tags, 'It includes the "foot" tag');
        $this->assertContains('varnish', $tags, 'It includes the "varnish" tag');
        $this->assertContains('php', $tags, 'It includes the "php" tag');
-        $this->assertSame(3, \count($tags));
+        $this->assertCount(3, $tags);
        $this->assertInstanceOf(\DateTime::class, $content->getCreatedAt());
        $this->assertSame('2016-10-26', $content->getCreatedAt()->format('Y-m-d'));
diff --git a/tests/Wallabag/ImportBundle/Controller/ReadabilityControllerTest.php b/tests/Wallabag/ImportBundle/Controller/ReadabilityControllerTest.php
index 5619659a..4f2f4053 100644
--- a/tests/Wallabag/ImportBundle/Controller/ReadabilityControllerTest.php
+++ b/tests/Wallabag/ImportBundle/Controller/ReadabilityControllerTest.php
@@ -125,7 +125,7 @@ class ReadabilityControllerTest extends WallabagCoreTestCase
        $tags = $content->getTags();
        $this->assertContains('foot', $tags, 'It includes the "foot" tag');
-        $this->assertSame(1, \count($tags));
+        $this->assertCount(1, $tags);
        $this->assertInstanceOf(\DateTime::class, $content->getCreatedAt());
        $this->assertSame('2016-09-08', $content->getCreatedAt()->format('Y-m-d'));
diff --git a/tests/Wallabag/ImportBundle/Controller/WallabagV1ControllerTest.php b/tests/Wallabag/ImportBundle/Controller/WallabagV1ControllerTest.php
index c67941a7..2a8e7c89 100644
--- a/tests/Wallabag/ImportBundle/Controller/WallabagV1ControllerTest.php
+++ b/tests/Wallabag/ImportBundle/Controller/WallabagV1ControllerTest.php
@@ -121,13 +121,13 @@ class WallabagV1ControllerTest extends WallabagCoreTestCase
        $this->assertInstanceOf('Wallabag\CoreBundle\Entity\Entry', $content);
        $this->assertEmpty($content->getMimetype(), 'Mimetype for http://www.framablog.org is empty');
-        $this->assertEmpty($content->getPreviewPicture(), 'Preview picture for http://www.framablog.org is empty');
+        $this->assertSame($content->getPreviewPicture(), 'http://www.framablog.org/public/_img/framablog/wallaby_baby.jpg');
        $this->assertEmpty($content->getLanguage(), 'Language for http://www.framablog.org is empty');
        $tags = $content->getTags();
        $this->assertContains('foot', $tags, 'It includes the "foot" tag');
        $this->assertContains('framabag', $tags, 'It includes the "framabag" tag');
-        $this->assertSame(2, \count($tags));
+        $this->assertCount(2, $tags);
        $this->assertInstanceOf(\DateTime::class, $content->getCreatedAt());
    }
diff --git a/tests/Wallabag/ImportBundle/Controller/WallabagV2ControllerTest.php b/tests/Wallabag/ImportBundle/Controller/WallabagV2ControllerTest.php
index 822656ba..b606e26a 100644
--- a/tests/Wallabag/ImportBundle/Controller/WallabagV2ControllerTest.php
+++ b/tests/Wallabag/ImportBundle/Controller/WallabagV2ControllerTest.php
@@ -128,7 +128,7 @@ class WallabagV2ControllerTest extends WallabagCoreTestCase
        $tags = $content->getTags();
        $this->assertContains('foot', $tags, 'It includes the "foot" tag');
-        $this->assertSame(1, \count($tags));
+        $this->assertCount(1, $tags);
        $content = $client->getContainer()
            ->get('doctrine.orm.entity_manager')
@@ -147,7 +147,7 @@ class WallabagV2ControllerTest extends WallabagCoreTestCase
        $this->assertContains('foot', $tags, 'It includes the "foot" tag');
        $this->assertContains('mediapart', $tags, 'It includes the "mediapart" tag');
        $this->assertContains('blog', $tags, 'It includes the "blog" tag');
-        $this->assertSame(3, \count($tags));
+        $this->assertCount(3, $tags);
        $this->assertInstanceOf(\DateTime::class, $content->getCreatedAt());
        $this->assertSame('2016-09-08', $content->getCreatedAt()->format('Y-m-d'));
diff --git a/tests/Wallabag/ImportBundle/Import/PocketImportTest.php b/tests/Wallabag/ImportBundle/Import/PocketImportTest.php
index 8083f1a8..40e1626b 100644
--- a/tests/Wallabag/ImportBundle/Import/PocketImportTest.php
+++ b/tests/Wallabag/ImportBundle/Import/PocketImportTest.php
@@ -2,10 +2,8 @@
 namespace Tests\Wallabag\ImportBundle\Import;
-use GuzzleHttp\Client;
+use GuzzleHttp\Psr7\Response;
-use GuzzleHttp\Message\Response;
+use Http\Mock\Client as HttpMockClient;
-use GuzzleHttp\Stream\Stream;
-use GuzzleHttp\Subscriber\Mock;
 use M6Web\Component\RedisMock\RedisMockFactory;
 use Monolog\Handler\TestHandler;
 use Monolog\Logger;
@@ -38,16 +36,11 @@ class PocketImportTest extends TestCase
    public function testOAuthRequest()
    {
-        $client = new Client();
+        $httpMockClient = new HttpMockClient();
+        $httpMockClient->addResponse(new Response(200, ['Content-Type' => 'application/json'], json_encode(['code' => 'wunderbar_code'])));
-        $mock = new Mock([
-            new Response(200, ['Content-Type' => 'application/json'], Stream::factory(json_encode(['code' => 'wunderbar_code']))),
-        ]);
-        $client->getEmitter()->attach($mock);
        $pocketImport = $this->getPocketImport();
-        $pocketImport->setClient($client);
+        $pocketImport->setClient($httpMockClient);
        $code = $pocketImport->getRequestToken('http://0.0.0.0/redirect');
@@ -56,16 +49,11 @@ class PocketImportTest extends TestCase
    public function testOAuthRequestBadResponse()
    {
-        $client = new Client();
+        $httpMockClient = new HttpMockClient();
+        $httpMockClient->addResponse(new Response(403));
-        $mock = new Mock([
-            new Response(403),
-        ]);
-        $client->getEmitter()->attach($mock);
        $pocketImport = $this->getPocketImport();
-        $pocketImport->setClient($client);
+        $pocketImport->setClient($httpMockClient);
        $code = $pocketImport->getRequestToken('http://0.0.0.0/redirect');
@@ -78,16 +66,11 @@ class PocketImportTest extends TestCase
    public function testOAuthAuthorize()
    {
-        $client = new Client();
+        $httpMockClient = new HttpMockClient();
+        $httpMockClient->addResponse(new Response(200, ['Content-Type' => 'application/json'], json_encode(['access_token' => 'wunderbar_token'])));
-        $mock = new Mock([
-            new Response(200, ['Content-Type' => 'application/json'], Stream::factory(json_encode(['access_token' => 'wunderbar_token']))),
-        ]);
-        $client->getEmitter()->attach($mock);
        $pocketImport = $this->getPocketImport();
-        $pocketImport->setClient($client);
+        $pocketImport->setClient($httpMockClient);
        $res = $pocketImport->authorize('wunderbar_code');
@@ -97,16 +80,11 @@ class PocketImportTest extends TestCase
    public function testOAuthAuthorizeBadResponse()
    {
-        $client = new Client();
+        $httpMockClient = new HttpMockClient();
+        $httpMockClient->addResponse(new Response(403));
-        $mock = new Mock([
-            new Response(403),
-        ]);
-        $client->getEmitter()->attach($mock);
        $pocketImport = $this->getPocketImport();
-        $pocketImport->setClient($client);
+        $pocketImport->setClient($httpMockClient);
        $res = $pocketImport->authorize('wunderbar_code');
@@ -122,94 +100,90 @@ class PocketImportTest extends TestCase
     */
    public function testImport()
    {
-        $client = new Client();
+        $httpMockClient = new HttpMockClient();
+        $httpMockClient->addResponse(new Response(200, ['Content-Type' => 'application/json'], json_encode(['access_token' => 'wunderbar_token'])));
-        $mock = new Mock([
+        $httpMockClient->addResponse(new Response(200, ['Content-Type' => 'application/json'], <<<'JSON'
-            new Response(200, ['Content-Type' => 'application/json'], Stream::factory(json_encode(['access_token' => 'wunderbar_token']))),
+            {
-            new Response(200, ['Content-Type' => 'application/json'], Stream::factory('
+                "status": 1,
-                {
+                "list": {
-                    "status": 1,
+                    "229279689": {
-                    "list": {
+                        "item_id": "229279689",
-                        "229279689": {
+                        "resolved_id": "229279689",
-                            "item_id": "229279689",
+                        "given_url": "http://www.grantland.com/blog/the-triangle/post/_/id/38347/ryder-cup-preview",
-                            "resolved_id": "229279689",
+                        "given_title": "The Massive Ryder Cup Preview - The Triangle Blog - Grantland",
-                            "given_url": "http://www.grantland.com/blog/the-triangle/post/_/id/38347/ryder-cup-preview",
+                        "favorite": "1",
-                            "given_title": "The Massive Ryder Cup Preview - The Triangle Blog - Grantland",
+                        "status": "1",
-                            "favorite": "1",
+                        "time_added": "1473020899",
-                            "status": "1",
+                        "time_updated": "1473020899",
-                            "time_added": "1473020899",
+                        "time_read": "0",
-                            "time_updated": "1473020899",
+                        "time_favorited": "0",
-                            "time_read": "0",
+                        "sort_id": 0,
-                            "time_favorited": "0",
+                        "resolved_title": "The Massive Ryder Cup Preview",
-                            "sort_id": 0,
+                        "resolved_url": "http://www.grantland.com/blog/the-triangle/post/_/id/38347/ryder-cup-preview",
-                            "resolved_title": "The Massive Ryder Cup Preview",
+                        "excerpt": "The list of things I love about the Ryder Cup is so long that it could fill a (tedious) novel, and golf fans can probably guess most of them.",
-                            "resolved_url": "http://www.grantland.com/blog/the-triangle/post/_/id/38347/ryder-cup-preview",
+                        "is_article": "1",
-                            "excerpt": "The list of things I love about the Ryder Cup is so long that it could fill a (tedious) novel, and golf fans can probably guess most of them.",
+                        "is_index": "0",
-                            "is_article": "1",
+                        "has_video": "1",
-                            "is_index": "0",
+                        "has_image": "1",
-                            "has_video": "1",
+                        "word_count": "3197",
-                            "has_image": "1",
+                        "images": {
-                            "word_count": "3197",
+                            "1": {
-                            "images": {
+                                "item_id": "229279689",
-                                "1": {
+                                "image_id": "1",
-                                    "item_id": "229279689",
+                                "src": "http://a.espncdn.com/combiner/i?img=/photo/2012/0927/grant_g_ryder_cr_640.jpg&w=640&h=360",
-                                    "image_id": "1",
+                                "width": "0",
-                                    "src": "http://a.espncdn.com/combiner/i?img=/photo/2012/0927/grant_g_ryder_cr_640.jpg&w=640&h=360",
+                                "height": "0",
-                                    "width": "0",
+                                "credit": "Jamie Squire/Getty Images",
-                                    "height": "0",
+                                "caption": ""
-                                    "credit": "Jamie Squire/Getty Images",
-                                    "caption": ""
-                                }
-                            },
-                            "videos": {
-                                "1": {
-                                    "item_id": "229279689",
-                                    "video_id": "1",
-                                    "src": "http://www.youtube.com/v/Er34PbFkVGk?version=3&hl=en_US&rel=0",
-                                    "width": "420",
-                                    "height": "315",
-                                    "type": "1",
-                                    "vid": "Er34PbFkVGk"
-                                }
-                            },
-                            "tags": {
-                                "grantland": {
-                                    "item_id": "1147652870",
-                                    "tag": "grantland"
-                                },
-                                "Ryder Cup": {
-                                    "item_id": "1147652870",
-                                    "tag": "Ryder Cup"
-                                }
                            }
                        },
-                        "229279690": {
+                        "videos": {
-                            "item_id": "229279689",
+                            "1": {
-                            "resolved_id": "229279689",
+                                "item_id": "229279689",
-                            "given_url": "http://www.grantland.com/blog/the-triangle/post/_/id/38347/ryder-cup-preview",
+                                "video_id": "1",
-                            "given_title": "The Massive Ryder Cup Preview - The Triangle Blog - Grantland",
+                                "src": "http://www.youtube.com/v/Er34PbFkVGk?version=3&hl=en_US&rel=0",
-                            "favorite": "1",
+                                "width": "420",
-                            "status": "1",
+                                "height": "315",
-                            "time_added": "1473020899",
+                                "type": "1",
-                            "time_updated": "1473020899",
+                                "vid": "Er34PbFkVGk"
-                            "time_read": "0",
+                            }
-                            "time_favorited": "0",
+                        },
-                            "sort_id": 1,
+                        "tags": {
-                            "resolved_title": "The Massive Ryder Cup Preview",
+                            "grantland": {
-                            "resolved_url": "http://www.grantland.com/blog/the-triangle/post/_/id/38347/ryder-cup-preview",
+                                "item_id": "1147652870",
-                            "excerpt": "The list of things I love about the Ryder Cup is so long that it could fill a (tedious) novel, and golf fans can probably guess most of them.",
+                                "tag": "grantland"
-                            "is_article": "1",
+                            },
-                            "is_index": "0",
+                            "Ryder Cup": {
-                            "has_video": "0",
+                                "item_id": "1147652870",
-                            "has_image": "0",
+                                "tag": "Ryder Cup"
-                            "word_count": "3197"
+                            }
                        }
+                    },
+                    "229279690": {
+                        "item_id": "229279689",
+                        "resolved_id": "229279689",
+                        "given_url": "http://www.grantland.com/blog/the-triangle/post/_/id/38347/ryder-cup-preview",
+                        "given_title": "The Massive Ryder Cup Preview - The Triangle Blog - Grantland",
+                        "favorite": "1",
+                        "status": "1",
+                        "time_added": "1473020899",
+                        "time_updated": "1473020899",
+                        "time_read": "0",
+                        "time_favorited": "0",
+                        "sort_id": 1,
+                        "resolved_title": "The Massive Ryder Cup Preview",
+                        "resolved_url": "http://www.grantland.com/blog/the-triangle/post/_/id/38347/ryder-cup-preview",
+                        "excerpt": "The list of things I love about the Ryder Cup is so long that it could fill a (tedious) novel, and golf fans can probably guess most of them.",
+                        "is_article": "1",
+                        "is_index": "0",
+                        "has_video": "0",
+                        "has_image": "0",
+                        "word_count": "3197"
                    }
                }
-            ')),
+            }
-        ]);
+JSON
+));
-        $client->getEmitter()->attach($mock);
        $pocketImport = $this->getPocketImport('ConsumerKey', 1);
@@ -240,7 +214,7 @@ class PocketImportTest extends TestCase
            ->method('updateEntry')
            ->willReturn($entry);
-        $pocketImport->setClient($client);
+        $pocketImport->setClient($httpMockClient);
        $pocketImport->authorize('wunderbar_code');
        $res = $pocketImport->import();
@@ -254,56 +228,52 @@ class PocketImportTest extends TestCase
     */
    public function testImportAndMarkAllAsRead()
    {
-        $client = new Client();
+        $httpMockClient = new HttpMockClient();
+        $httpMockClient->addResponse(new Response(200, ['Content-Type' => 'application/json'], json_encode(['access_token' => 'wunderbar_token'])));
-        $mock = new Mock([
+        $httpMockClient->addResponse(new Response(200, ['Content-Type' => 'application/json'], <<<'JSON'
-            new Response(200, ['Content-Type' => 'application/json'], Stream::factory(json_encode(['access_token' => 'wunderbar_token']))),
+            {
-            new Response(200, ['Content-Type' => 'application/json'], Stream::factory('
+                "status": 1,
-                {
+                "list": {
-                    "status": 1,
+                    "229279689": {
-                    "list": {
+                        "item_id": "229279689",
-                        "229279689": {
+                        "resolved_id": "229279689",
-                            "item_id": "229279689",
+                        "given_url": "http://www.grantland.com/blog/the-triangle/post/_/id/38347/ryder-cup-preview",
-                            "resolved_id": "229279689",
+                        "given_title": "The Massive Ryder Cup Preview - The Triangle Blog - Grantland",
-                            "given_url": "http://www.grantland.com/blog/the-triangle/post/_/id/38347/ryder-cup-preview",
+                        "favorite": "1",
-                            "given_title": "The Massive Ryder Cup Preview - The Triangle Blog - Grantland",
+                        "status": "1",
-                            "favorite": "1",
+                        "time_added": "1473020899",
-                            "status": "1",
+                        "time_updated": "1473020899",
-                            "time_added": "1473020899",
+                        "time_read": "0",
-                            "time_updated": "1473020899",
+                        "time_favorited": "0",
-                            "time_read": "0",
+                        "sort_id": 0,
-                            "time_favorited": "0",
+                        "excerpt": "The list of things I love about the Ryder Cup is so long that it could fill a (tedious) novel, and golf fans can probably guess most of them.",
-                            "sort_id": 0,
+                        "is_article": "1",
-                            "excerpt": "The list of things I love about the Ryder Cup is so long that it could fill a (tedious) novel, and golf fans can probably guess most of them.",
+                        "has_video": "1",
-                            "is_article": "1",
+                        "has_image": "1",
-                            "has_video": "1",
+                        "word_count": "3197"
-                            "has_image": "1",
+                    },
-                            "word_count": "3197"
+                    "229279690": {
-                        },
+                        "item_id": "229279689",
-                        "229279690": {
+                        "resolved_id": "229279689",
-                            "item_id": "229279689",
+                        "given_url": "http://www.grantland.com/blog/the-triangle/post/_/id/38347/ryder-cup-preview/2",
-                            "resolved_id": "229279689",
+                        "given_title": "The Massive Ryder Cup Preview - The Triangle Blog - Grantland",
-                            "given_url": "http://www.grantland.com/blog/the-triangle/post/_/id/38347/ryder-cup-preview/2",
+                        "favorite": "1",
-                            "given_title": "The Massive Ryder Cup Preview - The Triangle Blog - Grantland",
+                        "status": "0",
-                            "favorite": "1",
+                        "time_added": "1473020899",
-                            "status": "0",
+                        "time_updated": "1473020899",
-                            "time_added": "1473020899",
+                        "time_read": "0",
-                            "time_updated": "1473020899",
+                        "time_favorited": "0",
-                            "time_read": "0",
+                        "sort_id": 1,
-                            "time_favorited": "0",
+                        "excerpt": "The list of things I love about the Ryder Cup is so long that it could fill a (tedious) novel, and golf fans can probably guess most of them.",
-                            "sort_id": 1,
+                        "is_article": "1",
-                            "excerpt": "The list of things I love about the Ryder Cup is so long that it could fill a (tedious) novel, and golf fans can probably guess most of them.",
+                        "has_video": "0",
-                            "is_article": "1",
+                        "has_image": "0",
-                            "has_video": "0",
+                        "word_count": "3197"
-                            "has_image": "0",
-                            "word_count": "3197"
-                        }
                    }
                }
-            ')),
+            }
-        ]);
+JSON
+));
-        $client->getEmitter()->attach($mock);
        $pocketImport = $this->getPocketImport('ConsumerKey', 2);
@@ -335,7 +305,7 @@ class PocketImportTest extends TestCase
            ->method('updateEntry')
            ->willReturn($entry);
-        $pocketImport->setClient($client);
+        $pocketImport->setClient($httpMockClient);
        $pocketImport->authorize('wunderbar_code');
        $res = $pocketImport->setMarkAsRead(true)->import();
@@ -349,7 +319,7 @@ class PocketImportTest extends TestCase
     */
    public function testImportWithRabbit()
    {
-        $client = new Client();
+        $httpMockClient = new HttpMockClient();
        $body = <<<'JSON'
 {
@@ -374,19 +344,16 @@ class PocketImportTest extends TestCase
 }
 JSON;
-        $mock = new Mock([
+        $httpMockClient->addResponse(new Response(200, ['Content-Type' => 'application/json'], json_encode(['access_token' => 'wunderbar_token'])));
-            new Response(200, ['Content-Type' => 'application/json'], Stream::factory(json_encode(['access_token' => 'wunderbar_token']))),
+        $httpMockClient->addResponse(new Response(200, ['Content-Type' => 'application/json'], <<<JSON
-            new Response(200, ['Content-Type' => 'application/json'], Stream::factory('
+            {
-                {
+                "status": 1,
-                    "status": 1,
+                "list": {
-                    "list": {
+                    "229279690": $body
-                        "229279690": ' . $body . '
-                    }
                }
-            ')),
+            }
-        ]);
+JSON
+        ));
-        $client->getEmitter()->attach($mock);
        $pocketImport = $this->getPocketImport();
@@ -420,7 +387,7 @@ JSON;
            ->method('publish')
            ->with(json_encode($bodyAsArray));
-        $pocketImport->setClient($client);
+        $pocketImport->setClient($httpMockClient);
        $pocketImport->setProducer($producer);
        $pocketImport->authorize('wunderbar_code');
@@ -435,7 +402,7 @@ JSON;
     */
    public function testImportWithRedis()
    {
-        $client = new Client();
+        $httpMockClient = new HttpMockClient();
        $body = <<<'JSON'
 {
@@ -460,19 +427,16 @@ JSON;
 }
 JSON;
-        $mock = new Mock([
+        $httpMockClient->addResponse(new Response(200, ['Content-Type' => 'application/json'], json_encode(['access_token' => 'wunderbar_token'])));
-            new Response(200, ['Content-Type' => 'application/json'], Stream::factory(json_encode(['access_token' => 'wunderbar_token']))),
+        $httpMockClient->addResponse(new Response(200, ['Content-Type' => 'application/json'], <<<JSON
-            new Response(200, ['Content-Type' => 'application/json'], Stream::factory('
+            {
-                {
+                "status": 1,
-                    "status": 1,
+                "list": {
-                    "list": {
+                    "229279690": $body
-                        "229279690": ' . $body . '
-                    }
                }
-            ')),
+            }
-        ]);
+JSON
+        ));
-        $client->getEmitter()->attach($mock);
        $pocketImport = $this->getPocketImport();
@@ -499,7 +463,7 @@ JSON;
        $queue = new RedisQueue($redisMock, 'pocket');
        $producer = new Producer($queue);
-        $pocketImport->setClient($client);
+        $pocketImport->setClient($httpMockClient);
        $pocketImport->setProducer($producer);
        $pocketImport->authorize('wunderbar_code');
@@ -513,17 +477,13 @@ JSON;
    public function testImportBadResponse()
    {
-        $client = new Client();
+        $httpMockClient = new HttpMockClient();
-        $mock = new Mock([
+        $httpMockClient->addResponse(new Response(200, ['Content-Type' => 'application/json'], json_encode(['access_token' => 'wunderbar_token'])));
-            new Response(200, ['Content-Type' => 'application/json'], Stream::factory(json_encode(['access_token' => 'wunderbar_token']))),
+        $httpMockClient->addResponse(new Response(403));
-            new Response(403),
-        ]);
-        $client->getEmitter()->attach($mock);
        $pocketImport = $this->getPocketImport();
-        $pocketImport->setClient($client);
+        $pocketImport->setClient($httpMockClient);
        $pocketImport->authorize('wunderbar_code');
        $res = $pocketImport->import();
@@ -537,25 +497,23 @@ JSON;
    public function testImportWithExceptionFromGraby()
    {
-        $client = new Client();
+        $httpMockClient = new HttpMockClient();
-        $mock = new Mock([
+        $httpMockClient->addResponse(new Response(200, ['Content-Type' => 'application/json'], json_encode(['access_token' => 'wunderbar_token'])));
-            new Response(200, ['Content-Type' => 'application/json'], Stream::factory(json_encode(['access_token' => 'wunderbar_token']))),
+        $httpMockClient->addResponse(new Response(200, ['Content-Type' => 'application/json'], <<<'JSON'
-            new Response(200, ['Content-Type' => 'application/json'], Stream::factory('
+            {
-                {
+                "status": 1,
-                    "status": 1,
+                "list": {
-                    "list": {
+                    "229279689": {
-                        "229279689": {
+                        "status": "1",
-                            "status": "1",
+                        "favorite": "1",
-                            "favorite": "1",
+                        "resolved_url": "http://www.grantland.com/blog/the-triangle/post/_/id/38347/ryder-cup-preview"
-                            "resolved_url": "http://www.grantland.com/blog/the-triangle/post/_/id/38347/ryder-cup-preview"
-                        }
                    }
                }
-            ')),
+            }
-        ]);
+            
+JSON
-        $client->getEmitter()->attach($mock);
+        ));
        $pocketImport = $this->getPocketImport('ConsumerKey', 1);
@@ -579,7 +537,7 @@ JSON;
            ->method('updateEntry')
            ->will($this->throwException(new \Exception()));
-        $pocketImport->setClient($client);
+        $pocketImport->setClient($httpMockClient);
        $pocketImport->authorize('wunderbar_code');
        $res = $pocketImport->import();
diff --git a/tests/Wallabag/UserBundle/Controller/ManageControllerTest.php b/tests/Wallabag/UserBundle/Controller/ManageControllerTest.php
index adc2cf09..f44e6fbf 100644
--- a/tests/Wallabag/UserBundle/Controller/ManageControllerTest.php
+++ b/tests/Wallabag/UserBundle/Controller/ManageControllerTest.php
@@ -1,6 +1,6 @@
 <?php
-namespace Wallabag\UserBundle\Tests\Controller;
+namespace Tests\Wallabag\UserBundle\Controller;
 use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;
diff --git a/tests/Wallabag/UserBundle/EventListener/CreateConfigListenerTest.php b/tests/Wallabag/UserBundle/EventListener/CreateConfigListenerTest.php
index 2b540fdf..d976c4ac 100644
--- a/tests/Wallabag/UserBundle/EventListener/CreateConfigListenerTest.php
+++ b/tests/Wallabag/UserBundle/EventListener/CreateConfigListenerTest.php
@@ -8,6 +8,8 @@ use PHPUnit\Framework\TestCase;
 use Symfony\Component\EventDispatcher\EventDispatcher;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpFoundation\Session\Session;
+use Symfony\Component\HttpFoundation\Session\Storage\MockArraySessionStorage;
 use Wallabag\CoreBundle\Entity\Config;
 use Wallabag\UserBundle\Entity\User;
 use Wallabag\UserBundle\EventListener\CreateConfigListener;
@@ -22,6 +24,7 @@ class CreateConfigListenerTest extends TestCase
    protected function setUp()
    {
+        $session = new Session(new MockArraySessionStorage());
        $this->em = $this->getMockBuilder('Doctrine\ORM\EntityManager')
            ->disableOriginalConstructor()
            ->getMock();
@@ -34,7 +37,8 @@ class CreateConfigListenerTest extends TestCase
            'fr',
            1,
            1,
-            1
+            1,
+            $session
        );
        $this->dispatcher = new EventDispatcher();
@@ -58,13 +62,13 @@ class CreateConfigListenerTest extends TestCase
        $config = new Config($user);
        $config->setTheme('baggy');
        $config->setItemsPerPage(20);
-        $config->setRssLimit(50);
+        $config->setFeedLimit(50);
        $config->setLanguage('fr');
        $config->setReadingSpeed(1);
        $this->em->expects($this->once())
            ->method('persist')
-            ->will($this->returnValue($config));
+            ->willReturn($config);
        $this->em->expects($this->once())
            ->method('flush');
diff --git a/tests/Wallabag/UserBundle/Mailer/AuthCodeMailerTest.php b/tests/Wallabag/UserBundle/Mailer/AuthCodeMailerTest.php
index aa176068..1713c10c 100644
--- a/tests/Wallabag/UserBundle/Mailer/AuthCodeMailerTest.php
+++ b/tests/Wallabag/UserBundle/Mailer/AuthCodeMailerTest.php
@@ -6,22 +6,6 @@ use PHPUnit\Framework\TestCase;
 use Wallabag\UserBundle\Entity\User;
 use Wallabag\UserBundle\Mailer\AuthCodeMailer;
-/**
- * @see https://www.pmg.com/blog/integration-testing-swift-mailer/
- */
-final class CountableMemorySpool extends \Swift_MemorySpool implements \Countable
-{
-    public function count()
-    {
-        return \count($this->messages);
-    }
-    public function getMessages()
-    {
-        return $this->messages;
-    }
-}
 class AuthCodeMailerTest extends TestCase
 {
    protected $mailer;
@@ -49,7 +33,7 @@ TWIG;
    public function testSendEmail()
    {
        $user = new User();
-        $user->setTwoFactorAuthentication(true);
+        $user->setEmailTwoFactor(true);
        $user->setEmailAuthCode(666666);
        $user->setEmail('test@wallabag.io');
        $user->setName('Bob');
diff --git a/tests/Wallabag/UserBundle/Mailer/CountableMemorySpool.php b/tests/Wallabag/UserBundle/Mailer/CountableMemorySpool.php
new file mode 100644
index 00000000..53f240a1
--- /dev/null
+++ b/tests/Wallabag/UserBundle/Mailer/CountableMemorySpool.php
@@ -0,0 +1,19 @@
+<?php
+namespace Tests\Wallabag\UserBundle\Mailer;
+/**
+ * @see https://www.pmg.com/blog/integration-testing-swift-mailer/
+ */
+final class CountableMemorySpool extends \Swift_MemorySpool implements \Countable
+{
+    public function count()
+    {
+        return \count($this->messages);
+    }
+    public function getMessages()
+    {
+        return $this->messages;
+    }
+}