test fix pour les dernieres modifs.

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

@@ -302,7 +302,7 @@ class ElementControllerTest extends FunctionalTest
     ))).'"]');
   
     // Suppression de l'élément
- 
+  
     // On effectue la demande ajax d'edition
     $crawler = $this->client->request(
       'GET', 
@@ -1322,20 +1322,15 @@ class ElementControllerTest extends FunctionalTest
     'name' => 'ZwaNe 01 - Ptit lutin',
     'tags' => array(
       0 => array(
-        'original_name' => 'Basse',
-        'like_found' => false,
-        'like' => array()
-      ),
-      1 => array(
-        'original_name' => 'Batterie',
+        'original_name' => 'Bass guitar',
         'like_found' => true,
         'like' => array(
-          'name' => 'Batterie',
-          'id' => '495',
-          'slug' => 'batterie',
+          'name' => 'Guitare basse',
+          'id' => '724',
+          'slug' => 'guitare basse',
         )
       ),
-      2 => array(
+      1 => array(
         'original_name' => 'Hardtek',
         'like_found' => true,
         'like' => array(
@@ -1344,11 +1339,11 @@ class ElementControllerTest extends FunctionalTest
           'slug' => 'hardtek',
         )
       ),
-      3 => array(
+      2 => array(
         'original_name' => 'Tek',
         'like_found' => false,
         'like' => array()
-      ),
+      )
     ),
     'thumb' => 'http://imgjam.com/albums/s30/30661/covers/1.100.jpg'
     ), $response);

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

@@ -16,7 +16,7 @@ class HomeControllerTest extends FunctionalTest
   {
     $this->client = self::createClient();
     $this->connectUser('bux', 'toor');
-
+  
     // Présence du formulaire d'ajout d'un élément
     $this->exist('form[action="'.($url = $this->generateUrl('element_add')).'"]');
     $this->exist('form[action="'.$url.'"] input[id="element_add_name"]');
@@ -558,7 +558,7 @@ class HomeControllerTest extends FunctionalTest
     ;
     $hardtek_id = $this->getDoctrine()->getRepository('MuzichCoreBundle:Tag')->findOneByName('Hardtek')->getId();
     $tribe_id   = $this->getDoctrine()->getRepository('MuzichCoreBundle:Tag')->findOneByName('Tribe')->getId();
-
+  
     // On récupère l'id du dernier element affiché
     $extract = $this->crawler->filter('ul.elements li.element')
        ->extract(array('id'));

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

@@ -18,7 +18,7 @@ class ShowControllerTest extends FunctionalTest
     
     $hardtek_id = $this->getDoctrine()->getRepository('MuzichCoreBundle:Tag')->findOneByName('Hardtek')->getId();
     $tribe_id   = $this->getDoctrine()->getRepository('MuzichCoreBundle:Tag')->findOneByName('Tribe')->getId();
-
+  
     // En premier lieux on va devoir ajouter des éléments.
     $this->addElementAjax('PoPElement 1', 'http://labas.com', json_encode(array($hardtek_id, $tribe_id)));
     $this->addElementAjax('PoPElement 2', 'http://labas.com', json_encode(array($hardtek_id, $tribe_id)));
@@ -148,8 +148,9 @@ class ShowControllerTest extends FunctionalTest
       array(), 
       array('HTTP_X-Requested-With' => 'XMLHttpRequest')
     );
-    
+   
     $response = json_decode($this->client->getResponse()->getContent(), true);
+    //$this->outputDebug($this->client->getResponse()->getContent());
     $this->assertEquals($response['status'], 'success');
     $this->assertTrue(strpos($response['html'], 'Infected mushroom - Muse Breaks') !== false);
     $this->assertTrue(strpos($response['html'], 'Infected Mushroom - Psycho') !== false);

src/Muzich/CoreBundle/Tests/ElementFactory/ElementFactoryTest.php

@@ -442,8 +442,8 @@ class ElementFactoryTest extends UnitTest
       'data_thumb_url' => 'http://imgjam.com/albums/s30/30661/covers/1.100.jpg',
       'data_artist' => 'Ptit lutin',
       'data_tags' => array(
-        0 => 'Basse',
-        1 => 'Batterie',
+        0 => 'Bass guitar',
+        1 => 'Drums',
         2 => 'Hardtek',
         3 => 'Tek',
         4 => 'Hardtechno',

src/Muzich/HomeBundle/Controller/ShowController.php

@@ -159,13 +159,18 @@ class ShowController extends Controller
     $viewed_user = null;
     if ($type == 'user' && $object_id == $this->getUserId())
     {
-      $viewed_user = $this->getUser();
+      $object = $viewed_user = $this->getUser();
     }
     else if ($type == 'user')
     {
-      $viewed_user = $this->getDoctrine()->getEntityManager()->getRepository('MuzichCoreBundle:User')
+      $object = $viewed_user = $this->getDoctrine()->getEntityManager()->getRepository('MuzichCoreBundle:User')
         ->findOneById($object_id, array())->getSingleResult();
     }
+    else if ($type == 'group')
+    {
+      $object = $this->getDoctrine()->getEntityManager()->getRepository('MuzichCoreBundle:Group')
+        ->findOneById($object_id);
+    }
     
     $search_object = new ElementSearcher();
     $tags = null;
@@ -205,7 +210,8 @@ class ShowController extends Controller
         'user'             => $this->getUser(),
         'viewed_user'      => $viewed_user,
         'elements'         => $elements,
-        'tag_ids_json'     => $tags_ids_json
+        'tag_ids_json'     => $tags_ids_json,
+        $type              => $object
       ))->getContent();
     }