From f7248e781ff94dc72d7696d337a5b3534a4c2b2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= Date: Wed, 20 Dec 2017 22:46:01 -0200 Subject: [PATCH] Fix Rte/RoutinesTest global dependencies MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maurício Meneghini Fauth --- test/classes/Rte/RoutinesTest.php | 31 +++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/test/classes/Rte/RoutinesTest.php b/test/classes/Rte/RoutinesTest.php index b0ff780e04..f624ef50a5 100644 --- a/test/classes/Rte/RoutinesTest.php +++ b/test/classes/Rte/RoutinesTest.php @@ -25,18 +25,29 @@ class RoutinesTest extends TestCase * * @return void */ - public function setUp() + protected function setUp() { - global $cfg; - - $cfg['ShowFunctionFields'] = false; - $cfg['ServerDefault'] = 1; - $cfg['DefaultFunctions']['FUNC_NUMBER'] = ''; - $cfg['DefaultFunctions']['FUNC_DATE'] = ''; - $cfg['DefaultFunctions']['FUNC_SPATIAL'] = 'GeomFromText'; - $GLOBALS['server'] = 0; - $GLOBALS['pmaThemePath'] = $GLOBALS['PMA_Theme']->getPath(); + $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['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(); } /**