Mise a jour des tests (Evolution #59);

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

@@ -39,8 +39,7 @@ class GroupControllerTest extends FunctionalTest
     $form = $this->selectForm('form[action="'.$url.'"] input[type="submit"]');
     $form['group[name]'] = 'HardtekMania';
     $form['group[description]'] = 'Des bass, des bpm, des gros caissons !';
-    $form['group[tags]['.$hardtek_id.']'] = $hardtek_id;
-    $form['group[tags]['.$tribe_id.']'] = $tribe_id;
+    $form['group[tags]'] = json_encode(array($hardtek_id,$tribe_id));
     $this->submit($form);
     
     $this->isResponseRedirection();
@@ -129,9 +128,7 @@ class GroupControllerTest extends FunctionalTest
     $form = $this->selectForm('form[action="'.$url.'"] input[type="submit"]');
     $form['group[name]'] = 'Les Fans de Psytrance';
     $form['group[description]'] = 'Ca va swiguer !';
-    $form['group[tags]['.$psytrance_id.']'] = $psytrance_id;
-    // On rajoute le lien vers le tag electro
-    $form['group[tags]['.$electro_id.']'] = $electro_id;
+    $form['group[tags]'] = json_encode(array($psytrance_id,$electro_id));
     $this->submit($form);
     
     $this->isResponseRedirection();

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

@@ -32,17 +32,10 @@ class HomeControllerTest extends FunctionalTest
     
     // On récupére le formulaire de filtrage
     $form = $this->selectForm('form[action="'.$url.'"] input[type="submit"]');
-    
-    // On décoche les tags
-    foreach ($this->getDoctrine()->getRepository('MuzichCoreBundle:Tag')->findAll() as $tag)
-    {
-      $form['element_search_form[tags]['.$tag->getId().']']->untick();
-    }
-    
+        
     // On met ce que l'on veut dans le form
     $form['element_search_form[network]'] = ElementSearcher::NETWORK_PUBLIC;
-    $form['element_search_form[tags]['.$hardtek_id.']'] = $hardtek_id;
-    $form['element_search_form[tags]['.$tribe_id.']'] = $tribe_id;
+    $form['element_search_form[tags]'] = json_encode(array($hardtek_id, $tribe_id));
     $this->submit($form);
     
     $this->client->submit($form);
@@ -55,7 +48,8 @@ class HomeControllerTest extends FunctionalTest
     $this->assertEquals(array(
         'network'   => ElementSearcher::NETWORK_PUBLIC,
         'tags'      => array(
-          $hardtek_id, $tribe_id
+          $hardtek_id => 'Hardtek', 
+          $tribe_id   => 'Tribe'
         ),
         'count'     => $this->getContainer()->getParameter('search_default_count'),
         'user_id'   => null,

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

@@ -40,8 +40,7 @@ class UserControllerTest extends FunctionalTest
     $this->exist('form[action="'.($url = $this->generateUrl('update_tag_favorites')).'"]');
     
     $form = $this->selectForm('form[action="'.$url.'"] input[type="submit"]');
-    $form['tag_favorites_form[tags]['.$hardtek_id.']'] = $hardtek_id;
-    $form['tag_favorites_form[tags]['.$tribe_id.']'] = $tribe_id;
+    $form['tag_favorites_form[tags]'] = json_encode(array($hardtek_id,$tribe_id));
     $this->submit($form);
     
     $this->isResponseRedirection();
@@ -136,8 +135,7 @@ class UserControllerTest extends FunctionalTest
     $this->exist('form[action="'.$url.'"] input[type="submit"]');
     
     $form = $this->selectForm('form[action="'.$url.'"] input[type="submit"]');
-    $form['tag_favorites_form[tags]['.$hardtek_id.']'] = $hardtek_id;
-    $form['tag_favorites_form[tags]['.$tribe_id.']'] = $tribe_id;
+    $form['tag_favorites_form[tags]'] = json_encode(array($hardtek_id,$tribe_id));
     $this->submit($form);
     
     $this->isResponseRedirection();

src/Muzich/CoreBundle/lib/FunctionalTest.php

@@ -188,10 +188,7 @@ class FunctionalTest extends WebTestCase
     $form = $this->selectForm('form[action="'.$form_url.'"] input[type="submit"]');
     $form['element_add[name]'] = $name;
     $form['element_add[url]'] = $url;
-    foreach ($tags as $tag_id)
-    {
-      $form['element_add[tags]['.$tag_id.']'] = $tag_id;
-    }
+    $form['element_add[tags]'] = json_encode($tags);
     
     $this->submit($form);
   }

src/Muzich/GroupBundle/Controller/DefaultController.php

@@ -161,7 +161,7 @@ class DefaultController extends Controller
     if ($form->isValid())
     {
       $factory = new GroupManager($group, $em, $this->container);
-      $factory->proceedTags($group->getTags());
+      $factory->proceedTags(json_decode($group->getTags()));
       
       $em->persist($group);
       $em->flush();

src/Muzich/UserBundle/Controller/UserController.php

@@ -48,8 +48,22 @@ class UserController extends Controller
   {
     if ($this->tags_favorites === null || $force)
     {
+      $user = $this->getUser();
+      
+      /**
+       * Bug lors des tests: L'user n'est pas 'lié' a celui en base par doctrine.
+       * Docrine le voit si on faire une requete directe.
+       */
+      if ($this->container->getParameter('env') == 'test')
+      {
+        $user = $this->getDoctrine()->getRepository('MuzichCoreBundle:User')->findOneById(
+          $this->container->get('security.context')->getToken()->getUser()->getId(),
+          array()
+        )->getSingleResult();
+      }
+      
       $this->tags_favorites = $this->getDoctrine()->getRepository('MuzichCoreBundle:User')
-        ->getTagsFavorites($this->getUser()->getId())
+        ->getTagsFavorites($user->getId())
       ;
     }