diff options
author | Nicolas LÅ“uillet <nicolas@loeuillet.org> | 2019-09-19 14:51:30 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-09-19 14:51:30 +0200 |
commit | 492aacd194463dec813a5ef94be156ca41adaac8 (patch) | |
tree | 8cf99c118c54572e36fbdc4239539f63f5e81faf | |
parent | c7fce40b448a730b8722bfe39b21aa91fb58201a (diff) | |
parent | af7b22a3be35fff69b877ff68f9a12b1b73b421e (diff) | |
download | wallabag-492aacd194463dec813a5ef94be156ca41adaac8.tar.gz wallabag-492aacd194463dec813a5ef94be156ca41adaac8.tar.zst wallabag-492aacd194463dec813a5ef94be156ca41adaac8.zip |
Merge pull request #4123 from wallabag/fix-reading-speed-install
Fixed default value for reading speed
5 files changed, 5 insertions, 5 deletions
diff --git a/app/config/wallabag.yml b/app/config/wallabag.yml index ea1cce12..f1ef0924 100644 --- a/app/config/wallabag.yml +++ b/app/config/wallabag.yml | |||
@@ -20,7 +20,7 @@ wallabag_core: | |||
20 | theme: material | 20 | theme: material |
21 | language: '%locale%' | 21 | language: '%locale%' |
22 | rss_limit: 50 | 22 | rss_limit: 50 |
23 | reading_speed: 1 | 23 | reading_speed: 200 |
24 | cache_lifetime: 10 | 24 | cache_lifetime: 10 |
25 | action_mark_as_read: 1 | 25 | action_mark_as_read: 1 |
26 | list_mode: 0 | 26 | list_mode: 0 |
diff --git a/src/Wallabag/CoreBundle/DependencyInjection/Configuration.php b/src/Wallabag/CoreBundle/DependencyInjection/Configuration.php index a9791f6b..7ae73371 100644 --- a/src/Wallabag/CoreBundle/DependencyInjection/Configuration.php +++ b/src/Wallabag/CoreBundle/DependencyInjection/Configuration.php | |||
@@ -30,7 +30,7 @@ class Configuration implements ConfigurationInterface | |||
30 | ->defaultValue(50) | 30 | ->defaultValue(50) |
31 | ->end() | 31 | ->end() |
32 | ->integerNode('reading_speed') | 32 | ->integerNode('reading_speed') |
33 | ->defaultValue(1) | 33 | ->defaultValue(200) |
34 | ->end() | 34 | ->end() |
35 | ->scalarNode('version') | 35 | ->scalarNode('version') |
36 | ->end() | 36 | ->end() |
diff --git a/tests/Wallabag/CoreBundle/Controller/ConfigControllerTest.php b/tests/Wallabag/CoreBundle/Controller/ConfigControllerTest.php index 46c90075..fa93c9c2 100644 --- a/tests/Wallabag/CoreBundle/Controller/ConfigControllerTest.php +++ b/tests/Wallabag/CoreBundle/Controller/ConfigControllerTest.php | |||
@@ -695,7 +695,7 @@ class ConfigControllerTest extends WallabagCoreTestCase | |||
695 | 695 | ||
696 | $config->setTheme('material'); | 696 | $config->setTheme('material'); |
697 | $config->setItemsPerPage(30); | 697 | $config->setItemsPerPage(30); |
698 | $config->setReadingSpeed(1); | 698 | $config->setReadingSpeed(200); |
699 | $config->setLanguage('en'); | 699 | $config->setLanguage('en'); |
700 | $config->setPocketConsumerKey('xxxxx'); | 700 | $config->setPocketConsumerKey('xxxxx'); |
701 | 701 | ||
diff --git a/tests/Wallabag/CoreBundle/Helper/RedirectTest.php b/tests/Wallabag/CoreBundle/Helper/RedirectTest.php index 29e12cbe..021efa46 100644 --- a/tests/Wallabag/CoreBundle/Helper/RedirectTest.php +++ b/tests/Wallabag/CoreBundle/Helper/RedirectTest.php | |||
@@ -42,7 +42,7 @@ class RedirectTest extends TestCase | |||
42 | $config = new Config($user); | 42 | $config = new Config($user); |
43 | $config->setTheme('material'); | 43 | $config->setTheme('material'); |
44 | $config->setItemsPerPage(30); | 44 | $config->setItemsPerPage(30); |
45 | $config->setReadingSpeed(1); | 45 | $config->setReadingSpeed(200); |
46 | $config->setLanguage('en'); | 46 | $config->setLanguage('en'); |
47 | $config->setPocketConsumerKey('xxxxx'); | 47 | $config->setPocketConsumerKey('xxxxx'); |
48 | $config->setActionMarkAsRead(Config::REDIRECT_TO_CURRENT_PAGE); | 48 | $config->setActionMarkAsRead(Config::REDIRECT_TO_CURRENT_PAGE); |
diff --git a/tests/Wallabag/UserBundle/EventListener/CreateConfigListenerTest.php b/tests/Wallabag/UserBundle/EventListener/CreateConfigListenerTest.php index d976c4ac..8a8ec3cf 100644 --- a/tests/Wallabag/UserBundle/EventListener/CreateConfigListenerTest.php +++ b/tests/Wallabag/UserBundle/EventListener/CreateConfigListenerTest.php | |||
@@ -64,7 +64,7 @@ class CreateConfigListenerTest extends TestCase | |||
64 | $config->setItemsPerPage(20); | 64 | $config->setItemsPerPage(20); |
65 | $config->setFeedLimit(50); | 65 | $config->setFeedLimit(50); |
66 | $config->setLanguage('fr'); | 66 | $config->setLanguage('fr'); |
67 | $config->setReadingSpeed(1); | 67 | $config->setReadingSpeed(200); |
68 | 68 | ||
69 | $this->em->expects($this->once()) | 69 | $this->em->expects($this->once()) |
70 | ->method('persist') | 70 | ->method('persist') |