Merge branch...

Merge branch 'hotline#85532_tickets_redmine_realiser_a_tester_activer_la_puce_d_assistance_cote_administration' into 'hotline'

hotline #85532 : enhance support counter in administration

See merge request !2972

VERSIONS_HOTLINE/85532

+ - ticket #85532 : Administration : Les tickets d'assistance au statut "Réaliser à tester" sont comptabilisés dans le menu haut "Assistance"
\ No newline at end of file

library/Class/WebService/Redmine/Workflow/Afibre.php

@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
  */
 
-class Class_WebService_Redmine_Workflow_Afibre extends  Class_WebService_Redmine_Workflow_Abstract {
+class Class_WebService_Redmine_Workflow_Afibre extends Class_WebService_Redmine_Workflow_Abstract {
   const
     A_QUALIFIER = 1,
     AFFECTE_HEBERGEMENT = 13,
@@ -34,24 +34,31 @@ class Class_WebService_Redmine_Workflow_Afibre extends  Class_WebService_Redmine
     A_INTEGRER = 17,
     RETOUR_DEV = 22;
 
-  protected $_transitions = [self::A_QUALIFIER => [self::FERME],
-                             14 => [self::A_QUALIFIER],
-                             15 => [],
-                             self::AFFECTE_HOTLINE => [self::AFFECTE_DEV, self::FERME],
-                             self::AFFECTE_SYSTEME => [],
-                             self::AFFECTE_DEV => [self::A_QUALIFIER, self::FERME],
-                             self::AFFECTE_HEBERGEMENT => [],
-                             self::RETOUR_DEV => [],
-                             self::EN_DEVELOPPEMENT => [self::FERME],
-                             18 => [],
-                             16 => [],
-                             self::A_TESTER => [self::FERME],
-                             self::A_INTEGRER  => [],
-                             self::QUESTION_CLIENT => [self::AFFECTE_HOTLINE, self::FERME],
-                             8 => [self::FERME],
-                             self::TRANSFERT_DEV => [],
-                             self::FERME => [self::A_QUALIFIER],
-                             6 => [self::A_QUALIFIER, self::FERME]];
+  /** @var array of [ from_status => [to_status, to_status...]] */
+  protected $_transitions = [];
+
+
+  public function __construct() {
+    $this->_transitions = [static::A_QUALIFIER => [static::FERME],
+                           14 => [static::A_QUALIFIER],
+                           15 => [],
+                           static::AFFECTE_HOTLINE => [static::AFFECTE_DEV, static::FERME],
+                           static::AFFECTE_SYSTEME => [],
+                           static::AFFECTE_DEV => [static::A_QUALIFIER, static::FERME],
+                           static::AFFECTE_HEBERGEMENT => [],
+                           static::RETOUR_DEV => [],
+                           static::EN_DEVELOPPEMENT => [static::FERME],
+                           18 => [],
+                           16 => [],
+                           static::A_TESTER => [static::FERME],
+                           static::A_INTEGRER  => [],
+                           static::QUESTION_CLIENT => [static::AFFECTE_HOTLINE, static::FERME],
+                           8 => [static::FERME],
+                           static::TRANSFERT_DEV => [],
+                           static::FERME => [static::A_QUALIFIER],
+                           6 => [static::A_QUALIFIER, static::FERME]];
+  }
+
 
   public function getTransitions() {
     return $this->_transitions;
@@ -59,7 +66,7 @@ class Class_WebService_Redmine_Workflow_Afibre extends  Class_WebService_Redmine
 
 
   public function getFormSelectedStatusIdForCurrent($status_id) {
-    return $status_id == self::QUESTION_CLIENT ? self::AFFECTE_HOTLINE : $status_id;
+    return $status_id == static::QUESTION_CLIENT ? static::AFFECTE_HOTLINE : $status_id;
   }
 
 
@@ -68,8 +75,9 @@ class Class_WebService_Redmine_Workflow_Afibre extends  Class_WebService_Redmine
 
     return count($issues
                  ->select(function($issue)
-                                 {
-                                   return $issue->getStatusId() == self::QUESTION_CLIENT;
-                                 }));
+                          {
+                            return in_array($issue->getStatusId(), [static::QUESTION_CLIENT,
+                                                                    static::A_TESTER]);
+                          }));
   }
 }
\ No newline at end of file

tests/application/modules/admin/controllers/RedmineControllerTest.php

@@ -305,8 +305,8 @@ class Admin_RedmineControllerIndexTest extends Admin_RedmineControllerWithApiTes
 
 
   /** @test */
-  public function menuHorizontalShouldContainsOneIssueQuestionClient() {
-    $this->assertXPathContentContains('//div[contains(@class, "barre_nav")]//a[@title="Assistance"]//span[@class="menu_info"]', '1', $this->_response->getBody());
+  public function menuHorizontalShouldContainsTwoIssues() {
+    $this->assertXPathContentContains('//div[contains(@class, "barre_nav")]//a[@title="Assistance"]//span[@class="menu_info"]', '2', $this->_response->getBody());
   }
 }
 
@@ -331,7 +331,7 @@ class Admin_RedmineControllerCacheTest extends Admin_RedmineControllerWithApiTes
   public function onAdminIndexMenuHorizontalShouldGetResultFromCache() {
     $this->dispatch('/admin/index/index');
 
-    $this->assertXPathContentContains('//div[contains(@class, "barre_nav")]//a[@title="Assistance"]//span[@class="menu_info"]', '1');
+    $this->assertXPathContentContains('//div[contains(@class, "barre_nav")]//a[@title="Assistance"]//span[@class="menu_info"]', '2');
   }
 
 

tests/fixtures/RedmineFixtures.php

@@ -87,7 +87,8 @@ class RedmineFixtures {
                           'story_points' => ''],
 
                          static::issue34247(),
-                         static::issue34248()],
+                         static::issue34248(),
+                         static::issue34249()],
             'total_count' => 2,
             'offset' => 0 ,
             'limit' => 25];
@@ -158,6 +159,38 @@ class RedmineFixtures {
   }
 
 
+  public static function issue34249() {
+    return ['id' => 34249,
+            'project' => ['id' => 56,
+                          'name' => 'Développement Bokeh AFI-OPAC 2.0'],
+            'tracker' => ['id' => 2,
+                          'name' => 'Développement'],
+            'status' => ['id' => 3,
+                         'name' => 'Réaliser à tester'],
+            'priority' => ['id' => 4,
+                           'name' => 'Normal'],
+            'author' => ['id' => 207,
+                         'name' => 'gloas'],
+            'assigned_to' => ['id' => 207,
+                              'name' => 'gloas'],
+            'subject' => 'Un problème à tester',
+            'description' => 'important',
+            'done_ratio' => 80,
+            'custom_fields' => [ ['id' => 37,
+                                  'name' => 'Module Portail',
+                                  'value' => ''],
+                                ['id' => 5 ,
+                                 'name' => 'Priorité client',
+                                 'value' => 'Normale'],
+                                ['id' => 11,
+                                 'name' => 'Phase',
+                                 'value' => '']],
+            'created_on' => '2015-12-04T09:19:11Z',
+            'updated_on' => '2015-12-04T09:25:42Z',
+            'story_points' => ''];
+  }
+
+
   public static function projectHotline() {
     return ['project' => ['name' => 'Hotline']];
   }