diff options
author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2018-10-04 14:07:20 +0200 |
---|---|---|
committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2018-10-04 14:11:57 +0200 |
commit | 115de64e5bb9d7f9151ecf15e15a0d988563528e (patch) | |
tree | 004a45801b8e811e97661a156d862da572f14034 /tests/Wallabag/CoreBundle | |
parent | 2b6380f5acaecaa7aa04c12d7bf4fd7c84b60b08 (diff) | |
download | wallabag-115de64e5bb9d7f9151ecf15e15a0d988563528e.tar.gz wallabag-115de64e5bb9d7f9151ecf15e15a0d988563528e.tar.zst wallabag-115de64e5bb9d7f9151ecf15e15a0d988563528e.zip |
Jump to Symfony 3.4
Thanks to the BC compatibility, almost nothing have to be changed.
All changes are related to new bundle version of:
- SensioFrameworkExtraBundle
- DoctrineFixturesBundle
Diffstat (limited to 'tests/Wallabag/CoreBundle')
3 files changed, 12 insertions, 10 deletions
diff --git a/tests/Wallabag/CoreBundle/Command/ReloadEntryCommandTest.php b/tests/Wallabag/CoreBundle/Command/ReloadEntryCommandTest.php index b13f6519..c4bd6dac 100644 --- a/tests/Wallabag/CoreBundle/Command/ReloadEntryCommandTest.php +++ b/tests/Wallabag/CoreBundle/Command/ReloadEntryCommandTest.php | |||
@@ -26,7 +26,7 @@ class ReloadEntryCommandTest extends WallabagCoreTestCase | |||
26 | { | 26 | { |
27 | parent::setUp(); | 27 | parent::setUp(); |
28 | 28 | ||
29 | $userRepository = $this->getClient()->getContainer()->get('wallabag_user.user_repository'); | 29 | $userRepository = $this->getClient()->getContainer()->get('wallabag_user.user_repository.test'); |
30 | 30 | ||
31 | $user = $userRepository->findOneByUserName('admin'); | 31 | $user = $userRepository->findOneByUserName('admin'); |
32 | $this->adminEntry = new Entry($user); | 32 | $this->adminEntry = new Entry($user); |
@@ -60,7 +60,7 @@ class ReloadEntryCommandTest extends WallabagCoreTestCase | |||
60 | 60 | ||
61 | $reloadedEntries = $this->getClient() | 61 | $reloadedEntries = $this->getClient() |
62 | ->getContainer() | 62 | ->getContainer() |
63 | ->get('wallabag_core.entry_repository') | 63 | ->get('wallabag_core.entry_repository.test') |
64 | ->findById([$this->adminEntry->getId(), $this->bobEntry->getId()]); | 64 | ->findById([$this->adminEntry->getId(), $this->bobEntry->getId()]); |
65 | 65 | ||
66 | foreach ($reloadedEntries as $reloadedEntry) { | 66 | foreach ($reloadedEntries as $reloadedEntry) { |
@@ -84,7 +84,7 @@ class ReloadEntryCommandTest extends WallabagCoreTestCase | |||
84 | 'interactive' => false, | 84 | 'interactive' => false, |
85 | ]); | 85 | ]); |
86 | 86 | ||
87 | $entryRepository = $this->getClient()->getContainer()->get('wallabag_core.entry_repository'); | 87 | $entryRepository = $this->getClient()->getContainer()->get('wallabag_core.entry_repository.test'); |
88 | 88 | ||
89 | $reloadedAdminEntry = $entryRepository->find($this->adminEntry->getId()); | 89 | $reloadedAdminEntry = $entryRepository->find($this->adminEntry->getId()); |
90 | $this->assertNotEmpty($reloadedAdminEntry->getContent()); | 90 | $this->assertNotEmpty($reloadedAdminEntry->getContent()); |
diff --git a/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php b/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php index 0ac119d8..6effe43e 100644 --- a/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php +++ b/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php | |||
@@ -985,8 +985,13 @@ class EntryControllerTest extends WallabagCoreTestCase | |||
985 | $client->request('GET', '/share/' . $content->getId()); | 985 | $client->request('GET', '/share/' . $content->getId()); |
986 | $this->assertSame(302, $client->getResponse()->getStatusCode()); | 986 | $this->assertSame(302, $client->getResponse()->getStatusCode()); |
987 | 987 | ||
988 | // follow link with uid | 988 | $shareUrl = $client->getResponse()->getTargetUrl(); |
989 | $crawler = $client->followRedirect(); | 989 | |
990 | // use a new client to have a fresh empty session (instead of a logged one from the previous client) | ||
991 | $client->restart(); | ||
992 | |||
993 | $client->request('GET', $shareUrl); | ||
994 | |||
990 | $this->assertSame(200, $client->getResponse()->getStatusCode()); | 995 | $this->assertSame(200, $client->getResponse()->getStatusCode()); |
991 | $this->assertContains('max-age=25200', $client->getResponse()->headers->get('cache-control')); | 996 | $this->assertContains('max-age=25200', $client->getResponse()->headers->get('cache-control')); |
992 | $this->assertContains('public', $client->getResponse()->headers->get('cache-control')); | 997 | $this->assertContains('public', $client->getResponse()->headers->get('cache-control')); |
@@ -1002,9 +1007,6 @@ class EntryControllerTest extends WallabagCoreTestCase | |||
1002 | $client->request('GET', '/share/' . $content->getUid()); | 1007 | $client->request('GET', '/share/' . $content->getUid()); |
1003 | $this->assertSame(404, $client->getResponse()->getStatusCode()); | 1008 | $this->assertSame(404, $client->getResponse()->getStatusCode()); |
1004 | 1009 | ||
1005 | $client->request('GET', '/view/' . $content->getId()); | ||
1006 | $this->assertContains('no-cache', $client->getResponse()->headers->get('cache-control')); | ||
1007 | |||
1008 | // removing the share | 1010 | // removing the share |
1009 | $client->request('GET', '/share/delete/' . $content->getId()); | 1011 | $client->request('GET', '/share/delete/' . $content->getId()); |
1010 | $this->assertSame(302, $client->getResponse()->getStatusCode()); | 1012 | $this->assertSame(302, $client->getResponse()->getStatusCode()); |
diff --git a/tests/Wallabag/CoreBundle/WallabagCoreTestCase.php b/tests/Wallabag/CoreBundle/WallabagCoreTestCase.php index 6e1163c5..816d22f4 100644 --- a/tests/Wallabag/CoreBundle/WallabagCoreTestCase.php +++ b/tests/Wallabag/CoreBundle/WallabagCoreTestCase.php | |||
@@ -84,8 +84,8 @@ abstract class WallabagCoreTestCase extends WebTestCase | |||
84 | $container = $this->client->getContainer(); | 84 | $container = $this->client->getContainer(); |
85 | $session = $container->get('session'); | 85 | $session = $container->get('session'); |
86 | 86 | ||
87 | $userManager = $container->get('fos_user.user_manager'); | 87 | $userManager = $container->get('fos_user.user_manager.test'); |
88 | $loginManager = $container->get('fos_user.security.login_manager'); | 88 | $loginManager = $container->get('fos_user.security.login_manager.test'); |
89 | $firewallName = $container->getParameter('fos_user.firewall_name'); | 89 | $firewallName = $container->getParameter('fos_user.firewall_name'); |
90 | 90 | ||
91 | $user = $userManager->findUserBy(['username' => $username]); | 91 | $user = $userManager->findUserBy(['username' => $username]); |