Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
228d2a3c72
@ -11,7 +11,6 @@
|
||||
/*
|
||||
* Include to test.
|
||||
*/
|
||||
require_once 'libraries/config.default.php';
|
||||
require_once 'libraries/core.lib.php';
|
||||
require_once 'libraries/common.lib.php';
|
||||
require_once 'libraries/Theme.class.php';
|
||||
@ -21,6 +20,8 @@ class PMA_showPHPDocu_test extends PHPUnit_Framework_TestCase
|
||||
function setup()
|
||||
{
|
||||
$_SESSION['PMA_Theme'] = PMA_Theme::load('./themes/pmahomme');
|
||||
$GLOBALS['server'] = 99;
|
||||
$GLOBALS['cfg']['ServerDefault'] = 0;
|
||||
}
|
||||
|
||||
function testShwoPHPDocuReplaceHelpImg()
|
||||
@ -29,7 +30,7 @@ class PMA_showPHPDocu_test extends PHPUnit_Framework_TestCase
|
||||
|
||||
$target = "docu";
|
||||
$lang = _pgettext('PHP documentation language', 'en');
|
||||
$expected = '<a href="./url.php?url=http%3A%2F%2Fphp.net%2Fmanual%2F' . $lang . '%2F' . $target
|
||||
$expected = '<a href="./url.php?url=http%3A%2F%2Fphp.net%2Fmanual%2F' . $lang . '%2F' . $target . '&server=99'
|
||||
. '" target="documentation"><img src="themes/dot.gif" title="'
|
||||
. __('Documentation') . '" alt="' . __('Documentation') . '" class="icon ic_b_help" /></a>';
|
||||
|
||||
@ -42,7 +43,7 @@ class PMA_showPHPDocu_test extends PHPUnit_Framework_TestCase
|
||||
|
||||
$target = "docu";
|
||||
$lang = _pgettext('PHP documentation language', 'en');
|
||||
$expected = '[<a href="./url.php?url=http%3A%2F%2Fphp.net%2Fmanual%2F' . $lang . '%2F' . $target
|
||||
$expected = '[<a href="./url.php?url=http%3A%2F%2Fphp.net%2Fmanual%2F' . $lang . '%2F' . $target . '&server=99'
|
||||
. '" target="documentation">' . __('Documentation') . '</a>]';
|
||||
|
||||
$this->assertEquals($expected, PMA_showPHPDocu($target));
|
||||
|
||||
Loading…
Reference in New Issue
Block a user