aboutsummaryrefslogtreecommitdiffhomepage
path: root/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php
diff options
context:
space:
mode:
Diffstat (limited to 'tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php')
-rw-r--r--tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php20
1 files changed, 11 insertions, 9 deletions
diff --git a/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php b/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php
index 479e0700..006ca330 100644
--- a/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php
+++ b/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php
@@ -620,7 +620,7 @@ class EntryControllerTest extends WallabagCoreTestCase
620 $content->setMimetype('text/html'); 620 $content->setMimetype('text/html');
621 $content->setTitle('test title entry'); 621 $content->setTitle('test title entry');
622 $content->setContent('This is my content /o/'); 622 $content->setContent('This is my content /o/');
623 $content->setArchived(true); 623 $content->updateArchived(true);
624 $content->setLanguage('fr'); 624 $content->setLanguage('fr');
625 625
626 $em->persist($content); 626 $em->persist($content);
@@ -773,7 +773,7 @@ class EntryControllerTest extends WallabagCoreTestCase
773 773
774 $entry = new Entry($this->getLoggedInUser()); 774 $entry = new Entry($this->getLoggedInUser());
775 $entry->setUrl($this->url); 775 $entry->setUrl($this->url);
776 $entry->setArchived(false); 776 $entry->updateArchived(false);
777 $this->getEntityManager()->persist($entry); 777 $this->getEntityManager()->persist($entry);
778 $this->getEntityManager()->flush(); 778 $this->getEntityManager()->flush();
779 779
@@ -984,8 +984,13 @@ class EntryControllerTest extends WallabagCoreTestCase
984 $client->request('GET', '/share/' . $content->getId()); 984 $client->request('GET', '/share/' . $content->getId());
985 $this->assertSame(302, $client->getResponse()->getStatusCode()); 985 $this->assertSame(302, $client->getResponse()->getStatusCode());
986 986
987 // follow link with uid 987 $shareUrl = $client->getResponse()->getTargetUrl();
988 $crawler = $client->followRedirect(); 988
989 // use a new client to have a fresh empty session (instead of a logged one from the previous client)
990 $client->restart();
991
992 $client->request('GET', $shareUrl);
993
989 $this->assertSame(200, $client->getResponse()->getStatusCode()); 994 $this->assertSame(200, $client->getResponse()->getStatusCode());
990 $this->assertContains('max-age=25200', $client->getResponse()->headers->get('cache-control')); 995 $this->assertContains('max-age=25200', $client->getResponse()->headers->get('cache-control'));
991 $this->assertContains('public', $client->getResponse()->headers->get('cache-control')); 996 $this->assertContains('public', $client->getResponse()->headers->get('cache-control'));
@@ -1001,9 +1006,6 @@ class EntryControllerTest extends WallabagCoreTestCase
1001 $client->request('GET', '/share/' . $content->getUid()); 1006 $client->request('GET', '/share/' . $content->getUid());
1002 $this->assertSame(404, $client->getResponse()->getStatusCode()); 1007 $this->assertSame(404, $client->getResponse()->getStatusCode());
1003 1008
1004 $client->request('GET', '/view/' . $content->getId());
1005 $this->assertContains('no-cache', $client->getResponse()->headers->get('cache-control'));
1006
1007 // removing the share 1009 // removing the share
1008 $client->request('GET', '/share/delete/' . $content->getId()); 1010 $client->request('GET', '/share/delete/' . $content->getId());
1009 $this->assertSame(302, $client->getResponse()->getStatusCode()); 1011 $this->assertSame(302, $client->getResponse()->getStatusCode());
@@ -1244,7 +1246,7 @@ class EntryControllerTest extends WallabagCoreTestCase
1244 $entry = new Entry($this->getLoggedInUser()); 1246 $entry = new Entry($this->getLoggedInUser());
1245 $entry->setUrl('http://0.0.0.0/foo/baz/qux'); 1247 $entry->setUrl('http://0.0.0.0/foo/baz/qux');
1246 $entry->setTitle('Le manège'); 1248 $entry->setTitle('Le manège');
1247 $entry->setArchived(true); 1249 $entry->updateArchived(true);
1248 $this->getEntityManager()->persist($entry); 1250 $this->getEntityManager()->persist($entry);
1249 $this->getEntityManager()->flush(); 1251 $this->getEntityManager()->flush();
1250 1252
@@ -1274,7 +1276,7 @@ class EntryControllerTest extends WallabagCoreTestCase
1274 $entry = new Entry($this->getLoggedInUser()); 1276 $entry = new Entry($this->getLoggedInUser());
1275 $entry->setUrl('http://domain/qux'); 1277 $entry->setUrl('http://domain/qux');
1276 $entry->setTitle('Le manège'); 1278 $entry->setTitle('Le manège');
1277 $entry->setArchived(true); 1279 $entry->updateArchived(true);
1278 $this->getEntityManager()->persist($entry); 1280 $this->getEntityManager()->persist($entry);
1279 $this->getEntityManager()->flush(); 1281 $this->getEntityManager()->flush();
1280 1282