MINOR Disabled MainMenu caching in LeftAndMain

This commit is contained in:
Ingo Schommer 2012-05-03 14:05:13 +02:00
parent 8a8dbce92e
commit f6c8468d56

View File

@ -118,7 +118,7 @@ class LeftAndMainTest extends FunctionalTest {
// anonymous user // anonymous user
$this->session()->inst_set('loggedInAs', null); $this->session()->inst_set('loggedInAs', null);
$menuItems = singleton('LeftAndMain')->MainMenu(); $menuItems = singleton('LeftAndMain')->MainMenu(false);
$this->assertEquals( $this->assertEquals(
array_map($allValsFn, $menuItems->column('Code')), array_map($allValsFn, $menuItems->column('Code')),
array(), array(),
@ -127,7 +127,7 @@ class LeftAndMainTest extends FunctionalTest {
// restricted cms user // restricted cms user
$this->session()->inst_set('loggedInAs', $securityonlyuser->ID); $this->session()->inst_set('loggedInAs', $securityonlyuser->ID);
$menuItems = singleton('LeftAndMain')->MainMenu(); $menuItems = singleton('LeftAndMain')->MainMenu(false);
$this->assertEquals( $this->assertEquals(
array_map($allValsFn, $menuItems->column('Code')), array_map($allValsFn, $menuItems->column('Code')),
array('SecurityAdmin','Help'), array('SecurityAdmin','Help'),
@ -136,7 +136,7 @@ class LeftAndMainTest extends FunctionalTest {
// all cms sections user // all cms sections user
$this->session()->inst_set('loggedInAs', $allcmssectionsuser->ID); $this->session()->inst_set('loggedInAs', $allcmssectionsuser->ID);
$menuItems = singleton('LeftAndMain')->MainMenu(); $menuItems = singleton('LeftAndMain')->MainMenu(false);
$this->assertContains('SecurityAdmin', $this->assertContains('SecurityAdmin',
array_map($allValsFn, $menuItems->column('Code')), array_map($allValsFn, $menuItems->column('Code')),
'Group with CMS_ACCESS_LeftAndMain permission can access all sections' 'Group with CMS_ACCESS_LeftAndMain permission can access all sections'
@ -148,7 +148,7 @@ class LeftAndMainTest extends FunctionalTest {
// admin // admin
$this->session()->inst_set('loggedInAs', $adminuser->ID); $this->session()->inst_set('loggedInAs', $adminuser->ID);
$menuItems = singleton('LeftAndMain')->MainMenu(); $menuItems = singleton('LeftAndMain')->MainMenu(false);
$this->assertContains( $this->assertContains(
'SecurityAdmin', 'SecurityAdmin',
array_map($allValsFn, $menuItems->column('Code')), array_map($allValsFn, $menuItems->column('Code')),