diff --git a/library/ZendAfi/View/Helper/Menu/Base.php b/library/ZendAfi/View/Helper/Menu/Base.php index 20be31bce778850688e32922879d656360ceb674..c5e5ecaf9b672a3e01756f5a0be2ab00cf9d43c8 100644 --- a/library/ZendAfi/View/Helper/Menu/Base.php +++ b/library/ZendAfi/View/Helper/Menu/Base.php @@ -22,8 +22,9 @@ abstract class ZendAfi_View_Helper_Menu_Base extends ZendAfi_View_Helper_BaseHelper { public static function getModuleHelperFromParams($id_menu, $menu) { if (!array_isset('preferences', $menu)) - $menu['preferences'] = array(); - $menu['preferences']['picto'] = $menu['picto']; + $menu['preferences'] = []; + + $menu['preferences']['picto'] = $menu['picto'] ; $menu['preferences']['libelle'] = $menu['libelle']; return Class_Systeme_ModulesMenu::isModuleAccueil($menu) diff --git a/tests/application/modules/opac/controllers/IndexControllerTest.php b/tests/application/modules/opac/controllers/IndexControllerTest.php index c3bd238607e42f5188cef15d792568d3a02d4657..3e6fd304b8a7197536d816f6c9a36c5f3e172c43 100644 --- a/tests/application/modules/opac/controllers/IndexControllerTest.php +++ b/tests/application/modules/opac/controllers/IndexControllerTest.php @@ -40,6 +40,7 @@ class IndexControllerAsInviteTest extends AbstractControllerTestCase { /** @test */ public function linkToConfigurePageShouldNotBeInFooter() { + Class_Profil::newInstanceWithId(1, ['cfg_menus' => '']); $this->dispatch('/?id_profil=1'); $this->assertNotXPath('//a[contains(@href, "admin/profil/accueil/id_profil/1")]'); } diff --git a/tests/application/modules/opac/controllers/ProfilOptionsControllerTest.php b/tests/application/modules/opac/controllers/ProfilOptionsControllerTest.php index d58e1637de3902e6cc056b4e3568fa14ce36cfd4..00c9a1ebcc445f9680a490a11ad1e5ccbbbcfede 100644 --- a/tests/application/modules/opac/controllers/ProfilOptionsControllerTest.php +++ b/tests/application/modules/opac/controllers/ProfilOptionsControllerTest.php @@ -340,12 +340,21 @@ class ProfilOptionsControllerViewProfilAdulteTest extends ProfilOptionsControlle -class ProfilOptionsControllerViewProfilAdulteAsAdminTest extends ProfilOptionsControllerWithProfilAdulteTestCase { +abstract class ProfilOptionsControllerProfilAdulteAsAdminTestCase extends ProfilOptionsControllerWithProfilAdulteTestCase { public function setUp() { parent::setUp(); $admin = Class_Users::newInstanceWithId(34, ['login' => 'admin'])->beAdminPortail(); ZendAfi_Auth::getInstance()->logUser($admin); + } +} + + + + +class ProfilOptionsControllerViewProfilAdulteAsAdminTest extends ProfilOptionsControllerProfilAdulteAsAdminTestCase { + public function setUp() { + parent::setUp(); $this->dispatch('/opac/'); } @@ -365,6 +374,31 @@ class ProfilOptionsControllerViewProfilAdulteAsAdminTest extends ProfilOptionsCo +class ProfilOptionsControllerProfilAdulteAsAdminPostConfigCalendrierTest extends ProfilOptionsControllerProfilAdulteAsAdminTestCase { + public function setUp() { + parent::setUp(); + + Storm_Test_ObjectWrapper::onLoaderOfModel('Class_Profil') + ->whenCalled('save') + ->answers(true); + + + $this->postDispatch('/admin/menus/calendrier?config=menu&id_profil=2&id_module=8&type_menu=MODULE_ACCUEIL_CALENDAR&preferences=nb_events%3D5', + ['nb_events' => 12, + 'libelle' => 'Agenda']); + } + + + /** @test */ + public function savedMenuCalendrierShouldHaveNbEvents12() { + $preferences = $this->profil_adulte->getMenuHorizontal()->getMenuPrefencesByIdModule(8); + $this->assertEquals(12, $preferences['nb_events']); + } +} + + + + abstract class ProfilOptionsControllerProfilJeunesseWithPagesJeuxMusiqueTestCase extends AbstractControllerTestCase { protected function _loginHook($account) { $account->ROLE = "";