From 8a47be77b5692a16ec99ddc69a1f39728e67a230 Mon Sep 17 00:00:00 2001 From: thinkphp Date: Wed, 16 Mar 2016 13:34:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=8D=95=E5=85=83=E6=B5=8B?= =?UTF-8?q?=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../think/view/{default => theme}/index/template.html | 0 tests/thinkphp/library/think/viewTest.php | 5 ++--- 2 files changed, 2 insertions(+), 3 deletions(-) rename tests/thinkphp/library/think/view/{default => theme}/index/template.html (100%) diff --git a/tests/thinkphp/library/think/view/default/index/template.html b/tests/thinkphp/library/think/view/theme/index/template.html similarity index 100% rename from tests/thinkphp/library/think/view/default/index/template.html rename to tests/thinkphp/library/think/view/theme/index/template.html diff --git a/tests/thinkphp/library/think/viewTest.php b/tests/thinkphp/library/think/viewTest.php index 05bfd823..44b101a4 100644 --- a/tests/thinkphp/library/think/viewTest.php +++ b/tests/thinkphp/library/think/viewTest.php @@ -121,14 +121,13 @@ class viewTest extends \PHPUnit_Framework_TestCase public function testParseTemplate() { $view_instance = \think\View::instance(); - $view_instance->theme(true); $view_instance->config(['view_path' => __DIR__ . DS . 'view' . DS]); $method = new \ReflectionMethod('\think\View', 'ParseTemplate'); $method->setAccessible(true); if (defined('CONTROLLER_NAME')) { - $expect_data = __DIR__ . DS . 'view' . DS . 'default' . DS . CONTROLLER_NAME . DS . 'template.html'; + $expect_data = __DIR__ . DS . 'view' . DS . 'theme_name' . DS . CONTROLLER_NAME . DS . 'template.html'; } else { - $expect_data = __DIR__ . DS . 'view' . DS . 'default' . DS . 'template.html'; + $expect_data = __DIR__ . DS . 'view' . DS . 'theme_name' . DS . 'template.html'; } $this->assertEquals($expect_data, $method->invoke($view_instance, 'template')); }