From 0268a0b7c966feae059a2f8731f30576c0ca110e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Mon, 25 Jun 2012 11:09:11 +0200 Subject: [PATCH 1/7] Include vendor config before scripts which use it --- test/libraries/core/PMA_fatalError_test.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/libraries/core/PMA_fatalError_test.php b/test/libraries/core/PMA_fatalError_test.php index dc4777f15d..2ae27c40f7 100644 --- a/test/libraries/core/PMA_fatalError_test.php +++ b/test/libraries/core/PMA_fatalError_test.php @@ -12,11 +12,11 @@ /* * Include to test. */ +require_once 'libraries/vendor_config.php'; require_once 'libraries/select_lang.lib.php'; require_once 'libraries/core.lib.php'; require_once 'libraries/sanitizing.lib.php'; require_once 'libraries/Config.class.php'; -require_once 'libraries/vendor_config.php'; require_once 'libraries/php-gettext/gettext.inc'; class PMA_fatalError_test extends PHPUnit_Framework_TestCase @@ -42,4 +42,4 @@ class PMA_fatalError_test extends PHPUnit_Framework_TestCase PMA_fatalError($message, $params); } -} \ No newline at end of file +} From 913dd208a02770b7066f621af770ae5b8d013a11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Mon, 25 Jun 2012 11:10:22 +0200 Subject: [PATCH 2/7] Include core before libraries which use it --- test/libraries/core/PMA_fatalError_test.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/libraries/core/PMA_fatalError_test.php b/test/libraries/core/PMA_fatalError_test.php index 2ae27c40f7..6b20894d20 100644 --- a/test/libraries/core/PMA_fatalError_test.php +++ b/test/libraries/core/PMA_fatalError_test.php @@ -13,8 +13,8 @@ * Include to test. */ require_once 'libraries/vendor_config.php'; -require_once 'libraries/select_lang.lib.php'; require_once 'libraries/core.lib.php'; +require_once 'libraries/select_lang.lib.php'; require_once 'libraries/sanitizing.lib.php'; require_once 'libraries/Config.class.php'; require_once 'libraries/php-gettext/gettext.inc'; From f010626290f9e70d64ea401dca93b1d0511c9724 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Mon, 25 Jun 2012 11:10:40 +0200 Subject: [PATCH 3/7] Use require_once because of testsuite --- libraries/Config.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/Config.class.php b/libraries/Config.class.php index cad6eff80b..01d47aa670 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -12,7 +12,7 @@ if (! defined('PHPMYADMIN')) { /** * Load vendor configuration. */ -require './libraries/vendor_config.php'; +require_once './libraries/vendor_config.php'; /** * Configuration class From 14d2a27b8f11d20e4518f8658098cd2618a59d53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Mon, 25 Jun 2012 11:13:01 +0200 Subject: [PATCH 4/7] Prepare config as test uses it --- test/libraries/core/PMA_fatalError_test.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/test/libraries/core/PMA_fatalError_test.php b/test/libraries/core/PMA_fatalError_test.php index 6b20894d20..fdf6e6ab93 100644 --- a/test/libraries/core/PMA_fatalError_test.php +++ b/test/libraries/core/PMA_fatalError_test.php @@ -21,6 +21,12 @@ require_once 'libraries/php-gettext/gettext.inc'; class PMA_fatalError_test extends PHPUnit_Framework_TestCase { + public function setup() + { + $GLOBALS['PMA_Config'] = new PMA_Config(); + $GLOBALS['PMA_Config']->enableBc(); + } + public function testFatalErrorMessage() { $this->expectOutputRegex("/FatalError!/"); From ad824a9232451659675a78a27d2dcde5c91e1f4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Mon, 25 Jun 2012 12:16:51 +0200 Subject: [PATCH 5/7] The sql_query can be unset --- libraries/Footer.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/Footer.class.php b/libraries/Footer.class.php index 7ba4069615..fa264996b9 100644 --- a/libraries/Footer.class.php +++ b/libraries/Footer.class.php @@ -106,7 +106,7 @@ class PMA_Footer // set current db, table and sql query in the querywindow $query = ''; - if (strlen($GLOBALS['sql_query']) > $GLOBALS['cfg']['MaxCharactersInDisplayedSQL']) { + if (isset($GLOBALS['sql_query']) && strlen($GLOBALS['sql_query']) > $GLOBALS['cfg']['MaxCharactersInDisplayedSQL']) { $query = PMA_escapeJsString($GLOBALS['sql_query']); } $this->_scripts->addCode(" From 6a4ac7ef32d152cab1299debf46ed359f2c0d615 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Mon, 25 Jun 2012 12:17:12 +0200 Subject: [PATCH 6/7] Do not emit headers when running testsuite --- libraries/Header.class.php | 4 ++-- libraries/OutputBuffering.class.php | 8 +++++--- libraries/core.lib.php | 3 +++ 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/libraries/Header.class.php b/libraries/Header.class.php index ddad908901..d61dda9fa2 100644 --- a/libraries/Header.class.php +++ b/libraries/Header.class.php @@ -335,7 +335,7 @@ class PMA_Header */ $GLOBALS['now'] = gmdate('D, d M Y H:i:s') . ' GMT'; /* Prevent against ClickJacking by allowing frames only from same origin */ - if (! $GLOBALS['cfg']['AllowThirdPartyFraming']) { + if (! $GLOBALS['cfg']['AllowThirdPartyFraming'] && ! defined('TESTSUITE')) { header( 'X-Frame-Options: SAMEORIGIN' ); @@ -351,7 +351,7 @@ class PMA_Header ); } PMA_noCacheHeader(); - if (! defined('IS_TRANSFORMATION_WRAPPER')) { + if (! defined('IS_TRANSFORMATION_WRAPPER') && ! defined('TESTSUITE')) { // Define the charset to be used header('Content-Type: text/html; charset=utf-8'); } diff --git a/libraries/OutputBuffering.class.php b/libraries/OutputBuffering.class.php index 782e7d0686..69e12aeb9c 100644 --- a/libraries/OutputBuffering.class.php +++ b/libraries/OutputBuffering.class.php @@ -1,7 +1,7 @@ _mode); + if (! defined('TESTSUITE')) { + header('X-ob_mode: ' . $this->_mode); + } register_shutdown_function('PMA_OutputBuffering::stop'); $this->_on = true; } diff --git a/libraries/core.lib.php b/libraries/core.lib.php index b83614cccb..790523ecc8 100644 --- a/libraries/core.lib.php +++ b/libraries/core.lib.php @@ -575,6 +575,9 @@ function PMA_sendHeaderLocation($uri, $use_refresh = false) */ function PMA_noCacheHeader() { + if (defined('TESTSUITE')) { + return; + } // rfc2616 - Section 14.21 header('Expires: ' . date(DATE_RFC1123)); // HTTP/1.1 From cacbc79bc8f07841c015d68eac37aefe8456a35a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Mon, 25 Jun 2012 12:17:50 +0200 Subject: [PATCH 7/7] Add missing variables and includes to make the test work --- test/libraries/core/PMA_fatalError_test.php | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/test/libraries/core/PMA_fatalError_test.php b/test/libraries/core/PMA_fatalError_test.php index fdf6e6ab93..d50ec533f7 100644 --- a/test/libraries/core/PMA_fatalError_test.php +++ b/test/libraries/core/PMA_fatalError_test.php @@ -14,9 +14,14 @@ */ require_once 'libraries/vendor_config.php'; require_once 'libraries/core.lib.php'; +require_once 'libraries/common.lib.php'; +require_once 'libraries/js_escape.lib.php'; require_once 'libraries/select_lang.lib.php'; require_once 'libraries/sanitizing.lib.php'; require_once 'libraries/Config.class.php'; +require_once 'libraries/url_generating.lib.php'; +require_once 'libraries/Theme.class.php'; +require_once 'libraries/Table.class.php'; require_once 'libraries/php-gettext/gettext.inc'; class PMA_fatalError_test extends PHPUnit_Framework_TestCase @@ -25,6 +30,18 @@ class PMA_fatalError_test extends PHPUnit_Framework_TestCase { $GLOBALS['PMA_Config'] = new PMA_Config(); $GLOBALS['PMA_Config']->enableBc(); + $GLOBALS['cfg']['Server'] = array( + 'host' => 'host', + 'verbose' => 'verbose', + ); + $GLOBALS['cfg']['OBGzip'] = false; + $_SESSION['PMA_Theme'] = new PMA_Theme(); + $_SESSION[' PMA_token '] = 'token'; + $GLOBALS['pmaThemeImage'] = 'theme/'; + $GLOBALS['pmaThemePath'] = $_SESSION['PMA_Theme']->getPath(); + $GLOBALS['server'] = 1; + $GLOBALS['db'] = ''; + $GLOBALS['table'] = ''; } public function testFatalErrorMessage()