Commit 6e5ee097 authored by Ghislain Loas's avatar Ghislain Loas

dev #75742 fix failures

parent 9eb1138e
......@@ -170,6 +170,7 @@ class ZendAfi_Acl_AdminControllerRoles extends Zend_Acl {
$this->deny('modo_portail','systeme');
$this->deny('modo_portail','batch');
$this->deny('modo_portail','search-form');
$this->deny('modo_portail','thesauri');
$this->allow('modo_portail');
$this->allow('admin_portail');
......
......@@ -166,13 +166,13 @@ class Admin_AlbumControllerListViewModeSearchTest extends Admin_AlbumControllerL
$this->onLoaderOfModel('Class_Album')
->whenCalled('findAllBy')
->with(['where' => 'titre like \'%Second%\'',
->with(['where' => '(titre like \'%Second%\')',
'order' => 'titre',
'limitPage' => [0, 25]])
->answers([Class_Album::find(2)])
->whenCalled('countBy')
->with(['where' => 'titre like \'%Second%\'',
->with(['where' => '(titre like \'%Second%\')',
'order' => 'titre'])
->answers(200)
......@@ -333,13 +333,13 @@ class Admin_AlbumControllerListViewModeSearchSpecialCharTest extends Admin_Album
Storm_Test_ObjectWrapper::onLoaderOfModel('Class_Album')
->whenCalled('findAllBy')
->with(['where' => 'titre like \'%é%\'',
->with(['where' => '(titre like \'%é%\')',
'order' => 'titre',
'limitPage' => [0, 25]])
->answers([Class_Album::find(2)])
->whenCalled('countBy')
->with(['where' => 'titre like \'%é%\'',
->with(['where' => '(titre like \'%é%\')',
'order' => 'titre'])
->answers(200)
......
......@@ -327,6 +327,7 @@ Trait MenuGaucheAdminRolesDefinition {
'users',
'usergroup',
'file-manager',
'thesauri/index',
] ],
[ZendAfi_Acl_AdminControllerRoles::MODO_BIB,
......@@ -356,6 +357,7 @@ class ZendAfi_View_Helper_Admin_MenuGaucheAdminRightsTest extends ViewHelperTest
Class_AdminVar::set('ACTIVITY', 1);
Class_AdminVar::set('BIBNUM', 1);
Class_AdminVar::set('SITO_IN_ALBUMS', 1);
Class_AdminVar::set('THESAURI_BROWSER', 1);
}
......
......@@ -196,6 +196,15 @@ class Thesauri_ThesauriAdminIndexDispatchTest extends Thesauri_ThesauriTestCase
public function setUp() {
parent::setUp();
$user = $this->fixture('Class_Users',
['id' => 65,
'login' => 'admin',
'password' => 'admin',
'role_level' => ZendAfi_Acl_AdminControllerRoles::ADMIN_PORTAIL]);
ZendAfi_Auth::getInstance()->logUser($user);
$this->dispatch('/admin/index', true);
}
......
Markdown is supported
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