{{ form_label(form.config.language) }}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
index f69d158f4..e774795b9 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
@@ -51,6 +51,14 @@
+
{{ form_label(form.config.language) }}
diff --git a/tests/Wallabag/CoreBundle/Controller/ConfigControllerTest.php b/tests/Wallabag/CoreBundle/Controller/ConfigControllerTest.php
index 568576a33..a2863014f 100644
--- a/tests/Wallabag/CoreBundle/Controller/ConfigControllerTest.php
+++ b/tests/Wallabag/CoreBundle/Controller/ConfigControllerTest.php
@@ -51,6 +51,7 @@ class ConfigControllerTest extends WallabagCoreTestCase
'config[theme]' => 'baggy',
'config[items_per_page]' => '30',
'config[reading_speed]' => '0.5',
+ 'config[action_mark_as_read]' => '0',
'config[language]' => 'en',
];
diff --git a/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php b/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php
index 4ab06dbff..bf4e0543f 100644
--- a/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php
+++ b/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php
@@ -3,6 +3,7 @@
namespace Tests\Wallabag\CoreBundle\Controller;
use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;
+use Wallabag\CoreBundle\Entity\Config;
use Wallabag\CoreBundle\Entity\Entry;
class EntryControllerTest extends WallabagCoreTestCase
@@ -896,4 +897,68 @@ class EntryControllerTest extends WallabagCoreTestCase
$client->getContainer()->get('craue_config')->set('download_images_enabled', 0);
}
+
+ public function testRedirectToHomepage()
+ {
+ $this->logInAs('empty');
+ $client = $this->getClient();
+
+ $em = $client->getContainer()->get('doctrine.orm.entity_manager');
+ $user = $em
+ ->getRepository('WallabagUserBundle:User')
+ ->find($this->getLoggedInUserId());
+
+ if (!$user) {
+ $this->markTestSkipped('No user found in db.');
+ }
+
+ // Redirect to homepage
+ $config = $user->getConfig();
+ $config->setActionMarkAsRead(Config::REDIRECT_TO_HOMEPAGE);
+ $em->persist($config);
+ $em->flush();
+
+ $content = $client->getContainer()
+ ->get('doctrine.orm.entity_manager')
+ ->getRepository('WallabagCoreBundle:Entry')
+ ->findByUrlAndUserId($this->url, $this->getLoggedInUserId());
+
+ $client->request('GET', '/view/'.$content->getId());
+ $client->request('GET', '/archive/'.$content->getId());
+
+ $this->assertEquals(302, $client->getResponse()->getStatusCode());
+ $this->assertEquals('/', $client->getResponse()->headers->get('location'));
+ }
+
+ public function testRedirectToCurrentPage()
+ {
+ $this->logInAs('empty');
+ $client = $this->getClient();
+
+ $em = $client->getContainer()->get('doctrine.orm.entity_manager');
+ $user = $em
+ ->getRepository('WallabagUserBundle:User')
+ ->find($this->getLoggedInUserId());
+
+ if (!$user) {
+ $this->markTestSkipped('No user found in db.');
+ }
+
+ // Redirect to current page
+ $config = $user->getConfig();
+ $config->setActionMarkAsRead(Config::REDIRECT_TO_CURRENT_PAGE);
+ $em->persist($config);
+ $em->flush();
+
+ $content = $client->getContainer()
+ ->get('doctrine.orm.entity_manager')
+ ->getRepository('WallabagCoreBundle:Entry')
+ ->findByUrlAndUserId($this->url, $this->getLoggedInUserId());
+
+ $client->request('GET', '/view/'.$content->getId());
+ $client->request('GET', '/archive/'.$content->getId());
+
+ $this->assertEquals(302, $client->getResponse()->getStatusCode());
+ $this->assertContains('/view/'.$content->getId(), $client->getResponse()->headers->get('location'));
+ }
}
diff --git a/tests/Wallabag/CoreBundle/Helper/DownloadImagesTest.php b/tests/Wallabag/CoreBundle/Helper/DownloadImagesTest.php
index 920c21d99..85f12d87b 100644
--- a/tests/Wallabag/CoreBundle/Helper/DownloadImagesTest.php
+++ b/tests/Wallabag/CoreBundle/Helper/DownloadImagesTest.php
@@ -3,7 +3,6 @@
namespace Tests\Wallabag\CoreBundle\Helper;
use Wallabag\CoreBundle\Helper\DownloadImages;
-use Psr\Log\NullLogger;
use Monolog\Logger;
use Monolog\Handler\TestHandler;
use GuzzleHttp\Client;
diff --git a/tests/Wallabag/CoreBundle/Helper/RedirectTest.php b/tests/Wallabag/CoreBundle/Helper/RedirectTest.php
index f339f75e8..0539f20a9 100644
--- a/tests/Wallabag/CoreBundle/Helper/RedirectTest.php
+++ b/tests/Wallabag/CoreBundle/Helper/RedirectTest.php
@@ -2,7 +2,11 @@
namespace Tests\Wallabag\CoreBundle\Helper;
+use Wallabag\CoreBundle\Entity\Config;
+use Wallabag\UserBundle\Entity\User;
use Wallabag\CoreBundle\Helper\Redirect;
+use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
+use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorage;
class RedirectTest extends \PHPUnit_Framework_TestCase
{
@@ -14,8 +18,38 @@ class RedirectTest extends \PHPUnit_Framework_TestCase
public function setUp()
{
- $this->routerMock = $this->getRouterMock();
- $this->redirect = new Redirect($this->routerMock);
+ $this->routerMock = $this->getMockBuilder('Symfony\Component\Routing\Router')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $this->routerMock->expects($this->any())
+ ->method('generate')
+ ->with('homepage')
+ ->willReturn('homepage');
+
+ $user = new User();
+ $user->setName('youpi');
+ $user->setEmail('youpi@youpi.org');
+ $user->setUsername('youpi');
+ $user->setPlainPassword('youpi');
+ $user->setEnabled(true);
+ $user->addRole('ROLE_SUPER_ADMIN');
+
+ $config = new Config($user);
+ $config->setTheme('material');
+ $config->setItemsPerPage(30);
+ $config->setReadingSpeed(1);
+ $config->setLanguage('en');
+ $config->setPocketConsumerKey('xxxxx');
+ $config->setActionMarkAsRead(Config::REDIRECT_TO_CURRENT_PAGE);
+
+ $user->setConfig($config);
+
+ $this->token = new UsernamePasswordToken($user, 'password', 'key');
+ $tokenStorage = new TokenStorage();
+ $tokenStorage->setToken($this->token);
+
+ $this->redirect = new Redirect($this->routerMock, $tokenStorage);
}
public function testRedirectToNullWithFallback()
@@ -39,17 +73,20 @@ class RedirectTest extends \PHPUnit_Framework_TestCase
$this->assertEquals('/unread/list', $redirectUrl);
}
- private function getRouterMock()
+ public function testWithNotLoggedUser()
{
- $mock = $this->getMockBuilder('Symfony\Component\Routing\Router')
- ->disableOriginalConstructor()
- ->getMock();
+ $redirect = new Redirect($this->routerMock, new TokenStorage());
+ $redirectUrl = $redirect->to('/unread/list');
- $mock->expects($this->any())
- ->method('generate')
- ->with('homepage')
- ->willReturn('homepage');
+ $this->assertEquals('/unread/list', $redirectUrl);
+ }
- return $mock;
+ public function testUserForRedirectToHomepage()
+ {
+ $this->token->getUser()->getConfig()->setActionMarkAsRead(Config::REDIRECT_TO_HOMEPAGE);
+
+ $redirectUrl = $this->redirect->to('/unread/list');
+
+ $this->assertEquals($this->routerMock->generate('homepage'), $redirectUrl);
}
}