oss/wallabag
oss/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-08-01 17:38:38 +00:00
Code Wiki Activity

Jump to Symfony 3.4

Browse source 
Thanks to the BC compatibility, almost nothing have to be changed.
All changes are related to new bundle version of:
- SensioFrameworkExtraBundle
- DoctrineFixturesBundle
This commit is contained in:
Jeremy Benoist 2018-10-04 14:07:20 +02:00
parent 2b6380f5ac
commit 115de64e5b
No known key found for this signature in database
GPG key ID: BCA73962457ACC3C
34 changed files with 132 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

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

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

2
tests/Wallabag/ApiBundle/Controller/DeveloperControllerTest.php
View file

@ -121,7 +121,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');

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

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

6
tests/Wallabag/CoreBundle/Command/ReloadEntryCommandTest.php
View file

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

12
tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php
View file

@ -985,8 +985,13 @@ class EntryControllerTest extends WallabagCoreTestCase
$client->request('GET', '/share/' . $content->getId());
$this->assertSame(302, $client->getResponse()->getStatusCode());
// follow link with uid
$crawler = $client->followRedirect();
$shareUrl = $client->getResponse()->getTargetUrl();
// 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'));
@ -1002,9 +1007,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());

4
tests/Wallabag/CoreBundle/WallabagCoreTestCase.php
View file

@ -84,8 +84,8 @@ abstract class WallabagCoreTestCase extends WebTestCase
$container = $this->client->getContainer();
$session = $container->get('session');
$userManager = $container->get('fos_user.user_manager');
$loginManager = $container->get('fos_user.security.login_manager');
$userManager = $container->get('fos_user.user_manager.test');
$loginManager = $container->get('fos_user.security.login_manager.test');
$firewallName = $container->getParameter('fos_user.firewall_name');
$user = $userManager->findUserBy(['username' => $username]);