gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid nested output buffer problems in test

Browse Source 
Signed-off-by: Michal Čihař <michal@cihar.com>
This commit is contained in:
Michal Čihař 2016-02-12 15:28:22 +01:00
parent 2d47e41084
commit b5b869419f
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
js/messages.php
View File

@ -30,11 +30,13 @@ require_once './libraries/js_escape.lib.php';
$buffer = PMA\libraries\OutputBuffering::getInstance();
$buffer->start();
register_shutdown_function(
function () {
echo PMA\libraries\OutputBuffering::getInstance()->getContents();
}
);
if (!defined('TESTSUITE')) {
register_shutdown_function(
function () {
echo PMA\libraries\OutputBuffering::getInstance()->getContents();
}
);
}
$js_messages['strNoDropDatabases'] = __('"DROP DATABASE" statements are disabled.');
if ($cfg['AllowUserDropDatabase']) {

8
test/libraries/Files_test.php
View File

@ -31,15 +31,17 @@ class FilesTest extends PHPUnit_Framework_TestCase
public function testJsMessages()
{
ob_start();
$GLOBALS['pmaThemeImage'] = '';
$cfg = array(
'AllowUserDropDatabase' => true,
'GridEditing' => 'click',
'OBGzip' => false,
'ServerDefault' => 1,
);
$GLOBALS['cfg'] = $cfg;
require 'js/messages.php';
$out = ob_get_contents();
ob_end_clean();
$buffer->stop();
$out = $buffer->getContents();
$this->assertContains('var PMA_messages = new Array();', $out);
}