Merge remote-tracking branch 'origin/master' into 2.3

[github/wallabag/wallabag.git] / tests / Wallabag / ApiBundle / Controller / EntryRestControllerTest.php

diff --git a/tests/Wallabag/ApiBundle/Controller/EntryRestControllerTest.php b/tests/Wallabag/ApiBundle/Controller/EntryRestControllerTest.php
index 1f5c7a4f8ea074c4c7a648e76156020d298d061e..19fb51707a0272d1290089e1c6884c081708a9da 100644 (file)
--- a/tests/Wallabag/ApiBundle/Controller/EntryRestControllerTest.php
+++ b/tests/Wallabag/ApiBundle/Controller/EntryRestControllerTest.php
@@ -298,7 +298,7 @@ class EntryRestControllerTest extends WallabagApiTestCase
         $entry = $this->client->getContainer()
             ->get('doctrine.orm.entity_manager')
             ->getRepository('WallabagCoreBundle:Entry')
-            ->findOneByUser(1);
+            ->findOneByUser(1, ['id' => 'asc']);
 
         if (!$entry) {
             $this->markTestSkipped('No content found in db.');
@@ -717,32 +717,69 @@ class EntryRestControllerTest extends WallabagApiTestCase
 
     public function testPostEntriesTagsListAction()
     {
+        $entry = $this->client->getContainer()->get('doctrine.orm.entity_manager')
+            ->getRepository('WallabagCoreBundle:Entry')
+            ->findByUrlAndUserId('http://0.0.0.0/entry4', 1);
+
+        $tags = $entry->getTags();
+
+        $this->assertCount(2, $tags);
+
         $list = [
             [
-                'url' => 'http://0.0.0.0/entry1',
-                'tags' => 'foo bar, baz',
-                'action' => 'delete',
+                'url' => 'http://0.0.0.0/entry4',
+                'tags' => 'new tag 1, new tag 2',
             ],
+        ];
+
+        $this->client->request('POST', '/api/entries/tags/lists?list='.json_encode($list));
+
+        $this->assertEquals(200, $this->client->getResponse()->getStatusCode());
+
+        $content = json_decode($this->client->getResponse()->getContent(), true);
+
+        $this->assertInternalType('int', $content[0]['entry']);
+        $this->assertEquals('http://0.0.0.0/entry4', $content[0]['url']);
+
+        $entry = $this->client->getContainer()->get('doctrine.orm.entity_manager')
+            ->getRepository('WallabagCoreBundle:Entry')
+            ->findByUrlAndUserId('http://0.0.0.0/entry4', 1);
+
+        $tags = $entry->getTags();
+        $this->assertCount(4, $tags);
+    }
+
+    public function testDeleteEntriesTagsListAction()
+    {
+        $entry = $this->client->getContainer()->get('doctrine.orm.entity_manager')
+            ->getRepository('WallabagCoreBundle:Entry')
+            ->findByUrlAndUserId('http://0.0.0.0/entry4', 1);
+
+        $tags = $entry->getTags();
+
+        $this->assertCount(4, $tags);
+
+        $list = [
             [
-                'url' => 'http://0.0.0.0/entry2',
+                'url' => 'http://0.0.0.0/entry4',
                 'tags' => 'new tag 1, new tag 2',
-                'action' => 'add',
             ],
         ];
 
-        $this->client->request('POST', '/api/entries/tags/lists?list='.json_encode($list));
+        $this->client->request('DELETE', '/api/entries/tags/list?list='.json_encode($list));
 
         $this->assertEquals(200, $this->client->getResponse()->getStatusCode());
 
         $content = json_decode($this->client->getResponse()->getContent(), true);
 
+        $this->assertInternalType('int', $content[0]['entry']);
+        $this->assertEquals('http://0.0.0.0/entry4', $content[0]['url']);
 
-        $this->assertFalse($content[0]['entry']);
-        $this->assertEquals('http://0.0.0.0/entry1', $content[0]['url']);
-        $this->assertEquals('delete', $content[0]['action']);
+        $entry = $this->client->getContainer()->get('doctrine.orm.entity_manager')
+            ->getRepository('WallabagCoreBundle:Entry')
+            ->findByUrlAndUserId('http://0.0.0.0/entry4', 1);
 
-        $this->assertInternalType('int', $content[1]['entry']);
-        $this->assertEquals('http://0.0.0.0/entry2', $content[1]['url']);
-        $this->assertEquals('add', $content[1]['action']);
+        $tags = $entry->getTags();
+        $this->assertCount(2, $tags);
     }
 }