From 9c198f4de09af0e573e25f442cbe51341cdebaec Mon Sep 17 00:00:00 2001
From: oldrind <1401019000@qq.com>
Date: Tue, 15 Mar 2016 11:19:32 +0800
Subject: [PATCH] =?UTF-8?q?Revert=20"=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 58d37604892442ddd04dc012fe6aa5ebcb2e152c.
---
 tests/thinkphp/library/think/layout.html      | 3 ++-
 tests/thinkphp/library/think/templateTest.php | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/tests/thinkphp/library/think/layout.html b/tests/thinkphp/library/think/layout.html
index 4ce233db..be8d4a07 100644
--- a/tests/thinkphp/library/think/layout.html
+++ b/tests/thinkphp/library/think/layout.html
@@ -1 +1,2 @@
-<div>{__CONTENT__}</div>
\ No newline at end of file
+<div>{__CONTENT__}
+</div>
\ No newline at end of file
diff --git a/tests/thinkphp/library/think/templateTest.php b/tests/thinkphp/library/think/templateTest.php
index 3fe28f39..9ba071b2 100644
--- a/tests/thinkphp/library/think/templateTest.php
+++ b/tests/thinkphp/library/think/templateTest.php
@@ -318,14 +318,13 @@ 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('<div>value</div>');
+        $this->expectOutputString('value');
     }
 
     public function testFetch()
@@ -383,6 +382,8 @@ value:
 EOF;
         $template->fetch($content);
         $this->expectOutputString($content2);
+//        $template->parse($content);
+//        var_dump($content);
     }
 
     public function testVarAssign()