diff --git a/application/modules/opac/controllers/RechercheController.php b/application/modules/opac/controllers/RechercheController.php index 354785d636744fbbf03f8a5067ea9d2875174dd4..618181dfc61bd9a179ed6493ce25c986533e8f1b 100644 --- a/application/modules/opac/controllers/RechercheController.php +++ b/application/modules/opac/controllers/RechercheController.php @@ -132,8 +132,8 @@ class RechercheController extends Zend_Controller_Action $this->_forward('simple'); } + public function renderResultatRecherche($criteres_recherche,$ret) { - $this->view->criteres_recherche = $criteres_recherche; $this->view->url_facette=$this->view->url($criteres_recherche->getUrlCriteresWithFacettes(),null,true); $this->view->url_retour = $this->view->url($criteres_recherche->getUrlRetourListe()); diff --git a/application/modules/opac/views/scripts/auth/login.phtml b/application/modules/opac/views/scripts/auth/login.phtml index 731b019225d4a04d3ec7e3b8e6d8618da6b28332..11a07e9bd35ef7054b8798a90b5a70e9a992fedf 100644 --- a/application/modules/opac/views/scripts/auth/login.phtml +++ b/application/modules/opac/views/scripts/auth/login.phtml @@ -3,7 +3,9 @@ $titre = $this->preferences['titre']; if($user = Class_Users::getLoader()->getIdentity()) { $titre = $this->preferences['titre_connecte']; } -echo sprintf("<div class='head title'>%s</div>", $titre); + +$this->openBoite($titre); include('boite-login.phtml'); +$this->closeBoite(); ?> diff --git a/tests/application/modules/opac/controllers/ProfilOptionsControllerTest.php b/tests/application/modules/opac/controllers/ProfilOptionsControllerTest.php index bc447c4ce5446cf6a465a3257cd3031fe43c2bf5..cee139331eb4f7ebaa365e4bd7e7ab3ff00c52c1 100644 --- a/tests/application/modules/opac/controllers/ProfilOptionsControllerTest.php +++ b/tests/application/modules/opac/controllers/ProfilOptionsControllerTest.php @@ -135,26 +135,31 @@ class ProfilOptionsControllerProfilAdulteWithCacheTest extends ProfilOptionsCont $this->assertNotXPath('//li[@class="menu"]//a[text()="Accueil"][following-sibling::ul]', $this->_response->getBody()); } + /** @test */ public function scriptListeNoticeMurJsShouldBeLoaded() { - $this->assertXPath('//script [contains(@src, "liste_notices_mur.js")]'); + $this->assertXPath('//script[contains(@src, "liste_notices_mur.js")]'); } + /** @test */ public function scriptSubModalJsShouldBeLoaded() { - $this->assertXPath('//script [contains(@src, "subModal.js")]'); + $this->assertXPath('//script[contains(@src, "subModal.js")]'); } + /** @test */ - public function scriptDialogJsShouldBeLoaded() { - $this->assertXPathContentContains('//script','openDialogExemplaires'); + public function scriptWithOpenDialogShouldBeLoaded() { + $this->assertXPath('//script[contains(@src,"lien_reserver.js")]'); } + /** @test */ public function scriptShouldContainsDisponibiliteAjaxBaseUrl() { $this->assertXPathContentContains('//script', 'disponibiliteAjaxBaseUrl'); } + /** @test */ public function withOutOptionAfficherDisponibiliteSurRechercheScriptShouldNotContainsDisponibiliteAjaxBaseUrl(){ Class_AdminVar::newInstanceWithId('AFFICHER_DISPONIBILITE_SUR_RECHERCHE', ['valeur'=>0] ); @@ -196,8 +201,7 @@ class ProfilOptionsControllerTwitterLinkWithProfilAdulteTest extends ProfilOptio public function twitterLinkShouldReturnJavascriptForTweet() { $this->dispatch('/opac/index/share/on/twitter/titre/Profil+Adulte?url='.urlencode('http://localhost'.BASE_URL.'/index/index')); $this->assertContains(sprintf("window.open('http://twitter.com/home?status=%s','_blank','location=yes, width=800, height=410')", - urlencode('Profil Adulte http://is.gd/PkdNgD')), - $this->_response->getBody()); + urlencode('Profil Adulte http://is.gd/PkdNgD'))); } @@ -205,8 +209,7 @@ class ProfilOptionsControllerTwitterLinkWithProfilAdulteTest extends ProfilOptio public function facebookLinkShouldReturnJavascriptForTweet() { $this->dispatch('/opac/index/share/on/facebook/titre/Profil+Adulte?url='.urlencode('/index/index'), true); $this->assertContains(sprintf("window.open('http://www.facebook.com/share.php?u=%s','_blank','location=yes, width=800, height=410')", - urlencode('Profil Adulte http://is.gd/PkdNgD')), - $this->_response->getBody()); + urlencode('Profil Adulte http://is.gd/PkdNgD'))); } } @@ -314,8 +317,7 @@ class ProfilOptionsControllerViewProfilAdulteTest extends ProfilOptionsControlle /** @test */ public function menuHorizontalShouldIncludeLinkToArticleCms() { $this->assertXPathContentContains("//div[@id='menu_horizontal']//li//a[contains(@href, 'cms/articleviewpreferences?id_items=1-3&nb_aff=5&nb_analyse=10&display_order=Selection')]", - 'Articles', - $this->_response->getBody()); + 'Articles'); } @@ -341,22 +343,19 @@ class ProfilOptionsControllerViewProfilAdulteTest extends ProfilOptionsControlle /** @test */ public function menuHorizontalShouldDisplayBoiteCritiquesInSubMenu() { - $this->assertXPath('//div[@id="menu_horizontal"]//li[@class="menu"]//li[@class="boite"]//div[@class="boite critiques"]', - $this->_response->getBody()); + $this->assertXPath('//div[@id="menu_horizontal"]//li[@class="menu"]//li[@class="boite"]//div[@class="boite critiques"]'); } /** @test */ public function menuHorizontalShouldDisplaySitothequeWithUrl() { - $this->assertXPath('//div[@id="menu_horizontal"]//li[@class="menu"]//a[contains(@href, "/sito/sitoview?id_categorie=&id_items=10-1-2&nb=10&titre=&picto=vide.gif&libelle=Sitoth%C3%A8que")]', - $this->_response->getBody()); + $this->assertXPath('//div[@id="menu_horizontal"]//li[@class="menu"]//a[contains(@href, "/sito/sitoview?id_categorie=&id_items=10-1-2&nb=10&titre=&picto=vide.gif&libelle=Sitoth%C3%A8que")]'); } /** @test */ public function menuHorizontalShouldDisplayCatalogueWithUrl() { - $this->assertXPath('//div[@id="menu_horizontal"]//li[@class="menu"]//a[contains(@href, "/recherche/simple/titre/mon+catalogue/nb_notices/20/aleatoire/1/tri/date_creation+desc/nb_analyse/50/boite//id_catalogue/2/picto/vide.gif/libelle/mon+catalogue")]', - $this->_response->getBody()); + $this->assertXPath('//div[@id="menu_horizontal"]//li[@class="menu"]//a[contains(@href, "/recherche/simple/titre/mon+catalogue/nb_notices/20/aleatoire/1/tri/date_creation+desc/nb_analyse/50/boite//id_catalogue/2/picto/vide.gif/libelle/mon+catalogue")]'); } diff --git a/tests/application/modules/opac/controllers/RechercheControllerTest.php b/tests/application/modules/opac/controllers/RechercheControllerTest.php index 7225f9ee49baa6a0a3f62bb0111210d7b98742c8..0a62f0d84e6864cfa10e0d8996b21ce01209de3f 100644 --- a/tests/application/modules/opac/controllers/RechercheControllerTest.php +++ b/tests/application/modules/opac/controllers/RechercheControllerTest.php @@ -1200,8 +1200,8 @@ class RechercheControllerAjoutNoticePanierUrlWithMurConfigTest extends Recherche } /** @test */ - public function withOutLoggedUserPopupLoginShouldBeDisplay() { - $this->assertXPath('//iframe[contains(@src, "/auth/ajax-login")]',$this->_response->getBody()); + public function withOutLoggedUserPopupLoginShouldBeInitialized() { + $this->assertXPathContentContains('//script', 'noticeMurPanier'); } } ?> \ No newline at end of file