From 46efcd87906178a0fd1da710d744f82ef656a300 Mon Sep 17 00:00:00 2001
From: llaffont <llaffont@git-test.afi-sa.fr>
Date: Sat, 1 Jun 2013 13:17:25 +0000
Subject: [PATCH] Rendu contenu boite historique recherches
---
.../opac/views/scripts/recherche/saisie.phtml | 2 ++
.../View/Helper/Accueil/HistoriqueRecherches.php | 2 +-
.../ZendAfi/View/Helper/HistoriqueRecherche.php | 1 -
.../Helper/Accueil/HistoriqueRecherchesTest.php | 15 +++++++++++++++
4 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/application/modules/opac/views/scripts/recherche/saisie.phtml b/application/modules/opac/views/scripts/recherche/saisie.phtml
index bdd8db18c1c..c052c89c3d9 100644
--- a/application/modules/opac/views/scripts/recherche/saisie.phtml
+++ b/application/modules/opac/views/scripts/recherche/saisie.phtml
@@ -10,6 +10,8 @@ $this->closeBoite();
echo '<div class="conteneur_simple">';
// Historique des recherches
+echo "<h4>".$this->_('Vos dernières recherches')."</h4>";
+
echo $this->historiqueRecherche();
echo '</div>';
diff --git a/library/ZendAfi/View/Helper/Accueil/HistoriqueRecherches.php b/library/ZendAfi/View/Helper/Accueil/HistoriqueRecherches.php
index ed74a0b8653..d64516b27c9 100644
--- a/library/ZendAfi/View/Helper/Accueil/HistoriqueRecherches.php
+++ b/library/ZendAfi/View/Helper/Accueil/HistoriqueRecherches.php
@@ -25,7 +25,7 @@ class ZendAfi_View_Helper_Accueil_HistoriqueRecherches extends ZendAfi_View_Help
$this->preferences['titre'],
['title' => $this->view->_('Formulaire de recherche')]);
- $this->contenu = '';
+ $this->contenu = $this->view->historiqueRecherche();
return $this->getHtmlArray();
}
diff --git a/library/ZendAfi/View/Helper/HistoriqueRecherche.php b/library/ZendAfi/View/Helper/HistoriqueRecherche.php
index 14d9b2af840..a99d057fb56 100644
--- a/library/ZendAfi/View/Helper/HistoriqueRecherche.php
+++ b/library/ZendAfi/View/Helper/HistoriqueRecherche.php
@@ -32,7 +32,6 @@ class ZendAfi_View_Helper_HistoriqueRecherche extends ZendAfi_View_Helper_BaseHe
$html.=$this->view->tagHistoriqueRecherche(unserialize($critere))."";
return "<div class='criteres_recherche'>"
- ."<h4>".$this->view->_('Vos dernières recherches')."</h4>"
."<ul>".$html."</ul>"
."</div>";
}
diff --git a/tests/library/ZendAfi/View/Helper/Accueil/HistoriqueRecherchesTest.php b/tests/library/ZendAfi/View/Helper/Accueil/HistoriqueRecherchesTest.php
index 258722ec05b..03f8b278546 100644
--- a/tests/library/ZendAfi/View/Helper/Accueil/HistoriqueRecherchesTest.php
+++ b/tests/library/ZendAfi/View/Helper/Accueil/HistoriqueRecherchesTest.php
@@ -53,6 +53,21 @@ class ZendAfi_View_Helper_Accueil_HistoriqueRecherchesTest extends ViewHelperTes
'//h1//a[contains(@href,"/recherche/saisie")]',
'Historique Recherches');
}
+
+
+ /** @test */
+ public function URLRechercheHarryPotterShouldBeDisplay(){
+ $this->assertXPath($this->html,
+ '//a[contains(@href, "/recherche/simple/expressionRecherche/Harry+Potter")]',
+ $this->html);
+ }
+
+ /** @test */
+ public function URLRechercheMilesDavisShouldBeDisplay(){
+ $this->assertXPath($this->html,
+ '//a[contains(@href, "/recherche/simple/rech_auteurs/Miles+Davis/annee_fin/1970")]',
+ $this->html);
+ }
}
?>
\ No newline at end of file
--
GitLab