mirror of
https://github.com/wallabag/wallabag.git
synced 2025-08-01 17:38:38 +00:00
Cleanup
This commit is contained in:
parent
af6363bbbd
commit
b7dba18cb2
41 changed files with 285 additions and 950 deletions
|
@ -895,6 +895,8 @@ class ConfigControllerTest extends WallabagCoreTestCase
|
|||
|
||||
$user = static::$kernel->getContainer()->get(TokenStorageInterface::class)->getToken()->getUser();
|
||||
|
||||
\assert($user instanceof User);
|
||||
|
||||
$tag = new Tag();
|
||||
$tag->setLabel('super');
|
||||
$em->persist($tag);
|
||||
|
@ -980,6 +982,8 @@ class ConfigControllerTest extends WallabagCoreTestCase
|
|||
|
||||
$user = static::$kernel->getContainer()->get(TokenStorageInterface::class)->getToken()->getUser();
|
||||
|
||||
\assert($user instanceof User);
|
||||
|
||||
$tag = new Tag();
|
||||
$tag->setLabel('super');
|
||||
$em->persist($tag);
|
||||
|
@ -1056,6 +1060,8 @@ class ConfigControllerTest extends WallabagCoreTestCase
|
|||
|
||||
$user = static::$kernel->getContainer()->get(TokenStorageInterface::class)->getToken()->getUser();
|
||||
|
||||
\assert($user instanceof User);
|
||||
|
||||
$tag = new Tag();
|
||||
$tag->setLabel('super');
|
||||
$em->persist($tag);
|
||||
|
|
|
@ -18,6 +18,9 @@ class RedirectTest extends TestCase
|
|||
/** @var Redirect */
|
||||
private $redirect;
|
||||
|
||||
/** @var User */
|
||||
private $user;
|
||||
|
||||
/** @var UsernamePasswordToken */
|
||||
private $token;
|
||||
|
||||
|
@ -32,24 +35,24 @@ class RedirectTest extends TestCase
|
|||
->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');
|
||||
$this->user = new User();
|
||||
$this->user->setName('youpi');
|
||||
$this->user->setEmail('youpi@youpi.org');
|
||||
$this->user->setUsername('youpi');
|
||||
$this->user->setPlainPassword('youpi');
|
||||
$this->user->setEnabled(true);
|
||||
$this->user->addRole('ROLE_SUPER_ADMIN');
|
||||
|
||||
$config = new Config($user);
|
||||
$config = new Config($this->user);
|
||||
$config->setItemsPerPage(30);
|
||||
$config->setReadingSpeed(200);
|
||||
$config->setLanguage('en');
|
||||
$config->setPocketConsumerKey('xxxxx');
|
||||
$config->setActionMarkAsRead(Config::REDIRECT_TO_CURRENT_PAGE);
|
||||
|
||||
$user->setConfig($config);
|
||||
$this->user->setConfig($config);
|
||||
|
||||
$this->token = new UsernamePasswordToken($user, 'password', 'key');
|
||||
$this->token = new UsernamePasswordToken($this->user, 'password', 'key');
|
||||
$tokenStorage = new TokenStorage();
|
||||
$tokenStorage->setToken($this->token);
|
||||
|
||||
|
@ -87,7 +90,7 @@ class RedirectTest extends TestCase
|
|||
|
||||
public function testUserForRedirectToHomepage()
|
||||
{
|
||||
$this->token->getUser()->getConfig()->setActionMarkAsRead(Config::REDIRECT_TO_HOMEPAGE);
|
||||
$this->user->getConfig()->setActionMarkAsRead(Config::REDIRECT_TO_HOMEPAGE);
|
||||
|
||||
$redirectUrl = $this->redirect->to('/unread/list');
|
||||
|
||||
|
@ -96,7 +99,7 @@ class RedirectTest extends TestCase
|
|||
|
||||
public function testUserForRedirectWithIgnoreActionMarkAsRead()
|
||||
{
|
||||
$this->token->getUser()->getConfig()->setActionMarkAsRead(Config::REDIRECT_TO_HOMEPAGE);
|
||||
$this->user->getConfig()->setActionMarkAsRead(Config::REDIRECT_TO_HOMEPAGE);
|
||||
|
||||
$redirectUrl = $this->redirect->to('/unread/list', '', true);
|
||||
|
||||
|
@ -105,7 +108,7 @@ class RedirectTest extends TestCase
|
|||
|
||||
public function testUserForRedirectNullWithFallbackWithIgnoreActionMarkAsRead()
|
||||
{
|
||||
$this->token->getUser()->getConfig()->setActionMarkAsRead(Config::REDIRECT_TO_HOMEPAGE);
|
||||
$this->user->getConfig()->setActionMarkAsRead(Config::REDIRECT_TO_HOMEPAGE);
|
||||
|
||||
$redirectUrl = $this->redirect->to(null, 'fallback', true);
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue