aboutsummaryrefslogtreecommitdiffhomepage
path: root/tests/Wallabag
diff options
context:
space:
mode:
authorNicolas LÅ“uillet <nicolas@loeuillet.org>2016-11-06 12:02:39 +0100
committerJeremy Benoist <jeremy.benoist@gmail.com>2016-11-16 23:07:34 +0100
commita42f38d9fb7906b785285fab2a09f8c2b9efe996 (patch)
tree8f85793b17497827d063527a339aea42d81ed483 /tests/Wallabag
parente042a5d78fc7676eb399f61d199e8ec0045fbd1f (diff)
downloadwallabag-a42f38d9fb7906b785285fab2a09f8c2b9efe996.tar.gz
wallabag-a42f38d9fb7906b785285fab2a09f8c2b9efe996.tar.zst
wallabag-a42f38d9fb7906b785285fab2a09f8c2b9efe996.zip
Added a configuration to define the redirection after archiving an entry
Fix #496
Diffstat (limited to 'tests/Wallabag')
-rw-r--r--tests/Wallabag/CoreBundle/Controller/ConfigControllerTest.php1
-rw-r--r--tests/Wallabag/CoreBundle/Helper/DownloadImagesTest.php1
-rw-r--r--tests/Wallabag/CoreBundle/Helper/RedirectTest.php5
3 files changed, 5 insertions, 2 deletions
diff --git a/tests/Wallabag/CoreBundle/Controller/ConfigControllerTest.php b/tests/Wallabag/CoreBundle/Controller/ConfigControllerTest.php
index 568576a3..a2863014 100644
--- a/tests/Wallabag/CoreBundle/Controller/ConfigControllerTest.php
+++ b/tests/Wallabag/CoreBundle/Controller/ConfigControllerTest.php
@@ -51,6 +51,7 @@ class ConfigControllerTest extends WallabagCoreTestCase
51 'config[theme]' => 'baggy', 51 'config[theme]' => 'baggy',
52 'config[items_per_page]' => '30', 52 'config[items_per_page]' => '30',
53 'config[reading_speed]' => '0.5', 53 'config[reading_speed]' => '0.5',
54 'config[action_mark_as_read]' => '0',
54 'config[language]' => 'en', 55 'config[language]' => 'en',
55 ]; 56 ];
56 57
diff --git a/tests/Wallabag/CoreBundle/Helper/DownloadImagesTest.php b/tests/Wallabag/CoreBundle/Helper/DownloadImagesTest.php
index 920c21d9..85f12d87 100644
--- a/tests/Wallabag/CoreBundle/Helper/DownloadImagesTest.php
+++ b/tests/Wallabag/CoreBundle/Helper/DownloadImagesTest.php
@@ -3,7 +3,6 @@
3namespace Tests\Wallabag\CoreBundle\Helper; 3namespace Tests\Wallabag\CoreBundle\Helper;
4 4
5use Wallabag\CoreBundle\Helper\DownloadImages; 5use Wallabag\CoreBundle\Helper\DownloadImages;
6use Psr\Log\NullLogger;
7use Monolog\Logger; 6use Monolog\Logger;
8use Monolog\Handler\TestHandler; 7use Monolog\Handler\TestHandler;
9use GuzzleHttp\Client; 8use GuzzleHttp\Client;
diff --git a/tests/Wallabag/CoreBundle/Helper/RedirectTest.php b/tests/Wallabag/CoreBundle/Helper/RedirectTest.php
index f339f75e..825e8d53 100644
--- a/tests/Wallabag/CoreBundle/Helper/RedirectTest.php
+++ b/tests/Wallabag/CoreBundle/Helper/RedirectTest.php
@@ -15,7 +15,10 @@ class RedirectTest extends \PHPUnit_Framework_TestCase
15 public function setUp() 15 public function setUp()
16 { 16 {
17 $this->routerMock = $this->getRouterMock(); 17 $this->routerMock = $this->getRouterMock();
18 $this->redirect = new Redirect($this->routerMock); 18 $tokenStorage = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface')
19 ->disableOriginalConstructor()
20 ->getMock();
21 $this->redirect = new Redirect($this->routerMock, $tokenStorage);
19 } 22 }
20 23
21 public function testRedirectToNullWithFallback() 24 public function testRedirectToNullWithFallback()