Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'test/libraries/PMA_server_privileges_test.php')
-rw-r--r--test/libraries/PMA_server_privileges_test.php14
1 files changed, 9 insertions, 5 deletions
diff --git a/test/libraries/PMA_server_privileges_test.php b/test/libraries/PMA_server_privileges_test.php
index 17657feb57..f8b88b498a 100644
--- a/test/libraries/PMA_server_privileges_test.php
+++ b/test/libraries/PMA_server_privileges_test.php
@@ -64,10 +64,10 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase
$GLOBALS['cfg']['LimitChars'] = 100;
$GLOBALS['cfg']['AllowThirdPartyFraming'] = false;
$GLOBALS['cfg']['ActionLinksMode'] = "both";
- $GLOBALS['cfg']['DefaultTabDatabase'] = 'db_structure.php';
+ $GLOBALS['cfg']['DefaultTabDatabase'] = 'structure';
$GLOBALS['cfg']['PmaAbsoluteUri'] = "PmaAbsoluteUri";
- $GLOBALS['cfg']['DefaultTabTable'] = "db_structure.php";
- $GLOBALS['cfg']['NavigationTreeDefaultTabTable'] = "db_structure.php";
+ $GLOBALS['cfg']['DefaultTabTable'] = "structure";
+ $GLOBALS['cfg']['NavigationTreeDefaultTabTable'] = "structure";
$GLOBALS['cfg']['Confirm'] = "Confirm";
$GLOBALS['cfg']['ShowHint'] = true;
@@ -1672,7 +1672,9 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase
$html
);
$this->assertContains(
- $GLOBALS['cfg']['DefaultTabDatabase'],
+ PMA_Util::getScriptNameForOption(
+ $GLOBALS['cfg']['DefaultTabDatabase'], 'database'
+ ),
$html
);
$item = PMA_URL_getCommon(
@@ -1696,7 +1698,9 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase
$html
);
$this->assertContains(
- $GLOBALS['cfg']['DefaultTabTable'],
+ PMA_Util::getScriptNameForOption(
+ $GLOBALS['cfg']['DefaultTabTable'], 'table'
+ ),
$html
);
$item = PMA_URL_getCommon(