Evolution #700: Test nécessaires

app/Resources/translations/validators.fr.yml

@@ -41,10 +41,12 @@ error:
     duplicate:           Le nom d'utilisateur est déjà utilisé sur muzi.ch
     min:               Votre nom d'utilisateur doit contenir au moins %limit% caractères.
     max:               Votre nom d'utilisateur doit contenir au maximum %limit% caractères.
-  
+
 registration:
   token:
     error:               Le code saisi pour l'inscription est incorrect ou n'est plus utilisable
+  email:
+    invalid:             L'email saisi n'est pas valide.
     
 group_malchoisis:        Le groupe est mal choisi
 group_invalid:           Le groupe est invalide

src/Muzich/CoreBundle/Tests/Controller/HomeControllerTest.php

@@ -753,8 +753,8 @@ class HomeControllerTest extends FunctionalTest
     
     $response = json_decode($this->client->getResponse()->getContent(), true);
     $this->assertEquals($response['status'], 'success');
-    $this->assertEquals($response['count'], '4');  // HARDCODE fixtures
-    $this->assertEquals($response['end'], true);  // HARDCODE fixtures
+    $this->assertEquals($response['count'], '10');  // HARDCODE fixtures
+    $this->assertEquals($response['end'], false);  // HARDCODE fixtures
     
   }
   

src/Muzich/CoreBundle/Tests/Controller/IndexControllerTest.php

@@ -87,18 +87,11 @@ class IndexControllerTest extends FunctionalTest
     
     $this->exist('div.register');
     $this->exist('form[action="'.($url = $this->generateUrl('register')).'"]');
-    $this->exist('form[action="'.$url.'"] input[id="fos_user_registration_form_username"]');
-    $this->exist('form[action="'.$url.'"] input[id="fos_user_registration_form_email"]');
-    $this->exist('form[action="'.$url.'"] input[id="fos_user_registration_form_plainPassword_first"]');
-    $this->exist('form[action="'.$url.'"] input[id="fos_user_registration_form_plainPassword_second"]');
+    $this->exist('form[action="'.$url.'"] input[id="muzich_user_registration_email"]');
     $this->exist('form[action="'.$url.'"] input[type="submit"]');
     
     $this->procedure_registration_success(
-      'raoula', 
-      'raoula.def4v65sds@gmail.com', 
-      'toor', 
-      'toor',
-      '4vcsdv54svqcc3q1v54sdv6qs'
+      'raoula.def4v65sds@gmail.com'
     );
   }
   
@@ -118,42 +111,9 @@ class IndexControllerTest extends FunctionalTest
     $em->persist($token);
     $em->flush();
     
-    // Mots de passe différents
-    $this->procedure_registration_failure(
-      'raoulb'.time(), 
-      'raoulb.def4v65sds@gmail.com', 
-      'toor', 
-      'toorr',
-      $token_name
-    );
-  
-    // Pseudo trop court
-    $this->procedure_registration_failure(
-      'rb', 
-      'raoulb.def4v65sds@gmail.com', 
-      'toor', 
-      'toor',
-      $token_name
-    );
-    
     // Pseudo trop long
     $this->procedure_registration_failure(
-      'raouuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuu'
-         .'uuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuu'
-         .'uuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuul'.time(), 
-      'raoulb.def4v65sds@gmail.com', 
-      'toor', 
-      'toor',
-      $token_name
-    );
-  
-    // Email invalide
-    $this->procedure_registration_failure(
-      'raoulc'.time(), 
-      'raoulb.def4v65sds@gmail', 
-      'toor', 
-      'toor',
-      $token_name
+      'raoulb.def4v65sdsgmail.com'
     );
   }
   

src/Muzich/CoreBundle/Tests/Security/ContextTest.php

@@ -19,9 +19,9 @@ class ContextTest extends \PHPUnit_Framework_TestCase
     $this->assertFalse($secutiry_context->canMakeAction(SecurityContext::ACTION_COMMENT_ALERT));
     $this->assertFalse($secutiry_context->canMakeAction(SecurityContext::ACTION_ELEMENT_ALERT));
     $this->assertFalse($secutiry_context->canMakeAction(SecurityContext::ACTION_TAG_ADD));
-    $this->assertFalse($secutiry_context->canMakeAction(SecurityContext::ACTION_COMMENT_ADD));
     $this->assertFalse($secutiry_context->canMakeAction(SecurityContext::ACTION_ELEMENT_TAGS_PROPOSITION));
     $this->assertFalse($secutiry_context->canMakeAction(SecurityContext::ACTION_GROUP_ADD));
+    $this->assertTrue($secutiry_context->canMakeAction(SecurityContext::ACTION_COMMENT_ADD));
     $this->assertTrue($secutiry_context->canMakeAction(SecurityContext::ACTION_USER_FOLLOW));
     $this->assertTrue($secutiry_context->canMakeAction(SecurityContext::ACTION_ELEMENT_ADD_TO_FAVORITES));
     

src/Muzich/IndexBundle/Resources/views/Index/index.html.twig

@@ -28,10 +28,6 @@
     <div id="registration_box" style="{% if registration_page is not defined %}display: none;{% endif %}">
       <h1>{{ 'register.title'|trans({}, 'userui') }}</h1>
       
-      <p id="register_beta_closed">
-        {{ 'index.beta.warning'|trans({}, 'userui') }}
-      </p>
-      
       {% include "MuzichUserBundle:Registration:register.html.twig" %}
     </div>
   

src/Muzich/UserBundle/Controller/UserController.php

@@ -203,6 +203,11 @@ class UserController extends Controller
   
   protected function checkRegistrationValues($form)
   {
+    if(!filter_var($form->getData()->getEmailCanonical(), FILTER_VALIDATE_EMAIL))
+    {
+      return array($this->trans('registration.email.invalid', array(), 'validators'));
+    }
+    
     $count = $this->getEntityManager()->createQuery("SELECT count(u.id) "
       ."FROM MuzichCoreBundle:User u "
       ."WHERE UPPER(u.email) = :email_canonical")
@@ -221,8 +226,7 @@ class UserController extends Controller
   {
     if (!$this->getRequest()->isXmlHttpRequest())
     {
-      $url = $this->container->get('router')->generate($route);
-      return new RedirectResponse($url);
+      return new RedirectResponse($this->generateUrl('home'));
     }
     
     return $this->jsonResponse(array(