mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-02-02 12:02:23 +00:00
Code Issues Projects Releases Wiki Activity

fix tests for FosUser

Browse source
This commit is contained in:
Nicolas Lœuillet 2015-08-25 16:29:22 +02:00
parent a1691859ca
commit 3f7a62908c
3 changed files with 16 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Wallabag/CoreBundle/Controller/ConfigController.php
View file

@ -65,7 +65,7 @@ class ConfigController extends Controller
} }
// handle changing user information // handle changing user information
$userForm = $this->createForm(new UserInformationType(), $user); $userForm = $this->createForm(new UserInformationType(), $user, array('validation_groups' => array('Profile')));
$userForm->handleRequest($request); $userForm->handleRequest($request);
if ($userForm->isValid()) { if ($userForm->isValid()) {
@ -98,7 +98,7 @@ class ConfigController extends Controller
// handle adding new user // handle adding new user
$newUser = new User(); $newUser = new User();
$newUserForm = $this->createForm(new NewUserType(), $newUser); $newUserForm = $this->createForm(new NewUserType(), $newUser, array('validation_groups' => array('Profile')));
$newUserForm->handleRequest($request); $newUserForm->handleRequest($request);
if ($newUserForm->isValid()) { if ($newUserForm->isValid()) {

7
src/Wallabag/CoreBundle/Form/Type/UserInformationType.php
View file

@ -14,9 +14,16 @@ class UserInformationType extends AbstractType
->add('name', 'text') ->add('name', 'text')
->add('email', 'email') ->add('email', 'email')
->add('save', 'submit') ->add('save', 'submit')
->remove('username')
->remove('plainPassword')
; ;
} }
public function getParent()
{
return 'fos_user_registration';
}
public function configureOptions(OptionsResolver $resolver) public function configureOptions(OptionsResolver $resolver)
{ {
$resolver->setDefaults(array( $resolver->setDefaults(array(

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

@ -192,14 +192,14 @@ class ConfigControllerTest extends WallabagCoreTestCase
'update_user[name]' => '', 'update_user[name]' => '',
'update_user[email]' => '', 'update_user[email]' => '',
), ),
'This value should not be blank.', 'Please enter an email',
), ),
array( array(
array( array(
'update_user[name]' => '', 'update_user[name]' => '',
'update_user[email]' => 'test', 'update_user[email]' => 'test',
), ),
'This value is not a valid email address.', 'The email is not valid',
), ),
); );
} }
@ -261,15 +261,15 @@ class ConfigControllerTest extends WallabagCoreTestCase
'new_user[password]' => '', 'new_user[password]' => '',
'new_user[email]' => '', 'new_user[email]' => '',
), ),
'This value should not be blank.', 'Please enter a username',
), ),
array( array(
array( array(
'new_user[username]' => 'ad', 'new_user[username]' => 'a',
'new_user[password]' => 'mypassword', 'new_user[password]' => 'mypassword',
'new_user[email]' => '', 'new_user[email]' => '',
), ),
'This value is too short.', 'The username is too short',
), ),
array( array(
array( array(
@ -277,15 +277,7 @@ class ConfigControllerTest extends WallabagCoreTestCase
'new_user[password]' => 'mypassword', 'new_user[password]' => 'mypassword',
'new_user[email]' => 'test', 'new_user[email]' => 'test',
), ),
'This value is not a valid email address.', 'The email is not valid',
),
array(
array(
'new_user[username]' => 'wallace',
'new_user[password]' => 'admin',
'new_user[email]' => 'wallace@wallace.me',
),
'Password should by at least',
), ),
array( array(
array( array(
@ -293,7 +285,7 @@ class ConfigControllerTest extends WallabagCoreTestCase
'new_user[password]' => 'wallacewallace', 'new_user[password]' => 'wallacewallace',
'new_user[email]' => 'wallace@wallace.me', 'new_user[email]' => 'wallace@wallace.me',
), ),
'This value is already used', 'The username is already used',
), ),
); );
} }