diff options
author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-07-20 12:02:02 +0200 |
---|---|---|
committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-07-20 12:02:02 +0200 |
commit | 0faeabefa7faedb3a6a3675a5e49e947554adae9 (patch) | |
tree | e51ae7db64408b159b2dfa13bfa9e01530223dc9 /tests/Wallabag/CoreBundle/Controller | |
parent | 2bb138ef6df2d1a608b42907185b274fb87f4513 (diff) | |
parent | 317fc6e684356b645ea1327c2631c7d5fc193ddd (diff) | |
download | wallabag-0faeabefa7faedb3a6a3675a5e49e947554adae9.tar.gz wallabag-0faeabefa7faedb3a6a3675a5e49e947554adae9.tar.zst wallabag-0faeabefa7faedb3a6a3675a5e49e947554adae9.zip |
Merge remote-tracking branch 'origin/master' into 2.1
Diffstat (limited to 'tests/Wallabag/CoreBundle/Controller')
-rw-r--r-- | tests/Wallabag/CoreBundle/Controller/SecurityControllerTest.php | 2 | ||||
-rw-r--r-- | tests/Wallabag/CoreBundle/Controller/TagControllerTest.php | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/tests/Wallabag/CoreBundle/Controller/SecurityControllerTest.php b/tests/Wallabag/CoreBundle/Controller/SecurityControllerTest.php index f503ff4b..03355f5a 100644 --- a/tests/Wallabag/CoreBundle/Controller/SecurityControllerTest.php +++ b/tests/Wallabag/CoreBundle/Controller/SecurityControllerTest.php | |||
@@ -36,7 +36,7 @@ class SecurityControllerTest extends WallabagCoreTestCase | |||
36 | $em->persist($user); | 36 | $em->persist($user); |
37 | $em->flush(); | 37 | $em->flush(); |
38 | 38 | ||
39 | $this->logInAs('admin'); | 39 | $this->logInAsUsingHttp('admin'); |
40 | $crawler = $client->request('GET', '/config'); | 40 | $crawler = $client->request('GET', '/config'); |
41 | $this->assertContains('scheb_two_factor.trusted', $crawler->filter('body')->extract(['_text'])[0]); | 41 | $this->assertContains('scheb_two_factor.trusted', $crawler->filter('body')->extract(['_text'])[0]); |
42 | 42 | ||
diff --git a/tests/Wallabag/CoreBundle/Controller/TagControllerTest.php b/tests/Wallabag/CoreBundle/Controller/TagControllerTest.php index a019d36c..58450e5f 100644 --- a/tests/Wallabag/CoreBundle/Controller/TagControllerTest.php +++ b/tests/Wallabag/CoreBundle/Controller/TagControllerTest.php | |||
@@ -39,6 +39,12 @@ class TagControllerTest extends WallabagCoreTestCase | |||
39 | $client->submit($form, $data); | 39 | $client->submit($form, $data); |
40 | $this->assertEquals(302, $client->getResponse()->getStatusCode()); | 40 | $this->assertEquals(302, $client->getResponse()->getStatusCode()); |
41 | 41 | ||
42 | // be sure to reload the entry | ||
43 | $entry = $client->getContainer() | ||
44 | ->get('doctrine.orm.entity_manager') | ||
45 | ->getRepository('WallabagCoreBundle:Entry') | ||
46 | ->findOneByUsernameAndNotArchived('admin'); | ||
47 | |||
42 | $this->assertEquals(1, count($entry->getTags())); | 48 | $this->assertEquals(1, count($entry->getTags())); |
43 | 49 | ||
44 | # tag already exists and already assigned | 50 | # tag already exists and already assigned |