tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SearchDashboard: adjust SearchDashboardTest and rename searchQuery to searchString

This commit is contained in:
Alexander Fuhr 2014-09-04 22:54:41 +02:00
parent 0f7f2f2d8b
commit ba623d0544
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
library/Icinga/Web/Widget/SearchDashboard.php
View File

@ -29,14 +29,14 @@ class SearchDashboard extends Dashboard
/**
* Load all available search dashlets from modules
*
* @param $searchQuery
* @param string $searchString
* @return Dashboard|SearchDashboard
*/
public static function search($searchQuery = '')
public static function search($searchString = '')
{
/** @var $dashboard SearchDashboard */
$dashboard = new static('searchDashboard');
$dashboard->loadSearchDashlets($searchQuery);
$dashboard->loadSearchDashlets($searchString);
return $dashboard;
}

11
test/php/library/Icinga/Web/Widget/SearchDashboardTest.php
View File

@ -14,7 +14,7 @@ class SearchDashboardTest extends BaseTestCase
public function tearDown()
{
parent::tearDown();
Mockery::close(); // Necessary because some tests run in a separate process
Mockery::close();
}
protected function setupIcingaMock(\Zend_Controller_Request_Abstract $request)
@ -46,14 +46,14 @@ class SearchDashboardTest extends BaseTestCase
/**
* @expectedException Zend_Controller_Action_Exception
*/
public function testFoo()
public function testWhetherRenderThrowsAnExceptionWhenHasNoComponents()
{
$dashboard = SearchDashboard::search('pending');
$dashboard->getPane('search')->removeComponents();
$dashboard->render();
}
public function testWhetherLoadLoadsSearchDashletsFromModules()
public function testWhetherSearchLoadsSearchDashletsFromModules()
{
$dashboard = SearchDashboard::search('pending');
@ -62,10 +62,9 @@ class SearchDashboardTest extends BaseTestCase
$this->assertTrue($result, 'Dashboard::search() could not load search dashlets from modules');
}
public function testWhetherLoadProvidesHint()
public function testWhetherSearchProvidesHintWhenSearchStringIsEmpty()
{
$dashboard = SearchDashboard::search('');
$dashboard = SearchDashboard::search();
$result = $dashboard->getPane('search')->hasComponent('Ready to search');