1
0
Fork 0

Continued to switch the old configuration handling to the new one.

Dieser Commit ist enthalten in:
DSB 2012-08-04 17:09:48 +00:00
Ursprung 025b5c339d
Commit ae87af916f
54 geänderte Dateien mit 501 neuen und 269 gelöschten Zeilen

Datei anzeigen

@ -11,8 +11,8 @@ class SqlboxTest extends ControllerTestCase
public function testCanCreateTableSelectBox()
{
$model = new Application_Model_Sqlbox();
$config = Msd_Configuration::getInstance();
$config->set('dynamic.dbActual', 'information_schema');
$dynamicConfig = Msd_Registry::getDynamicConfig();
$dynamicConfig->setParam('dbActual', 'information_schema');
$selectBox = $model->getTableSelectBox();
$tables = array('CHARACTER_SETS', 'COLLATIONS', 'COLLATION_CHARACTER_SET_APPLICABILITY',
'COLUMNS', 'COLUMN_PRIVILEGES', 'ENGINES'

Datei anzeigen

@ -20,8 +20,8 @@ class MenuTest extends ControllerTestCase
public function testCanRenderMenuWithInvalidActualDatabase()
{
$this->loginUser();
$config = Msd_Configuration::getInstance();
$config->set('dynamic.dbActual', -1);
$dynamicConfig = Msd_Registry::getDynamicConfig();
$dynamicConfig->setParam('dbActual', -1);
$this->dispatch('/');
$this->assertQueryContentContains('#selectedDb', 'information_schema');
}
@ -29,9 +29,10 @@ class MenuTest extends ControllerTestCase
public function testCanFallbackToDefaultDbIfActualDbIsInvalid()
{
$this->loginUser();
$config = Msd_Configuration::getInstance();
$config->set('dynamic.dbActual', 'i_dont_exist');
$config->set('config.dbuser.defaultDb', 'information_schema');
$dynamicConfig = Msd_Registry::getDynamicConfig();
$dynamicConfig->setParam('dbActual', 'i_dont_exist');
$config = Msd_Registry::getConfig();
$config->set('dbuser.defaultDb', 'information_schema');
$this->dispatch('/');
$this->assertQueryContentContains('#selectedDb', 'information_schema');
}
@ -39,9 +40,10 @@ class MenuTest extends ControllerTestCase
public function testCanFallbackToFirstDbIfActualAndDefaultDbsAreInvalid()
{
$this->loginUser();
$config = Msd_Configuration::getInstance();
$config->set('dynamic.dbActual', 'i_dont_exist');
$config->set('config.dbuser.defaultDb', 'I_dont_exist');
$dynamicConfig = Msd_Registry::getDynamicConfig();
$dynamicConfig->setParam('dbActual', 'i_dont_exist');
$config = Msd_Registry::getConfig();
$config->setParam('dbuser.defaultDb', 'I_dont_exist');
$this->dispatch('/');
$this->assertQueryContentContains('#selectedDb', 'information_schema');
}