Ecriture de test portants sur mynetwork, recherche, suivre.

app/phpunit.xml.dist

@@ -15,10 +15,7 @@
 
     <testsuites>
         <testsuite name="Project Test Suite">
-            <!--<directory>../src/*/*Bundle/Tests</directory>-->
-            <directory>../src/Muzich/CoreBundle/Tests/Controller</directory>
-            <directory>../src/Muzich/CoreBundle/Tests/ElementFactory</directory>
-            <directory>../src/Muzich/CoreBundle/Tests/Searcher</directory>
+            <directory>../src/Muzich/CoreBundle/Tests</directory>
         </testsuite>
     </testsuites>
 
@@ -27,19 +24,18 @@
         <server name="KERNEL_DIR" value="/path/to/your/app/" />
     </php>
     -->
-
-    <!--
+    
     <filter>
-        <whitelist>
-            <directory>../src</directory>
-            <exclude>
-                <directory>../src/*/*Bundle/Resources</directory>
-                <directory>../src/*/*Bundle/Tests</directory>
-                <directory>../src/*/Bundle/*Bundle/Resources</directory>
-                <directory>../src/*/Bundle/*Bundle/Tests</directory>
-            </exclude>
-        </whitelist>
+      <blacklist>
+        <directory suffix=".php">../src/Acme</directory>
+        <exclude>
+          <directory suffix=".php">../src/Acme/DemoBundle</directory>
+        </exclude>
+      </blacklist>
+
+      <whitelist addUncoveredFilesFromWhitelist="true">
+        <directory suffix=".php">../src/Muzich</directory>
+      </whitelist>
     </filter>
-    -->
 
 </phpunit>

src/Muzich/CoreBundle/Controller/CoreController.php

@@ -57,6 +57,19 @@ class CoreController extends Controller
   public function followAction($type, $id, $token)
   {
     $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();
+    }
+    
     // Vérifications préléminaires
     if ($user->getPersonalHash() != $token || !in_array($type, array('user', 'group')) || !is_numeric($id))
     {

src/Muzich/CoreBundle/Searcher/UserAndGroupSearcher.php

@@ -5,6 +5,9 @@ namespace Muzich\CoreBundle\Searcher;
 use Symfony\Component\Validator\Constraints as Assert;
 use Symfony\Bundle\DoctrineBundle\Registry;
 
+/**
+ * Objet de recherche
+ */
 class UserAndGroupSearcher extends Searcher implements SearcherInterface
 {
   

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

@@ -0,0 +1,230 @@
+<?php
+
+namespace Muzich\CoreBundle\Tests\Controller;
+
+use Muzich\CoreBundle\lib\FunctionalTest;
+
+class MynetworkControllerTest extends FunctionalTest
+{
+  /**
+   * Test de l'affichage de la page "mon réseau"
+   */
+  public function testMyNetwork()
+  {
+    /**
+     * Avec l'utilisateur 'bux' , qui d'après les fixtures suis: jean, paul,
+     * les groupes DUDELDRUM et Fans de psytrance
+     * et est suivis par joelle
+     */
+    $this->connectUser('bux', 'toor');
+    $link = $this->selectLink('a[href="'.$this->generateUrl('mynetwork_index').'"]');
+    $this->clickOnLink($link);
+    $this->isResponseSuccess();
+    
+    // Récupération des entités
+    $jean = $this->getDoctrine()->getRepository('MuzichCoreBundle:User')->findOneByUsername('jean');
+    $paul = $this->getDoctrine()->getRepository('MuzichCoreBundle:User')->findOneByUsername('paul');
+    $joelle = $this->getDoctrine()->getRepository('MuzichCoreBundle:User')->findOneByUsername('joelle');
+    $DUDELDRUM = $this->getDoctrine()->getRepository('MuzichCoreBundle:Group')->findOneByName('DUDELDRUM');
+    $Fans_de_psytrance = $this->getDoctrine()->getRepository('MuzichCoreBundle:Group')->findOneByName('Fans de psytrance');
+    
+    $this->exist('ul#followeds_users li a[href="'.$this->generateUrl('show_user', array('slug' => $jean->getSlug())).'"]');
+    $this->exist('ul#followeds_users li a[href="'.$this->generateUrl('show_user', array('slug' => $paul->getSlug())).'"]');
+    $this->exist('ul#followers_users li a[href="'.$this->generateUrl('show_user', array('slug' => $joelle->getSlug())).'"]');
+    $this->exist('ul#followeds_groups li a[href="'.$this->generateUrl('show_group', array('slug' => $DUDELDRUM->getSlug())).'"]');
+    $this->exist('ul#followeds_groups li a[href="'.$this->generateUrl('show_group', array('slug' => $Fans_de_psytrance->getSlug())).'"]');
+  }
+  
+  /**
+   * Test de la recherche
+   */
+  public function testSearch()
+  {
+    $this->connectUser('bux', 'toor');
+    $link = $this->selectLink('a[href="'.$this->generateUrl('mynetwork_index').'"]');
+    $this->clickOnLink($link);
+    $this->isResponseSuccess();
+    $link = $this->selectLink('a[href="'.$this->generateUrl('mynetwork_search').'"]');
+    $this->clickOnLink($link);
+    $this->isResponseSuccess();
+    
+    $this->exist('form[action="'.($url = $this->generateUrl('mynetwork_search')).'"]');
+    $this->exist('form[action="'.$url.'"] input[id="form_string"]');
+    $this->exist('form[action="'.$url.'"] input[type="submit"]');
+    
+    $bob = $this->getDoctrine()->getRepository('MuzichCoreBundle:User')->findOneByUsername('bob');
+    // On va rechercher l'utilisateur bob
+    $form = $this->selectForm('form[action="'.$url.'"] input[type="submit"]');
+    $form['form[string]'] = 'bob';
+    $this->submit($form);
+    $this->outputDebug();
+    $this->isResponseSuccess();
+    
+    // On trouve bob
+    $this->exist('ul#search_users li a[href="'.$this->generateUrl('show_user', array('slug' => $bob->getSlug())).'"]');
+    
+    $joelle = $this->getDoctrine()->getRepository('MuzichCoreBundle:User')->findOneByUsername('joelle');
+    $Le_groupe_de_joelle = $this->getDoctrine()->getRepository('MuzichCoreBundle:Group')->findOneByName('Le groupe de joelle');
+    // On va maintenant rechercher le groupe de joelle
+    $form = $this->selectForm('form[action="'.$url.'"] input[type="submit"]');
+    $form['form[string]'] = 'joelle';
+    $this->submit($form);
+    $this->isResponseSuccess();
+    
+    // On trouve joelle mais aussi son groupe (il y a joelle dans le nom)
+    $this->exist('ul#search_users li a[href="'.$this->generateUrl('show_user', array('slug' => $joelle->getSlug())).'"]');
+    $this->exist('ul#search_groups li a[href="'.$this->generateUrl('show_group', array('slug' => $Le_groupe_de_joelle->getSlug())).'"]');
+  }
+  
+  /**
+   * Test de l'action 'suivre' et 'ne plus suivre' sur un user
+   */
+  public function testUserFollow()
+  {
+    // Connection de bob
+    $this->connectUser('bob', 'toor');
+    
+    // Récupération des entités (bob ne les suit pas)
+    $bux = $this->getDoctrine()->getRepository('MuzichCoreBundle:User')->findOneByUsername('bux');
+    
+    // On tente de récupérer l'entité FollowUser
+    $FollowUser = $this->getDoctrine()->getRepository('MuzichCoreBundle:FollowUser')
+      ->findOneBy(array(
+        'follower' => $this->getUser()->getId(),
+        'followed' => $bux->getId()
+      ))
+    ;
+    
+    // Mais celle-ci doit-être innexistante
+    $this->assertTrue(is_null($FollowUser));
+    
+    // Ouverture de la page d'un user (bux)
+    $this->crawler = $this->client->request('GET', $this->generateUrl('show_user', array('slug' => $bux->getSlug())));
+    $this->isResponseSuccess();
+    
+    $url_follow = $this->generateUrl('follow', array(
+      'type' => 'user', 
+      'id' => $bux->getId(),
+      'token' => $this->getUser()->getPersonalHash()
+    ));
+    
+    // On lance l'action de suivre
+    $this->exist('a.notfollowing[href="'.$url_follow.'"]');
+    $link = $this->selectLink('a[href="'.$url_follow.'"]');
+    $this->clickOnLink($link);
+    
+    $this->isResponseRedirection();
+    $this->followRedirection();
+    $this->isResponseSuccess();
+    
+    $this->exist('a.following[href="'.$url_follow.'"]');
+    
+    // On tente de récupérer l'entité FollowUser
+    $FollowUser = $this->getDoctrine()->getRepository('MuzichCoreBundle:FollowUser')
+      ->findOneBy(array(
+        'follower' => $this->getUser()->getId(),
+        'followed' => $bux->getId()
+      ))
+    ;
+    
+    // Celle-ci doit exister maintenant
+    $this->assertTrue(!is_null($FollowUser));
+    
+    // On lance l'action de ne plus suivre
+    $link = $this->selectLink('a[href="'.$url_follow.'"]');
+    $this->clickOnLink($link);
+    
+    $this->isResponseRedirection();
+    $this->followRedirection();
+    $this->isResponseSuccess();
+    
+    $this->exist('a.notfollowing[href="'.$url_follow.'"]');
+    
+    // On tente de récupérer l'entité FollowUser
+    $FollowUser = $this->getDoctrine()->getRepository('MuzichCoreBundle:FollowUser')
+      ->findOneBy(array(
+        'follower' => $this->getUser()->getId(),
+        'followed' => $bux->getId()
+      ))
+    ;
+    
+    // Celle-ci ne doit plus exister maintenant
+    $this->assertTrue(is_null($FollowUser));
+  }
+  
+  /**
+   * Test de l'action 'suivre' et 'ne plus suivre' sur un groupe
+   */
+  public function testGroupFollow()
+  {
+    // Connection de bob
+    $this->connectUser('bob', 'toor');
+    
+    // Récupération des entités (bob ne les suit pas)
+    $DUDELDRUM = $this->getDoctrine()->getRepository('MuzichCoreBundle:Group')->findOneByName('DUDELDRUM');
+    
+    // On tente de récupérer l'entité FollowUser
+    $FollowGroup = $this->getDoctrine()->getRepository('MuzichCoreBundle:FollowGroup')
+      ->findOneBy(array(
+        'follower' => $this->getUser()->getId(),
+        'group' => $DUDELDRUM->getId()
+      ))
+    ;
+    
+    // Mais celle-ci doit-être innexistante
+    $this->assertTrue(is_null($FollowGroup));
+    
+    // Ouverture de la page d'un user (bux)
+    $this->crawler = $this->client->request('GET', $this->generateUrl('show_group', array('slug' => $DUDELDRUM->getSlug())));
+    $this->isResponseSuccess();
+    
+    $url_follow = $this->generateUrl('follow', array(
+      'type' => 'group', 
+      'id' => $DUDELDRUM->getId(),
+      'token' => $this->getUser()->getPersonalHash()
+    ));
+    
+    // On lance l'action de suivre
+    $this->exist('a.notfollowing[href="'.$url_follow.'"]');
+    $link = $this->selectLink('a[href="'.$url_follow.'"]');
+    $this->clickOnLink($link);
+    
+    $this->isResponseRedirection();
+    $this->followRedirection();
+    $this->isResponseSuccess();
+    
+    $this->exist('a.following[href="'.$url_follow.'"]');
+    
+    // On tente de récupérer l'entité FollowUser
+    $FollowGroup = $this->getDoctrine()->getRepository('MuzichCoreBundle:FollowGroup')
+      ->findOneBy(array(
+        'follower' => $this->getUser()->getId(),
+        'group' => $DUDELDRUM->getId()
+      ))
+    ;
+    
+    // Celle-ci doit exister maintenant
+    $this->assertTrue(!is_null($FollowGroup));
+    
+    // On lance l'action de ne plus suivre
+    $link = $this->selectLink('a[href="'.$url_follow.'"]');
+    $this->clickOnLink($link);
+    
+    $this->isResponseRedirection();
+    $this->followRedirection();
+    $this->isResponseSuccess();
+    
+    $this->exist('a.notfollowing[href="'.$url_follow.'"]');
+    
+    // On tente de récupérer l'entité FollowUser
+    $FollowGroup = $this->getDoctrine()->getRepository('MuzichCoreBundle:FollowGroup')
+      ->findOneBy(array(
+        'follower' => $this->getUser()->getId(),
+        'group' => $DUDELDRUM->getId()
+      ))
+    ;
+    
+    // Celle-ci ne doit plus exister maintenant
+    $this->assertTrue(is_null($FollowGroup));
+  }
+}

src/Muzich/CoreBundle/lib/FunctionalTest.php

@@ -218,7 +218,7 @@ class FunctionalTest extends WebTestCase
    */
   protected function selectLink($filter)
   {
-    return $this->crawler->filter($filter)->eq(1)->link();
+    return $this->crawler->filter($filter)->link();
   }
   
 //  /**
@@ -232,7 +232,7 @@ class FunctionalTest extends WebTestCase
 //  }
   
   /**
-   * Retourne un formulaire
+   * Retourne un formulaire, en filtrant le BOUTON SUBMIT !!
    * 
    * @param string $filter
    * @return \Symfony\Component\DomCrawler\Form 

src/Muzich/HomeBundle/Resources/views/Show/showGroup.html.twig

@@ -12,7 +12,8 @@
       </a> |
     {% endif %}
 
-    <a href="{{ path('follow', { 'type': 'group', 'id': group.id, 'token': user.personalHash }) }}" >
+    <a href="{{ path('follow', { 'type': 'group', 'id': group.id, 'token': user.personalHash }) }}" 
+       class="{% if following %}following{% else %}notfollowing{% endif %}">
       {% if following %}
         {{ 'group.notfollow'|trans({}, 'groups') }}
       {% else %}

src/Muzich/HomeBundle/Resources/views/Show/showUser.html.twig

@@ -10,7 +10,8 @@
       {{ 'user.view_favorites'|trans({}, 'users') }}
     </a>
     | 
-    <a href="{{ path('follow', { 'type': 'user', 'id': viewed_user.id, 'token': user.personalHash }) }}" class="follow_link following" >
+    <a href="{{ path('follow', { 'type': 'user', 'id': viewed_user.id, 'token': user.personalHash }) }}" 
+       class="follow_link {% if following %}following{% else %}notfollowing{% endif %}" >
       {% if following %}
         {{ 'user.notfollow'|trans({}, 'users') }}
       {% else %}

src/Muzich/MynetworkBundle/Resources/views/Mynetwork/index.html.twig

@@ -10,7 +10,7 @@
   
   {% if followeds_users %}
     <b>{{ 'users'|trans({}, 'network') }}</b>
-    <ul class="inline">
+    <ul id="followeds_users" class="inline">
     {% for user in followeds_users %} 
       <li>
         <a href="{{ path('show_user', { 'slug': user.slug }) }}">{{ user.username }}</a>
@@ -21,7 +21,7 @@
   
   {% if followeds_groups %}
     <b>{{ 'groups'|trans({}, 'network') }}</b>
-    <ul class="inline">
+    <ul id="followeds_groups" class="inline">
     {% for group in followeds_groups %} 
       <li>
         <a href="{{ path('show_group', { 'slug': group.slug }) }}">{{ group.name }}</a>
@@ -32,7 +32,7 @@
   
   {% if followers_users %}
     <b>{{ 'followed_by'|trans({}, 'network') }}</b>
-    <ul class="inline">
+    <ul id="followers_users" class="inline">
     {% for user in followers_users %} 
       <li>
         <a href="{{ path('show_user', { 'slug': user.slug }) }}">{{ user.username }}</a>

src/Muzich/MynetworkBundle/Resources/views/Mynetwork/search.html.twig

@@ -27,7 +27,7 @@
 
       <b>{{ 'search.users'|trans({}, 'network') }}</b>
       
-      <ul class="inline">
+      <ul id="search_users" class="inline">
       {% for user in results.users %} 
         <li>
           <a href="{{ path('show_user', { 'slug': user.slug }) }}">{{ user.username }}</a>
@@ -41,7 +41,7 @@
 
       <b>{{ 'search.groups'|trans({}, 'network') }}</b>
       
-      <ul class="inline">
+      <ul id="search_groups" class="inline">
       {% for group in results.groups %} 
         <li>
           <a href="{{ path('show_group', { 'slug': group.slug }) }}">{{ group.name }}</a>

src/Muzich/MynetworkBundle/Tests/Controller/DefaultControllerTest.php

@@ -1,17 +0,0 @@
-<?php
-
-namespace Muzich\MynetworkBundle\Tests\Controller;
-
-use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
-
-class DefaultControllerTest extends WebTestCase
-{
-    public function testIndex()
-    {
-        $client = static::createClient();
-
-        $crawler = $client->request('GET', '/hello/Fabien');
-
-        $this->assertTrue($crawler->filter('html:contains("Hello Fabien")')->count() > 0);
-    }
-}