oss/wallabag
oss/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-09-15 18:57:05 +00:00
Code Wiki Activity

Cleanup

Browse source
This commit is contained in:
Jeremy Benoist 2022-11-23 15:51:33 +01:00
parent af6363bbbd
commit b7dba18cb2
No known key found for this signature in database
GPG key ID: 7168D5DD29F38552
41 changed files with 285 additions and 950 deletions
Download patch file Download diff file Expand all files Collapse all files

6
tests/Wallabag/AnnotationBundle/WallabagAnnotationTestCase.php
View file

@ -3,6 +3,8 @@
namespace Tests\Wallabag\AnnotationBundle;
use FOS\UserBundle\Model\UserInterface;
use FOS\UserBundle\Model\UserManager;
use FOS\UserBundle\Security\LoginManager;
use Symfony\Bundle\FrameworkBundle\Client;
use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
use Symfony\Component\BrowserKit\Cookie;
@ -47,9 +49,9 @@ abstract class WallabagAnnotationTestCase extends WebTestCase
$client = static::createClient();
$container = $client->getContainer();
/** @var $userManager \FOS\UserBundle\Doctrine\UserManager */
/** @var UserManager $userManager */
$userManager = $container->get('fos_user.user_manager.test');
/** @var $loginManager \FOS\UserBundle\Security\LoginManager */
/** @var LoginManager $loginManager */
$loginManager = $container->get('fos_user.security.login_manager.test');
$firewallName = $container->getParameter('fos_user.firewall_name');

6
tests/Wallabag/ApiBundle/WallabagApiTestCase.php
View file

@ -4,6 +4,8 @@ namespace Tests\Wallabag\ApiBundle;
use Doctrine\ORM\EntityManagerInterface;
use FOS\UserBundle\Model\UserInterface;
use FOS\UserBundle\Model\UserManager;
use FOS\UserBundle\Security\LoginManager;
use Symfony\Bundle\FrameworkBundle\Client;
use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
use Symfony\Component\BrowserKit\Cookie;
@ -37,9 +39,9 @@ abstract class WallabagApiTestCase extends WebTestCase
$client = static::createClient();
$container = $client->getContainer();
/** @var $userManager \FOS\UserBundle\Doctrine\UserManager */
/** @var UserManager $userManager */
$userManager = $container->get('fos_user.user_manager.test');
/** @var $loginManager \FOS\UserBundle\Security\LoginManager */
/** @var LoginManager $loginManager */
$loginManager = $container->get('fos_user.security.login_manager.test');
$firewallName = $container->getParameter('fos_user.firewall_name');

6
tests/Wallabag/CoreBundle/Controller/ConfigControllerTest.php
View file

@ -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);

29
tests/Wallabag/CoreBundle/Helper/RedirectTest.php
View file

@ -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);