diff options
author | Jeremy Benoist <j0k3r@users.noreply.github.com> | 2017-01-27 09:34:32 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-01-27 09:34:32 +0100 |
commit | 6fb06904ecde15b1b07d0a2af945338b416cf0e2 (patch) | |
tree | e76f3e8142399316ec5660fab8c646b2c34b8336 /tests/Wallabag/UserBundle | |
parent | 05fa529bcfde01be5d320cb532900d72cf4b0830 (diff) | |
parent | 78295b99dd1721c613f1ce52e2debbe6f6db7753 (diff) | |
download | wallabag-6fb06904ecde15b1b07d0a2af945338b416cf0e2.tar.gz wallabag-6fb06904ecde15b1b07d0a2af945338b416cf0e2.tar.zst wallabag-6fb06904ecde15b1b07d0a2af945338b416cf0e2.zip |
Merge pull request #2416 from wallabag/2.2
wallabag 2.2.0
Diffstat (limited to 'tests/Wallabag/UserBundle')
-rw-r--r-- | tests/Wallabag/UserBundle/Controller/ManageControllerTest.php | 1 | ||||
-rw-r--r-- | tests/Wallabag/UserBundle/EventListener/CreateConfigListenerTest.php | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/tests/Wallabag/UserBundle/Controller/ManageControllerTest.php b/tests/Wallabag/UserBundle/Controller/ManageControllerTest.php index 243a4459..4faddfc4 100644 --- a/tests/Wallabag/UserBundle/Controller/ManageControllerTest.php +++ b/tests/Wallabag/UserBundle/Controller/ManageControllerTest.php | |||
@@ -49,7 +49,6 @@ class ManageControllerTest extends WallabagCoreTestCase | |||
49 | 'user[username]' => 'test_user', | 49 | 'user[username]' => 'test_user', |
50 | 'user[email]' => 'test@test.io', | 50 | 'user[email]' => 'test@test.io', |
51 | 'user[enabled]' => true, | 51 | 'user[enabled]' => true, |
52 | 'user[locked]' => false, | ||
53 | )); | 52 | )); |
54 | 53 | ||
55 | $client->submit($form); | 54 | $client->submit($form); |
diff --git a/tests/Wallabag/UserBundle/EventListener/CreateConfigListenerTest.php b/tests/Wallabag/UserBundle/EventListener/CreateConfigListenerTest.php index a78b77bc..01796ded 100644 --- a/tests/Wallabag/UserBundle/EventListener/CreateConfigListenerTest.php +++ b/tests/Wallabag/UserBundle/EventListener/CreateConfigListenerTest.php | |||
@@ -31,6 +31,8 @@ class CreateConfigListenerTest extends \PHPUnit_Framework_TestCase | |||
31 | 20, | 31 | 20, |
32 | 50, | 32 | 50, |
33 | 'fr', | 33 | 'fr', |
34 | 1, | ||
35 | 1, | ||
34 | 1 | 36 | 1 |
35 | ); | 37 | ); |
36 | 38 | ||