diff --git a/tests/fixtures/config.php b/tests/fixtures/config.php deleted file mode 100644 index eb4fb446..00000000 --- a/tests/fixtures/config.php +++ /dev/null @@ -1,26 +0,0 @@ - -// +---------------------------------------------------------------------- -// $Id$ - -return [ - 'url_route_on' => true, - 'slog' => [ - 'host' => '111.202.76.133', - //是否显示利于优化的参数,如果允许时间,消耗内存等 - 'optimize' => true, - 'show_included_files' => true, - 'error_handler' => true, - //日志强制记录到配置的client_id - 'force_client_id' => '', - //限制允许读取日志的client_id - 'allow_client_ids' => [], - ], -]; diff --git a/tests/fixtures/runtime/.gitignore b/tests/fixtures/runtime/.gitignore deleted file mode 100644 index a3a0c8b5..00000000 --- a/tests/fixtures/runtime/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -* -!.gitignore \ No newline at end of file diff --git a/tests/mock.php b/tests/mock.php index 2b270276..9059788a 100644 --- a/tests/mock.php +++ b/tests/mock.php @@ -19,7 +19,7 @@ $_SERVER['REQUEST_METHOD'] = 'GET'; define('TEST_PATH', __DIR__ . '/'); // 定义项目路径 -define('APP_PATH', __DIR__ . '/fixtures/'); +define('APP_PATH', __DIR__ . '/../../application/'); // 开启调试模式 define('APP_DEBUG', true); diff --git a/tests/fixtures/config.ini b/tests/thinkphp/library/think/config/driver/fixtures/config.ini similarity index 100% rename from tests/fixtures/config.ini rename to tests/thinkphp/library/think/config/driver/fixtures/config.ini diff --git a/tests/fixtures/config.xml b/tests/thinkphp/library/think/config/driver/fixtures/config.xml similarity index 100% rename from tests/fixtures/config.xml rename to tests/thinkphp/library/think/config/driver/fixtures/config.xml diff --git a/tests/thinkphp/library/think/config/driver/iniTest.php b/tests/thinkphp/library/think/config/driver/iniTest.php index f8d27d4c..eddfea3b 100644 --- a/tests/thinkphp/library/think/config/driver/iniTest.php +++ b/tests/thinkphp/library/think/config/driver/iniTest.php @@ -26,7 +26,7 @@ class iniTest extends \PHPUnit_Framework_TestCase Config::parse('inistring=1', 'ini'); $this->assertEquals(1, Config::get('inistring')); Config::reset(); - Config::parse('thinkphp/tests/fixtures/config.ini'); + Config::parse(__DIR__ . '/fixtures/config.ini'); $this->assertTrue(Config::has('inifile')); $this->assertEquals(1, Config::get('inifile')); Config::reset(); diff --git a/tests/thinkphp/library/think/config/driver/xmlTest.php b/tests/thinkphp/library/think/config/driver/xmlTest.php index 9332796c..cf33d8a7 100644 --- a/tests/thinkphp/library/think/config/driver/xmlTest.php +++ b/tests/thinkphp/library/think/config/driver/xmlTest.php @@ -26,7 +26,7 @@ class xmlTest extends \PHPUnit_Framework_TestCase Config::parse('1', 'xml'); $this->assertEquals(1, Config::get('xmlstring')); Config::reset(); - Config::parse('thinkphp/tests/fixtures/config.xml'); + Config::parse(__DIR__ . '/fixtures/config.xml'); $this->assertTrue(Config::has('xmlfile.istrue')); $this->assertEquals(1, Config::get('xmlfile.istrue')); Config::reset();