From 9c505961df0342596ee6b59b1b803979de7d6eed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= Date: Mon, 17 Jun 2019 18:41:30 -0300 Subject: [PATCH] Fix missing globals in RTE tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maurício Meneghini Fauth --- libraries/classes/Dbi/DbiDummy.php | 7 +++++++ test/classes/Rte/EventsTest.php | 15 ++++----------- test/classes/Rte/RoutinesTest.php | 19 +++---------------- test/classes/Rte/TriggersTest.php | 16 ++++------------ 4 files changed, 18 insertions(+), 39 deletions(-) diff --git a/libraries/classes/Dbi/DbiDummy.php b/libraries/classes/Dbi/DbiDummy.php index 042f482b0e..f0bb175791 100644 --- a/libraries/classes/Dbi/DbiDummy.php +++ b/libraries/classes/Dbi/DbiDummy.php @@ -1594,6 +1594,13 @@ class DbiDummy implements DbiExtension . "WHERE `SCHEMA_NAME` < 'db' ) t", 'result' => [], ], + [ + 'query' => "SELECT (COUNT(DB_first_level) DIV 100) * 100 from " + . "( SELECT distinct SUBSTRING_INDEX(SCHEMA_NAME, '_', 1) " + . "DB_first_level FROM INFORMATION_SCHEMA.SCHEMATA " + . "WHERE `SCHEMA_NAME` < 'pma_test' ) t", + 'result' => [], + ], [ 'query' => "SELECT `SCHEMA_NAME` FROM " . "`INFORMATION_SCHEMA`.`SCHEMATA`, " diff --git a/test/classes/Rte/EventsTest.php b/test/classes/Rte/EventsTest.php index 73ed9c2a3b..ae27b801ec 100644 --- a/test/classes/Rte/EventsTest.php +++ b/test/classes/Rte/EventsTest.php @@ -9,6 +9,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests\Rte; +use PhpMyAdmin\Config; use PhpMyAdmin\Response; use PhpMyAdmin\Rte\Events; use PHPUnit\Framework\TestCase; @@ -32,21 +33,13 @@ class EventsTest extends TestCase */ protected function setUp(): void { + $GLOBALS['PMA_Config'] = new Config(); + $GLOBALS['PMA_Config']->enableBc(); $GLOBALS['server'] = 0; $GLOBALS['db'] = 'db'; $GLOBALS['table'] = 'table'; $GLOBALS['PMA_PHP_SELF'] = 'index.php'; - $GLOBALS['cfg']['AllowThirdPartyFraming'] = false; - $GLOBALS['cfg']['SendErrorReports'] = 'ask'; - $GLOBALS['cfg']['DefaultTabDatabase'] = 'structure'; - $GLOBALS['cfg']['ShowDatabasesNavigationAsTree'] = true; - $GLOBALS['cfg']['DefaultTabTable'] = 'browse'; - $GLOBALS['cfg']['NavigationTreeDefaultTabTable'] = 'structure'; - $GLOBALS['cfg']['NavigationTreeDefaultTabTable2'] = ''; - $GLOBALS['cfg']['LimitChars'] = 50; - $GLOBALS['cfg']['Confirm'] = true; - $GLOBALS['cfg']['LoginCookieValidity'] = 1440; - $GLOBALS['cfg']['ServerDefault'] = ''; + $GLOBALS['cfg']['Server']['DisableIS'] = false; $GLOBALS['tear_down']['server'] = true; $this->events = new Events($GLOBALS['dbi']); diff --git a/test/classes/Rte/RoutinesTest.php b/test/classes/Rte/RoutinesTest.php index f6050b5b00..5d8306673b 100644 --- a/test/classes/Rte/RoutinesTest.php +++ b/test/classes/Rte/RoutinesTest.php @@ -9,6 +9,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests\Rte; +use PhpMyAdmin\Config; use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Response; use PhpMyAdmin\Rte\Routines; @@ -34,27 +35,13 @@ class RoutinesTest extends TestCase */ protected function setUp(): void { - $GLOBALS['cfg']['ShowFunctionFields'] = false; - $GLOBALS['cfg']['ServerDefault'] = 1; - $GLOBALS['cfg']['DefaultFunctions']['FUNC_NUMBER'] = ''; - $GLOBALS['cfg']['DefaultFunctions']['FUNC_DATE'] = ''; - $GLOBALS['cfg']['DefaultFunctions']['FUNC_SPATIAL'] = 'GeomFromText'; - $GLOBALS['cfg']['AllowThirdPartyFraming'] = false; - $GLOBALS['cfg']['SendErrorReports'] = 'ask'; - $GLOBALS['cfg']['DefaultTabDatabase'] = 'structure'; - $GLOBALS['cfg']['ShowDatabasesNavigationAsTree'] = true; - $GLOBALS['cfg']['DefaultTabTable'] = 'browse'; - $GLOBALS['cfg']['NavigationTreeDefaultTabTable'] = 'structure'; - $GLOBALS['cfg']['NavigationTreeDefaultTabTable2'] = ''; - $GLOBALS['cfg']['LimitChars'] = 50; - $GLOBALS['cfg']['Confirm'] = true; - $GLOBALS['cfg']['LoginCookieValidity'] = 1440; + $GLOBALS['PMA_Config'] = new Config(); + $GLOBALS['PMA_Config']->enableBc(); $GLOBALS['cfg']['Server']['DisableIS'] = false; $GLOBALS['server'] = 0; $GLOBALS['db'] = 'db'; $GLOBALS['table'] = 'table'; $GLOBALS['PMA_PHP_SELF'] = 'index.php'; - $GLOBALS['pmaThemePath'] = $GLOBALS['PMA_Theme']->getPath(); $this->routines = new Routines($GLOBALS['dbi']); } diff --git a/test/classes/Rte/TriggersTest.php b/test/classes/Rte/TriggersTest.php index 935d45dfee..04ebdc614b 100644 --- a/test/classes/Rte/TriggersTest.php +++ b/test/classes/Rte/TriggersTest.php @@ -9,6 +9,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests\Rte; +use PhpMyAdmin\Config; use PhpMyAdmin\Response; use PhpMyAdmin\Rte\Triggers; use PHPUnit\Framework\TestCase; @@ -32,18 +33,9 @@ class TriggersTest extends TestCase */ protected function setUp(): void { - $GLOBALS['cfg']['ServerDefault'] = ''; - $GLOBALS['cfg']['AllowThirdPartyFraming'] = false; - $GLOBALS['cfg']['SendErrorReports'] = 'ask'; - $GLOBALS['cfg']['DefaultTabDatabase'] = 'structure'; - $GLOBALS['cfg']['ShowDatabasesNavigationAsTree'] = true; - $GLOBALS['cfg']['DefaultTabTable'] = 'browse'; - $GLOBALS['cfg']['NavigationTreeDefaultTabTable'] = 'structure'; - $GLOBALS['cfg']['NavigationTreeDefaultTabTable2'] = ''; - $GLOBALS['cfg']['LimitChars'] = 50; - $GLOBALS['cfg']['Confirm'] = true; - $GLOBALS['cfg']['LoginCookieValidity'] = 1440; - $GLOBALS['cfg']['NaturalOrder'] = false; + $GLOBALS['PMA_Config'] = new Config(); + $GLOBALS['PMA_Config']->enableBc(); + $GLOBALS['cfg']['Server']['DisableIS'] = false; $GLOBALS['db'] = 'pma_test'; $GLOBALS['table'] = 'table'; $GLOBALS['PMA_PHP_SELF'] = 'index.php';