Merge pull request #2654 from Kdecherf/domain-filter

[github/wallabag/wallabag.git] / tests / Wallabag / CoreBundle / Controller / ConfigControllerTest.php

diff --git a/tests/Wallabag/CoreBundle/Controller/ConfigControllerTest.php b/tests/Wallabag/CoreBundle/Controller/ConfigControllerTest.php
index 568576a3312a7480d219740cd34f508655ca2139..a28c3b6bb7be53c8baae35d35822c217a371ad76 100644 (file)
--- a/tests/Wallabag/CoreBundle/Controller/ConfigControllerTest.php
+++ b/tests/Wallabag/CoreBundle/Controller/ConfigControllerTest.php
@@ -51,6 +51,7 @@ class ConfigControllerTest extends WallabagCoreTestCase
             'config[theme]' => 'baggy',
             'config[items_per_page]' => '30',
             'config[reading_speed]' => '0.5',
+            'config[action_mark_as_read]' => '0',
             'config[language]' => 'en',
         ];
 
@@ -378,7 +379,7 @@ class ConfigControllerTest extends WallabagCoreTestCase
                 [
                     'rss_config[rss_limit]' => 1000000000000,
                 ],
-                'validator.rss_limit_too_hight',
+                'validator.rss_limit_too_high',
             ],
         ];
     }
@@ -591,13 +592,13 @@ class ConfigControllerTest extends WallabagCoreTestCase
         $user = $em
             ->getRepository('WallabagUserBundle:User')
             ->findOneByUsername('empty');
-        $user->setExpired(1);
+        $user->setEnabled(false);
         $em->persist($user);
 
         $user = $em
             ->getRepository('WallabagUserBundle:User')
             ->findOneByUsername('bob');
-        $user->setExpired(1);
+        $user->setEnabled(false);
         $em->persist($user);
 
         $em->flush();
@@ -613,13 +614,13 @@ class ConfigControllerTest extends WallabagCoreTestCase
         $user = $em
             ->getRepository('WallabagUserBundle:User')
             ->findOneByUsername('empty');
-        $user->setExpired(0);
+        $user->setEnabled(true);
         $em->persist($user);
 
         $user = $em
             ->getRepository('WallabagUserBundle:User')
             ->findOneByUsername('bob');
-        $user->setExpired(0);
+        $user->setEnabled(true);
         $em->persist($user);
 
         $em->flush();