fix tests for FosUser

3 files changed, 16 insertions, 17 deletions

diff --git a/src/Wallabag/CoreBundle/Controller/ConfigController.php b/src/Wallabag/CoreBundle/Controller/ConfigController.php
index 62ef3eea..73484d86 100644
--- a/src/Wallabag/CoreBundle/Controller/ConfigController.php
+++ b/src/Wallabag/CoreBundle/Controller/ConfigController.php
@@ -65,7 +65,7 @@ class ConfigController extends Controller
         }
 
         // handle changing user information
-        $userForm = $this->createForm(new UserInformationType(), $user);
+        $userForm = $this->createForm(new UserInformationType(), $user, array('validation_groups' => array('Profile')));
         $userForm->handleRequest($request);
 
         if ($userForm->isValid()) {
@@ -98,7 +98,7 @@ class ConfigController extends Controller
 
         // handle adding 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);
 
         if ($newUserForm->isValid()) {
diff --git a/src/Wallabag/CoreBundle/Form/Type/UserInformationType.php b/src/Wallabag/CoreBundle/Form/Type/UserInformationType.php
index 1b628051..e3196d9c 100644
--- a/src/Wallabag/CoreBundle/Form/Type/UserInformationType.php
+++ b/src/Wallabag/CoreBundle/Form/Type/UserInformationType.php
@@ -14,9 +14,16 @@ class UserInformationType extends AbstractType
             ->add('name', 'text')
             ->add('email', 'email')
             ->add('save', 'submit')
+            ->remove('username')
+            ->remove('plainPassword')
         ;
     }
 
+    public function getParent()
+    {
+        return 'fos_user_registration';
+    }
+
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults(array(
diff --git a/src/Wallabag/CoreBundle/Tests/Controller/ConfigControllerTest.php b/src/Wallabag/CoreBundle/Tests/Controller/ConfigControllerTest.php
index e11da935..116eec60 100644
--- a/src/Wallabag/CoreBundle/Tests/Controller/ConfigControllerTest.php
+++ b/src/Wallabag/CoreBundle/Tests/Controller/ConfigControllerTest.php
@@ -192,14 +192,14 @@ class ConfigControllerTest extends WallabagCoreTestCase
                     'update_user[name]' => '',
                     'update_user[email]' => '',
                 ),
-                'This value should not be blank.',
+                'Please enter an email',
             ),
             array(
                 array(
                     'update_user[name]' => '',
                     '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[email]' => '',
                 ),
-                'This value should not be blank.',
+                'Please enter a username',
             ),
             array(
                 array(
-                    'new_user[username]' => 'ad',
+                    'new_user[username]' => 'a',
                     'new_user[password]' => 'mypassword',
                     'new_user[email]' => '',
                 ),
-                'This value is too short.',
+                'The username is too short',
             ),
             array(
                 array(
@@ -277,15 +277,7 @@ class ConfigControllerTest extends WallabagCoreTestCase
                     'new_user[password]' => 'mypassword',
                     'new_user[email]' => 'test',
                 ),
-                'This value is not a valid email address.',
-            ),
-            array(
-                array(
-                    'new_user[username]' => 'wallace',
-                    'new_user[password]' => 'admin',
-                    'new_user[email]' => 'wallace@wallace.me',
-                ),
-                'Password should by at least',
+                'The email is not valid',
             ),
             array(
                 array(
@@ -293,7 +285,7 @@ class ConfigControllerTest extends WallabagCoreTestCase
                     'new_user[password]' => 'wallacewallace',
                     'new_user[email]' => 'wallace@wallace.me',
                 ),
-                'This value is already used',
+                'The username is already used',
             ),
         );
     }