Fix tests

diff --git a/src/Wallabag/ApiBundle/Controller/EntryRestController.php b/src/Wallabag/ApiBundle/Controller/EntryRestController.php
index 5ccaa4ef885d12937c8005c1a106a300ac4b5d82..7590efbb16b5325102ccea35afdae450bd7581b6 100644 (file)
--- a/src/Wallabag/ApiBundle/Controller/EntryRestController.php
+++ b/src/Wallabag/ApiBundle/Controller/EntryRestController.php
@@ -459,7 +459,6 @@ class EntryRestController extends WallabagRestController
 
         // handle multiple urls
         if (!empty($list)) {
-            $results = [];
             foreach ($list as $key => $element) {
                 $entry = $this->get('wallabag_core.entry_repository')->findByUrlAndUserId(
                     $element->url,
@@ -517,7 +516,6 @@ class EntryRestController extends WallabagRestController
 
         // handle multiple urls
         if (!empty($list)) {
-            $results = [];
             foreach ($list as $key => $element) {
                 $entry = $this->get('wallabag_core.entry_repository')->findByUrlAndUserId(
                     $element->url,

diff --git a/tests/Wallabag/ApiBundle/Controller/EntryRestControllerTest.php b/tests/Wallabag/ApiBundle/Controller/EntryRestControllerTest.php
index 638e8bcd05a36cda945413fbe89dffc6f2fc2db4..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.');
@@ -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);
     }
 }