Merge pull request #3047 from wallabag/add-notmatches-operator

[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 638e8bcd05a36cda945413fbe89dffc6f2fc2db4..e6ffd6641a319f6575f2ce41fbbd6729e09ecc1f 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.');
@@ -337,7 +337,7 @@ class EntryRestControllerTest extends WallabagApiTestCase
         $this->assertEquals(false, $content['is_starred']);
         $this->assertEquals('New title for my article', $content['title']);
         $this->assertEquals(1, $content['user_id']);
-        $this->assertCount(1, $content['tags']);
+        $this->assertCount(2, $content['tags']);
     }
 
     public function testPostSameEntry()
@@ -356,7 +356,7 @@ class EntryRestControllerTest extends WallabagApiTestCase
         $this->assertEquals('http://www.lemonde.fr/pixels/article/2015/03/28/plongee-dans-l-univers-d-ingress-le-jeu-de-google-aux-frontieres-du-reel_4601155_4408996.html', $content['url']);
         $this->assertEquals(true, $content['is_archived']);
         $this->assertEquals(false, $content['is_starred']);
-        $this->assertCount(2, $content['tags']);
+        $this->assertCount(3, $content['tags']);
     }
 
     public function testPostArchivedAndStarredEntry()
@@ -719,15 +719,15 @@ class EntryRestControllerTest extends WallabagApiTestCase
     {
         $entry = $this->client->getContainer()->get('doctrine.orm.entity_manager')
             ->getRepository('WallabagCoreBundle:Entry')
-            ->findByUrlAndUserId('http://0.0.0.0/entry2', 1);
+            ->findByUrlAndUserId('http://0.0.0.0/entry4', 1);
 
         $tags = $entry->getTags();
 
-        $this->assertCount(4, $tags);
+        $this->assertCount(2, $tags);
 
         $list = [
             [
-                'url' => 'http://0.0.0.0/entry2',
+                'url' => 'http://0.0.0.0/entry4',
                 'tags' => 'new tag 1, new tag 2',
             ],
         ];
@@ -739,29 +739,29 @@ class EntryRestControllerTest extends WallabagApiTestCase
         $content = json_decode($this->client->getResponse()->getContent(), true);
 
         $this->assertInternalType('int', $content[0]['entry']);
-        $this->assertEquals('http://0.0.0.0/entry2', $content[0]['url']);
+        $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/entry2', 1);
+            ->findByUrlAndUserId('http://0.0.0.0/entry4', 1);
 
         $tags = $entry->getTags();
-        $this->assertCount(6, $tags);
+        $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/entry2', 1);
+            ->findByUrlAndUserId('http://0.0.0.0/entry4', 1);
 
         $tags = $entry->getTags();
 
-        $this->assertCount(6, $tags);
+        $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',
             ],
         ];
@@ -773,13 +773,13 @@ class EntryRestControllerTest extends WallabagApiTestCase
         $content = json_decode($this->client->getResponse()->getContent(), true);
 
         $this->assertInternalType('int', $content[0]['entry']);
-        $this->assertEquals('http://0.0.0.0/entry2', $content[0]['url']);
+        $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/entry2', 1);
+            ->findByUrlAndUserId('http://0.0.0.0/entry4', 1);
 
         $tags = $entry->getTags();
-        $this->assertCount(4, $tags);
+        $this->assertCount(2, $tags);
     }
 }