From 5d0c285004ad6def0adfe308b9987790f7fee8f3 Mon Sep 17 00:00:00 2001 From: oldrind <1401019000@qq.com> Date: Tue, 15 Mar 2016 10:50:43 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tests/thinkphp/library/think/layout.html | 3 +-- tests/thinkphp/library/think/templateTest.php | 5 ++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/tests/thinkphp/library/think/layout.html b/tests/thinkphp/library/think/layout.html index be8d4a07..4ce233db 100644 --- a/tests/thinkphp/library/think/layout.html +++ b/tests/thinkphp/library/think/layout.html @@ -1,2 +1 @@ -
{__CONTENT__} -
\ No newline at end of file +
{__CONTENT__}
\ No newline at end of file diff --git a/tests/thinkphp/library/think/templateTest.php b/tests/thinkphp/library/think/templateTest.php index 9ba071b2..3fe28f39 100644 --- a/tests/thinkphp/library/think/templateTest.php +++ b/tests/thinkphp/library/think/templateTest.php @@ -318,13 +318,14 @@ EOF; { $template = new Template(); $template->assign('name', 'name'); + $template->layout('layout'); $config = [ 'strip_space' => true, 'view_path' => dirname(__FILE__) . '/', ]; $data = ['name' => 'value']; $template->display('display', $data, $config); - $this->expectOutputString('value'); + $this->expectOutputString('
value
'); } public function testFetch() @@ -382,8 +383,6 @@ value: EOF; $template->fetch($content); $this->expectOutputString($content2); -// $template->parse($content); -// var_dump($content); } public function testVarAssign()