oss/wallabag
oss/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-10-15 19:42:08 +00:00
Code Wiki Activity

Merge branch 'v2' into v2-edit-title

Browse source
This commit is contained in:
Nicolas Lœuillet 2015-06-08 16:35:02 +02:00
commit ac9d58211e
13 changed files with 80 additions and 175 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/Wallabag/CoreBundle/Tests/Controller/ConfigControllerTest.php
View file

@ -44,7 +44,7 @@ class ConfigControllerTest extends WallabagCoreTestCase
$form = $crawler->filter('button[id=config_save]')->form();
$data = array(
'config[theme]' => 'baggy',
'config[theme]' => 0,
'config[items_per_page]' => '30',
'config[language]' => 'fr_FR',
);
@ -63,12 +63,12 @@ class ConfigControllerTest extends WallabagCoreTestCase
{
return array(
array(array(
'config[theme]' => 'baggy',
'config[theme]' => 0,
'config[items_per_page]' => '',
'config[language]' => 'fr_FR',
)),
array(array(
'config[theme]' => 'baggy',
'config[theme]' => 0,
'config[items_per_page]' => '12',
'config[language]' => '',
)),