Merge branch...

Merge branch 'hotline#54119_bug_suite_livraison_v7725__v7726_liste_des_prets_les_entetes_des_colonnes_sont_decalees' into 'hotline-master'

hotline #54119 user loans: add type doc header

See merge request !1996

VERSIONS_HOTLINE/54119

+ - ticket #54119 : liste des prêts, ajout de l'entête de la colonne 'Support'
\ No newline at end of file

library/ZendAfi/View/Helper/Abonne/Loans.php

@@ -42,12 +42,7 @@ class ZendAfi_View_Helper_Abonne_Loans extends ZendAfi_View_Helper_BaseHelper {
                          function($title) {
                            return $this->_tag('th', $title);
                          },
-                         [$this->_('Emprunté par'),
-                          $this->_('Titre'),
-                          $this->_('Auteur'),
-                          $this->_in_progress ? $this->_('Bibliothèque') : $this->_('Date d\'emprunt'),
-                          $this->_in_progress ? $this->_('Retour prévu') : $this->_('Date de retour'),
-                          $this->_('Informations')]);
+                         $this->_tableColumns());
 
     return $this->_tag('thead',
                        $this->_tag('tr',
@@ -56,7 +51,7 @@ class ZendAfi_View_Helper_Abonne_Loans extends ZendAfi_View_Helper_BaseHelper {
 
 
   protected function _tableColumns() {
-    return [$this->_('n°'),
+    return [$this->_('Emprunté par'),
             $this->_('Support'),
             $this->_('Titre'),
             $this->_('Auteur'),

tests/application/modules/opac/controllers/AbonneControllerPretsTest.php

@@ -333,11 +333,17 @@ class AbonneControllerPretsListThreePretsTest extends AbonneControllerPretsListT
   /** @test */
   public function potterLoanShouldContainsTypeDocBook() {
     $this->assertXPathContentContains('//tbody/tr[2]//td[preceding-sibling::td[text()="Livres"]]',
-                                      'Harry Potter and the deathly hallows',
-                                      $this->_response->getBody());
+                                      'Harry Potter and the deathly hallows');
   }
 
 
+  /** @test */
+  public function potterLoansTableHeaderShouldContainsSupport() {
+    $this->assertXPath('//table//th[text()="Titre"][preceding-sibling::th[1][text()="Support"]]');
+  }
+
+
+
   /** @test */
   public function potterLibraryShouldBeAstrolab() {
     $this->assertXPathContentContains("//tbody/tr[2]//td", 'Astrolabe');
@@ -391,7 +397,7 @@ class AbonneControllerPretsListThreePretsTest extends AbonneControllerPretsListT
   }
 
 
-    /** @test */
+  /** @test */
   public function pnbLoansTableShouldNotDisplayTypeDoc() {
     $this->assertXPath('//table//th[text()="Titre"][preceding-sibling::th[1][not(text()="Support")]]');
   }