Skip to content
Snippets Groups Projects
Commit 5bfcadc4 authored by llaffont's avatar llaffont
Browse files

Menu: ne créée pas de ul si la liste des sous-menus définies est vide

parent 966faac1
Branches
Tags
No related merge requests found
......@@ -23,7 +23,9 @@ class ZendAfi_View_Helper_Menu_SousMenus extends ZendAfi_View_Helper_Menu_Menus
protected $_menu_class = '';
public function getBoite() {
return '<ul>'.$this->renderMenus().'</ul>';
if (!$html = $this->renderMenus())
return '';
return '<ul>'.$html.'</ul>';
}
}
......
......@@ -38,9 +38,10 @@ abstract class ProfilOptionsControllerWithProfilAdulteTestCase extends AbstractC
'picto' => 'bookmark.png',
'preferences' => [],
'sous_menus' => [['type_menu' => 'ACCUEIL',
'libelle' => 'Accueil',
'picto' => 'vide.gif',
'preferences' => []],
'libelle' => 'Accueil',
'picto' => 'vide.gif',
'preferences' => [],
'sous_menus' => ''],
['type_menu' => Class_Systeme_ModulesMenu::MODULE_ACCUEIL_PREFIX.'CRITIQUES',
'libelle' => 'Critiques',
......@@ -115,7 +116,6 @@ abstract class ProfilOptionsControllerWithProfilAdulteTestCase extends AbstractC
class ProfilOptionsControllerProfilAdulteWithCacheTest extends ProfilOptionsControllerWithProfilAdulteTestCase {
public function setUp(){
parent::setUp();
Class_AdminVar::newInstanceWithId('AFFICHER_DISPONIBILITE_SUR_RECHERCHE', ['valeur'=>1] );
......@@ -126,6 +126,12 @@ class ProfilOptionsControllerProfilAdulteWithCacheTest extends ProfilOptionsCont
$this->dispatch('/');
}
/** @test */
public function menuHorizontalAccueilShouldNotContainsEmptyUL() {
$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")]');
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment