From f90298fe76285a542d2a20426e9dc716cacc2a3d Mon Sep 17 00:00:00 2001 From: thinkphp Date: Wed, 16 Mar 2016 13:37:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tests/thinkphp/library/think/viewTest.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/thinkphp/library/think/viewTest.php b/tests/thinkphp/library/think/viewTest.php index 44b101a4..4c956566 100644 --- a/tests/thinkphp/library/think/viewTest.php +++ b/tests/thinkphp/library/think/viewTest.php @@ -121,13 +121,14 @@ class viewTest extends \PHPUnit_Framework_TestCase public function testParseTemplate() { $view_instance = \think\View::instance(); + $view_instance->theme('theme'); $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 . 'theme_name' . DS . CONTROLLER_NAME . DS . 'template.html'; + $expect_data = __DIR__ . DS . 'view' . DS . 'theme' . DS . CONTROLLER_NAME . DS . 'template.html'; } else { - $expect_data = __DIR__ . DS . 'view' . DS . 'theme_name' . DS . 'template.html'; + $expect_data = __DIR__ . DS . 'view' . DS . 'theme' . DS . 'template.html'; } $this->assertEquals($expect_data, $method->invoke($view_instance, 'template')); }