From 3d4fbb88c6ab64786209fabccdc7491fc93c7d60 Mon Sep 17 00:00:00 2001
From: uwetews <uwe.tews@googlemail.com>
Date: Fri, 25 Dec 2015 08:48:25 +0100
Subject: [PATCH] Update extends test

---
 .../UnitTests/ResourceTests/Extends/ExtendsResourceTest.php | 6 +++---
 .../TagTests/BockExtend/CompileBlockExtendsTest.php         | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/UnitTests/ResourceTests/Extends/ExtendsResourceTest.php b/tests/UnitTests/ResourceTests/Extends/ExtendsResourceTest.php
index baa14af2..cdf566ca 100644
--- a/tests/UnitTests/ResourceTests/Extends/ExtendsResourceTest.php
+++ b/tests/UnitTests/ResourceTests/Extends/ExtendsResourceTest.php
@@ -42,7 +42,7 @@ class ExtendsResourceTest extends PHPUnit_Smarty
         $this->smarty->registerFilter('pre', array($this, 'compiledPrefilter'));
         $this->smarty->assign('test', $testNumber);
         $this->smarty->caching = $caching;
-        $this->smarty->inheritance_merge_compiled_includes = $merge;
+        $this->smarty->merge_compiled_includes = $merge;
         if ($merge) {
             $this->smarty->compile_id = 1;
         }
@@ -61,7 +61,7 @@ class ExtendsResourceTest extends PHPUnit_Smarty
         $this->smarty->registerFilter('pre', array($this, 'compiledPrefilter'));
         $this->smarty->assign('test', $testNumber);
         $this->smarty->caching = $caching;
-        $this->smarty->inheritance_merge_compiled_includes = $merge;
+        $this->smarty->merge_compiled_includes = $merge;
         if ($merge) {
             $this->smarty->compile_id = 1;
         }
@@ -81,7 +81,7 @@ class ExtendsResourceTest extends PHPUnit_Smarty
         $this->smarty->registerFilter('pre', array($this, 'compiledPrefilter'));
         $this->smarty->assign('test', $testNumber);
         $this->smarty->caching = $caching;
-        $this->smarty->inheritance_merge_compiled_includes = $merge;
+        $this->smarty->merge_compiled_includes = $merge;
         if ($merge) {
             $this->smarty->compile_id = 1;
         }
diff --git a/tests/UnitTests/TemplateSource/TagTests/BockExtend/CompileBlockExtendsTest.php b/tests/UnitTests/TemplateSource/TagTests/BockExtend/CompileBlockExtendsTest.php
index 161f3541..53d51de9 100644
--- a/tests/UnitTests/TemplateSource/TagTests/BockExtend/CompileBlockExtendsTest.php
+++ b/tests/UnitTests/TemplateSource/TagTests/BockExtend/CompileBlockExtendsTest.php
@@ -642,7 +642,7 @@ class CompileBlockExtendsTest extends PHPUnit_Smarty
 
     /**
      * @expectedException        SmartyException
-     * @expectedExceptionMessage tag {$smarty.block.parent} used in parent template
+     * @expectedExceptionMessage illegal {$smarty.block.parent}
      * test {$this->smarty.block.parent} in parent template
      */
     public function testSmartyBlockParentInParent_027()