Merge pull request #2005 from wallabag/fix-readingspeed-not-defined

Fix reading speed not defined when user was created via config page

diff --git a/src/Wallabag/CoreBundle/Controller/ConfigController.php b/src/Wallabag/CoreBundle/Controller/ConfigController.php
index ccc3e8a1dae2e3f3e63cc5811637e62eacafd85a..4f75511bf62cf5c7ee23b5ceb5eaeeb16a89248f 100644 (file)
--- a/src/Wallabag/CoreBundle/Controller/ConfigController.php
+++ b/src/Wallabag/CoreBundle/Controller/ConfigController.php
@@ -140,6 +140,7 @@ class ConfigController extends Controller
             $config->setItemsPerPage($this->getParameter('wallabag_core.items_on_page'));
             $config->setRssLimit($this->getParameter('wallabag_core.rss_limit'));
             $config->setLanguage($this->getParameter('wallabag_core.language'));
+            $config->setReadingSpeed($this->getParameter('wallabag_core.reading_speed'));
 
             $em->persist($config);
 

diff --git a/src/Wallabag/CoreBundle/Tests/Controller/ConfigControllerTest.php b/src/Wallabag/CoreBundle/Tests/Controller/ConfigControllerTest.php
index 1aa1a7ed3e9cdca695dca3fdcb7b2257500cd04e..1f9cfe534572fa993ca229677b38c1dcf1a84707 100644 (file)
--- a/src/Wallabag/CoreBundle/Tests/Controller/ConfigControllerTest.php
+++ b/src/Wallabag/CoreBundle/Tests/Controller/ConfigControllerTest.php
@@ -355,6 +355,11 @@ class ConfigControllerTest extends WallabagCoreTestCase
 
         $this->assertTrue(false !== $user);
         $this->assertTrue($user->isEnabled());
+        $this->assertEquals('material', $user->getConfig()->getTheme());
+        $this->assertEquals(12, $user->getConfig()->getItemsPerPage());
+        $this->assertEquals(50, $user->getConfig()->getRssLimit());
+        $this->assertEquals('en', $user->getConfig()->getLanguage());
+        $this->assertEquals(1, $user->getConfig()->getReadingSpeed());
     }
 
     public function testRssUpdateResetToken()