diff options
author | Jeremy Benoist <j0k3r@users.noreply.github.com> | 2015-10-06 09:19:06 +0200 |
---|---|---|
committer | Jeremy Benoist <j0k3r@users.noreply.github.com> | 2015-10-06 09:19:06 +0200 |
commit | 16dabc326311f084d671be188c7941bbb3c341c9 (patch) | |
tree | 3210a7688ea2bfa1bff5fd0422b52adf570edcdc /src/Wallabag/CoreBundle/Tests/Controller/ConfigControllerTest.php | |
parent | fdef5f460524215d806e244e5546865f4b8e01df (diff) | |
parent | 8263e71192989dc0fd28a41ac22f9c5b32eb11c4 (diff) | |
download | wallabag-16dabc326311f084d671be188c7941bbb3c341c9.tar.gz wallabag-16dabc326311f084d671be188c7941bbb3c341c9.tar.zst wallabag-16dabc326311f084d671be188c7941bbb3c341c9.zip |
Merge pull request #1436 from wallabag/v2-register
Public registration & oAuth2 \o/
Diffstat (limited to 'src/Wallabag/CoreBundle/Tests/Controller/ConfigControllerTest.php')
-rw-r--r-- | src/Wallabag/CoreBundle/Tests/Controller/ConfigControllerTest.php | 28 |
1 files changed, 21 insertions, 7 deletions
diff --git a/src/Wallabag/CoreBundle/Tests/Controller/ConfigControllerTest.php b/src/Wallabag/CoreBundle/Tests/Controller/ConfigControllerTest.php index 3407fc5e..3da5e8b7 100644 --- a/src/Wallabag/CoreBundle/Tests/Controller/ConfigControllerTest.php +++ b/src/Wallabag/CoreBundle/Tests/Controller/ConfigControllerTest.php | |||
@@ -258,7 +258,8 @@ class ConfigControllerTest extends WallabagCoreTestCase | |||
258 | array( | 258 | array( |
259 | array( | 259 | array( |
260 | 'new_user[username]' => '', | 260 | 'new_user[username]' => '', |
261 | 'new_user[password]' => '', | 261 | 'new_user[plainPassword][first]' => '', |
262 | 'new_user[plainPassword][second]' => '', | ||
262 | 'new_user[email]' => '', | 263 | 'new_user[email]' => '', |
263 | ), | 264 | ), |
264 | 'Please enter a username', | 265 | 'Please enter a username', |
@@ -266,7 +267,8 @@ class ConfigControllerTest extends WallabagCoreTestCase | |||
266 | array( | 267 | array( |
267 | array( | 268 | array( |
268 | 'new_user[username]' => 'a', | 269 | 'new_user[username]' => 'a', |
269 | 'new_user[password]' => 'mypassword', | 270 | 'new_user[plainPassword][first]' => 'mypassword', |
271 | 'new_user[plainPassword][second]' => 'mypassword', | ||
270 | 'new_user[email]' => '', | 272 | 'new_user[email]' => '', |
271 | ), | 273 | ), |
272 | 'The username is too short', | 274 | 'The username is too short', |
@@ -274,7 +276,8 @@ class ConfigControllerTest extends WallabagCoreTestCase | |||
274 | array( | 276 | array( |
275 | array( | 277 | array( |
276 | 'new_user[username]' => 'wallace', | 278 | 'new_user[username]' => 'wallace', |
277 | 'new_user[password]' => 'mypassword', | 279 | 'new_user[plainPassword][first]' => 'mypassword', |
280 | 'new_user[plainPassword][second]' => 'mypassword', | ||
278 | 'new_user[email]' => 'test', | 281 | 'new_user[email]' => 'test', |
279 | ), | 282 | ), |
280 | 'The email is not valid', | 283 | 'The email is not valid', |
@@ -282,11 +285,21 @@ class ConfigControllerTest extends WallabagCoreTestCase | |||
282 | array( | 285 | array( |
283 | array( | 286 | array( |
284 | 'new_user[username]' => 'admin', | 287 | 'new_user[username]' => 'admin', |
285 | 'new_user[password]' => 'wallacewallace', | 288 | 'new_user[plainPassword][first]' => 'wallacewallace', |
289 | 'new_user[plainPassword][second]' => 'wallacewallace', | ||
286 | 'new_user[email]' => 'wallace@wallace.me', | 290 | 'new_user[email]' => 'wallace@wallace.me', |
287 | ), | 291 | ), |
288 | 'The username is already used', | 292 | 'The username is already used', |
289 | ), | 293 | ), |
294 | array( | ||
295 | array( | ||
296 | 'new_user[username]' => 'wallace', | ||
297 | 'new_user[plainPassword][first]' => 'mypassword1', | ||
298 | 'new_user[plainPassword][second]' => 'mypassword2', | ||
299 | 'new_user[email]' => 'wallace@wallace.me', | ||
300 | ), | ||
301 | 'This value is not valid', | ||
302 | ), | ||
290 | ); | 303 | ); |
291 | } | 304 | } |
292 | 305 | ||
@@ -325,7 +338,8 @@ class ConfigControllerTest extends WallabagCoreTestCase | |||
325 | 338 | ||
326 | $data = array( | 339 | $data = array( |
327 | 'new_user[username]' => 'wallace', | 340 | 'new_user[username]' => 'wallace', |
328 | 'new_user[password]' => 'wallace1', | 341 | 'new_user[plainPassword][first]' => 'wallace1', |
342 | 'new_user[plainPassword][second]' => 'wallace1', | ||
329 | 'new_user[email]' => 'wallace@wallace.me', | 343 | 'new_user[email]' => 'wallace@wallace.me', |
330 | ); | 344 | ); |
331 | 345 | ||
@@ -340,7 +354,7 @@ class ConfigControllerTest extends WallabagCoreTestCase | |||
340 | 354 | ||
341 | $em = $client->getContainer()->get('doctrine.orm.entity_manager'); | 355 | $em = $client->getContainer()->get('doctrine.orm.entity_manager'); |
342 | $user = $em | 356 | $user = $em |
343 | ->getRepository('WallabagCoreBundle:User') | 357 | ->getRepository('WallabagUserBundle:User') |
344 | ->findOneByUsername('wallace'); | 358 | ->findOneByUsername('wallace'); |
345 | 359 | ||
346 | $this->assertTrue(false !== $user); | 360 | $this->assertTrue(false !== $user); |
@@ -355,7 +369,7 @@ class ConfigControllerTest extends WallabagCoreTestCase | |||
355 | // reset the token | 369 | // reset the token |
356 | $em = $client->getContainer()->get('doctrine.orm.entity_manager'); | 370 | $em = $client->getContainer()->get('doctrine.orm.entity_manager'); |
357 | $user = $em | 371 | $user = $em |
358 | ->getRepository('WallabagCoreBundle:User') | 372 | ->getRepository('WallabagUserBundle:User') |
359 | ->findOneByUsername('admin'); | 373 | ->findOneByUsername('admin'); |
360 | 374 | ||
361 | if (!$user) { | 375 | if (!$user) { |