From 4059a061c0c8cc787f71e96aef2ab01599d3241d Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Tue, 29 Dec 2015 15:08:33 +0100 Subject: Fix the way to remove a tag from all user entries --- .../ApiBundle/Tests/Controller/WallabagRestControllerTest.php | 7 +++++++ src/Wallabag/ApiBundle/Tests/WallabagApiTestCase.php | 9 +++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) (limited to 'src/Wallabag/ApiBundle/Tests') diff --git a/src/Wallabag/ApiBundle/Tests/Controller/WallabagRestControllerTest.php b/src/Wallabag/ApiBundle/Tests/Controller/WallabagRestControllerTest.php index a7120e83..22894a77 100644 --- a/src/Wallabag/ApiBundle/Tests/Controller/WallabagRestControllerTest.php +++ b/src/Wallabag/ApiBundle/Tests/Controller/WallabagRestControllerTest.php @@ -310,5 +310,12 @@ class WallabagRestControllerTest extends WallabagApiTestCase $this->assertArrayHasKey('label', $content); $this->assertEquals($tag['label'], $content['label']); $this->assertEquals($tag['slug'], $content['slug']); + + $entries = $entry = $this->client->getContainer() + ->get('doctrine.orm.entity_manager') + ->getRepository('WallabagCoreBundle:Entry') + ->findAllByTagId($this->user->getId(), $tag['id']); + + $this->assertCount(0, $entries); } } diff --git a/src/Wallabag/ApiBundle/Tests/WallabagApiTestCase.php b/src/Wallabag/ApiBundle/Tests/WallabagApiTestCase.php index 8a57fea2..a415c749 100644 --- a/src/Wallabag/ApiBundle/Tests/WallabagApiTestCase.php +++ b/src/Wallabag/ApiBundle/Tests/WallabagApiTestCase.php @@ -12,6 +12,11 @@ abstract class WallabagApiTestCase extends WebTestCase */ protected $client = null; + /** + * @var \FOS\UserBundle\Model\UserInterface + */ + protected $user; + public function setUp() { $this->client = $this->createAuthorizedClient(); @@ -31,8 +36,8 @@ abstract class WallabagApiTestCase extends WebTestCase $loginManager = $container->get('fos_user.security.login_manager'); $firewallName = $container->getParameter('fos_user.firewall_name'); - $user = $userManager->findUserBy(array('username' => 'admin')); - $loginManager->loginUser($firewallName, $user); + $this->user = $userManager->findUserBy(array('username' => 'admin')); + $loginManager->loginUser($firewallName, $this->user); // save the login token into the session and put it in a cookie $container->get('session')->set('_security_'.$firewallName, serialize($container->get('security.token_storage')->getToken())); -- cgit v1.2.3