X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2FWallabag%2FCoreBundle%2FTests%2FController%2FTagControllerTest.php;h=d639128224f60a149cb6989ffafd1f305ea85316;hb=9b5edf33a00490b033692efca9987a35225835ba;hp=af39d6ce11ea28386cc00bef3a121c2fbaaa49ca;hpb=ec00964de22a338d8f814c5440f8e09f542fdbbf;p=github%2Fwallabag%2Fwallabag.git

diff --git a/src/Wallabag/CoreBundle/Tests/Controller/TagControllerTest.php b/src/Wallabag/CoreBundle/Tests/Controller/TagControllerTest.php
index af39d6ce..d6391282 100644
--- a/src/Wallabag/CoreBundle/Tests/Controller/TagControllerTest.php
+++ b/src/Wallabag/CoreBundle/Tests/Controller/TagControllerTest.php
@@ -6,6 +6,8 @@ use Wallabag\CoreBundle\Tests\WallabagCoreTestCase;
 
 class TagControllerTest extends WallabagCoreTestCase
 {
+    public $tagName = 'opensource';
+
     public function testList()
     {
         $this->logInAs('admin');
@@ -24,14 +26,14 @@ class TagControllerTest extends WallabagCoreTestCase
         $entry = $client->getContainer()
             ->get('doctrine.orm.entity_manager')
             ->getRepository('WallabagCoreBundle:Entry')
-            ->findOneByIsArchived(false);
+            ->findOneByUsernameAndNotArchived('admin');
 
         $crawler = $client->request('GET', '/view/'.$entry->getId());
 
         $form = $crawler->filter('button[id=tag_save]')->form();
 
         $data = array(
-            'tag[label]' => 'opensource',
+            'tag[label]' => $this->tagName,
         );
 
         $client->submit($form, $data);
@@ -46,7 +48,7 @@ class TagControllerTest extends WallabagCoreTestCase
         $newEntry = $client->getContainer()
             ->get('doctrine.orm.entity_manager')
             ->getRepository('WallabagCoreBundle:Entry')
-            ->findOneById($entry->getId());
+            ->find($entry->getId());
 
         $this->assertEquals(1, count($newEntry->getTags()));
 
@@ -61,8 +63,34 @@ class TagControllerTest extends WallabagCoreTestCase
         $newEntry = $client->getContainer()
             ->get('doctrine.orm.entity_manager')
             ->getRepository('WallabagCoreBundle:Entry')
-            ->findOneById($entry->getId());
+            ->find($entry->getId());
 
         $this->assertEquals(2, count($newEntry->getTags()));
     }
+
+    public function testRemoveTagFromEntry()
+    {
+        $this->logInAs('admin');
+        $client = $this->getClient();
+
+        $entry = $client->getContainer()
+            ->get('doctrine.orm.entity_manager')
+            ->getRepository('WallabagCoreBundle:Entry')
+            ->findOneByUsernameAndNotArchived('admin');
+
+        $tag = $client->getContainer()
+            ->get('doctrine.orm.entity_manager')
+            ->getRepository('WallabagCoreBundle:Tag')
+            ->findOneByEntryAndTagLabel($entry, $this->tagName);
+
+        $client->request('GET', '/remove-tag/'.$entry->getId().'/'.$tag->getId());
+
+        $this->assertEquals(302, $client->getResponse()->getStatusCode());
+
+        $this->assertNotContains($this->tagName, $entry->getTags());
+
+        $client->request('GET', '/remove-tag/'.$entry->getId().'/'.$tag->getId());
+
+        $this->assertEquals(404, $client->getResponse()->getStatusCode());
+    }
 }