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
path: root/test
diff options
context:
space:
mode:
authorMichal Čihař <mcihar@suse.cz>2012-05-14 17:58:18 +0400
committerMichal Čihař <mcihar@suse.cz>2012-05-14 17:58:18 +0400
commitde343ab837daabb12382eb05c0d09aaf557459ce (patch)
tree63566422991e6077de42739979d971650f33a5bd /test
parent398992670f7b629e01610d1ea4fc7d4c653a694e (diff)
Test loading some arbitrary file
Diffstat (limited to 'test')
-rw-r--r--test/classes/PMA_Config_test.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/test/classes/PMA_Config_test.php b/test/classes/PMA_Config_test.php
index 5f583456cb..114901c760 100644
--- a/test/classes/PMA_Config_test.php
+++ b/test/classes/PMA_Config_test.php
@@ -33,6 +33,7 @@ class PMA_ConfigTest extends PHPUnit_Framework_TestCase
protected function setUp()
{
$this->object = new PMA_Config;
+ $GLOBALS['server'] = 0;
}
/**
@@ -538,7 +539,6 @@ class PMA_ConfigTest extends PHPUnit_Framework_TestCase
* @depends testCheckSystem
* @depends testCheckWebServer
* @depends testLoadDefaults
- * @depends testLoad
*
* @group large
*/
@@ -614,6 +614,8 @@ class PMA_ConfigTest extends PHPUnit_Framework_TestCase
{
$this->assertFalse($this->object->load());
+ $this->assertTrue($this->object->load('./test/test_data/config.inc.php'));
+
$this->assertTrue($this->object->load('./libraries/config.default.php'));
}