Fix tests

diff --git a/src/Wallabag/ApiBundle/Tests/Controller/WallabagRestControllerTest.php b/src/Wallabag/ApiBundle/Tests/Controller/WallabagRestControllerTest.php
index ea8ee072e9115411289aab425f866d6f52327c83..b36ae7c68083fb259b06354f93b490074d0f8b76 100644 (file)
--- a/src/Wallabag/ApiBundle/Tests/Controller/WallabagRestControllerTest.php
+++ b/src/Wallabag/ApiBundle/Tests/Controller/WallabagRestControllerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Tests\Controller;
+namespace Wallabag\ApiBundle\Tests\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
@@ -177,10 +177,10 @@ class WallabagRestControllerTest extends WebTestCase
         $content = json_decode($client->getResponse()->getContent(), true);
 
         $this->assertGreaterThanOrEqual(1, count($content));
-        $this->assertEmpty($content['_embedded']['items']);
-        $this->assertEquals(0, $content['total']);
+        $this->assertNotEmpty($content['_embedded']['items']);
+        $this->assertGreaterThanOrEqual(1, $content['total']);
         $this->assertEquals(1, $content['page']);
-        $this->assertEquals(1, $content['pages']);
+        $this->assertGreaterThanOrEqual(1, $content['pages']);
 
         $this->assertTrue(
             $client->getResponse()->headers->contains(

diff --git a/src/Wallabag/CoreBundle/Controller/ConfigController.php b/src/Wallabag/CoreBundle/Controller/ConfigController.php
index 898c291f2b5ea028cead23a7963674afcbdc13a1..62ef3eeaf4107741be3671164131a8fb785b878e 100644 (file)
--- a/src/Wallabag/CoreBundle/Controller/ConfigController.php
+++ b/src/Wallabag/CoreBundle/Controller/ConfigController.php
@@ -133,7 +133,7 @@ class ConfigController extends Controller
             'rss' => array(
                 'username' => $user->getUsername(),
                 'token' => $config->getRssToken(),
-            )
+            ),
         ));
     }
 

diff --git a/src/Wallabag/CoreBundle/Tests/Controller/ConfigControllerTest.php b/src/Wallabag/CoreBundle/Tests/Controller/ConfigControllerTest.php
index 3c1589229fdfde946f5b7f352b8dc9efd4de10e8..a01457808deb18a918143af4e4ad0737d01bb797 100644 (file)
--- a/src/Wallabag/CoreBundle/Tests/Controller/ConfigControllerTest.php
+++ b/src/Wallabag/CoreBundle/Tests/Controller/ConfigControllerTest.php
@@ -397,7 +397,7 @@ class ConfigControllerTest extends WallabagCoreTestCase
         );
 
         $this->assertEquals(200, $client->getResponse()->getStatusCode());
-        $content = json_decode($client->getResponse()->getContent(), true);;
+        $content = json_decode($client->getResponse()->getContent(), true);
         $this->assertArrayHasKey('token', $content);
     }
 

diff --git a/src/Wallabag/CoreBundle/Tests/Controller/RssControllerTest.php b/src/Wallabag/CoreBundle/Tests/Controller/RssControllerTest.php
index 8f627b4b82cf2d2a93e8b9d804d8b9b6d8eff457..b7c162a77e0219b62ad1950d7d1fc3cfb5cd0ee8 100644 (file)
--- a/src/Wallabag/CoreBundle/Tests/Controller/RssControllerTest.php
+++ b/src/Wallabag/CoreBundle/Tests/Controller/RssControllerTest.php
@@ -2,9 +2,9 @@
 
 namespace Wallabag\CoreBundle\Tests\Controller;
 
-use Wallabag\CoreBundle\Tests\WallabagTestCase;
+use Wallabag\CoreBundle\Tests\WallabagCoreTestCase;
 
-class RssControllerTest extends WallabagTestCase
+class RssControllerTest extends WallabagCoreTestCase
 {
     public function validateDom($xml, $nb = null)
     {
@@ -36,13 +36,13 @@ class RssControllerTest extends WallabagTestCase
     {
         return array(
             array(
-                '/admin/YZIOAUZIAO/unread.xml'
+                '/admin/YZIOAUZIAO/unread.xml',
             ),
             array(
-                '/wallace/YZIOAUZIAO/starred.xml'
+                '/wallace/YZIOAUZIAO/starred.xml',
             ),
             array(
-                '/wallace/YZIOAUZIAO/archives.xml'
+                '/wallace/YZIOAUZIAO/archives.xml',
             ),
         );
     }