rel #21441 : fix auto prepend doc type facet

library/ZendAfi/View/Helper/Facettes.php

@@ -45,13 +45,13 @@ class ZendAfi_View_Helper_Facettes extends ZendAfi_View_Helper_BaseHelper {
                         'action' => 'simple',
                         'page' => null]);
 
+    $codes = $this->_preferences['facettes_codes'];
+    $separator = preg_match('/;/', $codes) ? ';' : '';
+    $codes = 'T' . $separator . $codes;
 
-    return $this
-      ->_tag('div',
-             $this->listeFacettesHTML('T' . $this->_preferences['facettes_codes'],
-                                      $facets,
-                                      $url),
-             ['class' => 'facette']);
+    return $this->_tag('div',
+                       $this->listeFacettesHTML($codes, $facets, $url),
+                       ['class' => 'facette']);
   }
 
 

tests/library/ZendAfi/View/Helper/FacettesTest.php

@@ -39,8 +39,7 @@ abstract class ZendAfi_View_Helper_FacettesTestCase extends ViewHelperTestCase {
     $this->fixture('Class_CodifThesaurus',
                    ['id' => 1,
                     'id_thesaurus' => 'GENR0001',
-                    'libelle' => 'Electron libre.'
-                   ]);
+                    'libelle' => 'Electron libre.']);
 
     $this->fixture('Class_CodifAnnexe',
                    ['id' => 1,
@@ -49,45 +48,44 @@ abstract class ZendAfi_View_Helper_FacettesTestCase extends ViewHelperTestCase {
 
     $this->fixture('Class_CodifAuteur',
                    ['id' => '4656',
-                    'libelle' => 'Caradog Prichard',
-                   ]);
+                    'libelle' => 'Caradog Prichard',]);
+
     $this->fixture('Class_CodifAuteur',
                    ['id' => '4657',
-                    'libelle' => 'Louis-Jean Calvet',
-                   ]);
+                    'libelle' => 'Louis-Jean Calvet']);
+
     $this->fixture('Class_CodifAuteur',
                    ['id' => '6752',
-                    'libelle' => 'Maurice Henry',
-                   ]);
+                    'libelle' => 'Maurice Henry']);
+
     $this->fixture('Class_CodifAuteur',
                    ['id' => '63246',
-                    'libelle' => 'François Chattot',
-                   ]);
+                    'libelle' => 'François Chattot']);
+
     $this->fixture('Class_CodifAuteur',
                    ['id' => '12309',
-                    'libelle' => 'Olivier Richard',
-                   ]);
+                    'libelle' => 'Olivier Richard']);
+
     $this->fixture('Class_CodifAuteur',
                    ['id' => '446',
-                    'libelle' => 'Clare Brown',
-                   ]);
+                    'libelle' => 'Clare Brown']);
+
     $this->fixture('Class_CodifAuteur',
                    ['id' => '800',
-                    'libelle' => 'Karine Delobbe',
-                   ]);
+                    'libelle' => 'Karine Delobbe']);
+
     $this->fixture('Class_CodifAuteur',
                    ['id' => '12168',
-                    'libelle' => 'Mehdi Lallaoui',
-                   ]);
+                    'libelle' => 'Mehdi Lallaoui']);
+
     $this->fixture('Class_CodifAuteur',
                    ['id' => '9875',
-                    'libelle' => 'Régine Azria',
-                   ]);
-
+                    'libelle' => 'Régine Azria']);
 
     $this->_html = $this->_helper
       ->facettes(
-                 ['M' => ['M6567' => 22],
+                 ['T' => ['T1' => 34],
+                  'M' => ['M6567' => 22],
                   'HGENR' => ['HGENR0001' => 1],
                   'Y' => ['YMDE' => 1],
                   'A' => ['A4656' => 58,
@@ -100,7 +98,7 @@ abstract class ZendAfi_View_Helper_FacettesTestCase extends ViewHelperTestCase {
                           'A12168' => 6,
                           'A9875' => 5]],
 
-                 ['facettes_codes' => 'YAMHGENR',
+                 ['facettes_codes' => 'Y;A;M;HGENR',
                   'facettes_nombre' => 2],
 
                  new Class_CriteresRecherche(['expressionRecherche' => '*']));
@@ -120,6 +118,15 @@ class ZendAfi_View_Helper_FacettesRestrainedTest extends ZendAfi_View_Helper_Fac
   }
 
 
+  /** @test */
+  public function docTypeShouldBePresent() {
+    $this
+      ->assertXPathContentContains($this->_html,
+                                   '//li[@class="facette_titre"]',
+                                   'Type de document');
+  }
+
+
   /** @test */
   public function linkForFacetPommeShouldBePresent() {
     $this->assertXPathContentContains($this->_html,
@@ -131,7 +138,7 @@ class ZendAfi_View_Helper_FacettesRestrainedTest extends ZendAfi_View_Helper_Fac
   /** @test */
   public function linkForFacetMaisonEnvironnementShouldBePresentAtSecondPosition() {
     $this->assertXPathContentContains($this->_html,
-                                      '//div[@class="facette"]/ul/li[1]//ul//a[@class="facette"][contains(@href, "/recherche/simple/facette/YMDE")]',
+                                      '//div[@class="facette"]/ul/li[2]//ul//a[@class="facette"][contains(@href, "/recherche/simple/facette/YMDE")]',
                                       'Maison environnement');
   }
 
@@ -147,7 +154,7 @@ class ZendAfi_View_Helper_FacettesRestrainedTest extends ZendAfi_View_Helper_Fac
   /** @test */
   public function linkForFacetMauriceHenryShouldBePresentInDisplayMoreFacetsAtThirdPosition() {
     $this->assertXPathContentContains($this->_html,
-                                      '//div[@class="facette"]/ul/li[2]//ul[@id="A_msg"]//a[@class="facette"][contains(@href, "/recherche/simple/facette/A6752")]',
+                                      '//div[@class="facette"]/ul/li[3]//ul[@id="A_msg"]//a[@class="facette"][contains(@href, "/recherche/simple/facette/A6752")]',
                                       'Maurice Henry');
   }