From d8c80afae9c34fa9c863daffe6912a97be1cbb0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Tue, 13 Dec 2016 17:29:05 +0100 Subject: [PATCH] Always set global settings for testing MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michal Čihař --- test/libraries/PMA_user_preferences_test.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/test/libraries/PMA_user_preferences_test.php b/test/libraries/PMA_user_preferences_test.php index 8d9d76dd0c..9f283390bf 100644 --- a/test/libraries/PMA_user_preferences_test.php +++ b/test/libraries/PMA_user_preferences_test.php @@ -30,6 +30,8 @@ class PMA_User_Preferences_Test extends PHPUnit_Framework_TestCase */ function setUp() { + global $cfg; + include 'libraries/config.default.php'; $GLOBALS['server'] = 0; $GLOBALS['PMA_PHP_SELF'] = '/phpmyadmin/'; } @@ -364,7 +366,8 @@ class PMA_User_Preferences_Test extends PHPUnit_Framework_TestCase */ public function testUserprefsRedirect() { - + $GLOBALS['lang'] = ''; + $restoreInstance = PMA\libraries\Response::getInstance(); $mockResponse = $this->getMockBuilder('PMA\libraries\Response')