aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorJeremy Benoist <j0k3r@users.noreply.github.com>2016-05-03 09:04:02 +0200
committerJeremy Benoist <j0k3r@users.noreply.github.com>2016-05-03 09:04:02 +0200
commit045859a2b502a9e94943e262ee80698af08619e1 (patch)
tree5f69300b66d1dba7d710bad43e481114f9248f8b /src
parentba9fee085597932f451741b47ad7013e7eb4323b (diff)
parent8389074180913bc4368a9747d6455dafb2a421df (diff)
downloadwallabag-045859a2b502a9e94943e262ee80698af08619e1.tar.gz
wallabag-045859a2b502a9e94943e262ee80698af08619e1.tar.zst
wallabag-045859a2b502a9e94943e262ee80698af08619e1.zip
Merge pull request #2005 from wallabag/fix-readingspeed-not-defined
Fix reading speed not defined when user was created via config page
Diffstat (limited to 'src')
-rw-r--r--src/Wallabag/CoreBundle/Controller/ConfigController.php1
-rw-r--r--src/Wallabag/CoreBundle/Tests/Controller/ConfigControllerTest.php5
2 files changed, 6 insertions, 0 deletions
diff --git a/src/Wallabag/CoreBundle/Controller/ConfigController.php b/src/Wallabag/CoreBundle/Controller/ConfigController.php
index ccc3e8a1..4f75511b 100644
--- a/src/Wallabag/CoreBundle/Controller/ConfigController.php
+++ b/src/Wallabag/CoreBundle/Controller/ConfigController.php
@@ -140,6 +140,7 @@ class ConfigController extends Controller
140 $config->setItemsPerPage($this->getParameter('wallabag_core.items_on_page')); 140 $config->setItemsPerPage($this->getParameter('wallabag_core.items_on_page'));
141 $config->setRssLimit($this->getParameter('wallabag_core.rss_limit')); 141 $config->setRssLimit($this->getParameter('wallabag_core.rss_limit'));
142 $config->setLanguage($this->getParameter('wallabag_core.language')); 142 $config->setLanguage($this->getParameter('wallabag_core.language'));
143 $config->setReadingSpeed($this->getParameter('wallabag_core.reading_speed'));
143 144
144 $em->persist($config); 145 $em->persist($config);
145 146
diff --git a/src/Wallabag/CoreBundle/Tests/Controller/ConfigControllerTest.php b/src/Wallabag/CoreBundle/Tests/Controller/ConfigControllerTest.php
index 1aa1a7ed..1f9cfe53 100644
--- a/src/Wallabag/CoreBundle/Tests/Controller/ConfigControllerTest.php
+++ b/src/Wallabag/CoreBundle/Tests/Controller/ConfigControllerTest.php
@@ -355,6 +355,11 @@ class ConfigControllerTest extends WallabagCoreTestCase
355 355
356 $this->assertTrue(false !== $user); 356 $this->assertTrue(false !== $user);
357 $this->assertTrue($user->isEnabled()); 357 $this->assertTrue($user->isEnabled());
358 $this->assertEquals('material', $user->getConfig()->getTheme());
359 $this->assertEquals(12, $user->getConfig()->getItemsPerPage());
360 $this->assertEquals(50, $user->getConfig()->getRssLimit());
361 $this->assertEquals('en', $user->getConfig()->getLanguage());
362 $this->assertEquals(1, $user->getConfig()->getReadingSpeed());
358 } 363 }
359 364
360 public function testRssUpdateResetToken() 365 public function testRssUpdateResetToken()