aboutsummaryrefslogtreecommitdiffstats
path: root/tests/template/template_inheritance_test.php
diff options
context:
space:
mode:
authorVjacheslav Trushkin <arty@phpbb.com>2012-04-01 20:37:45 +0300
committerVjacheslav Trushkin <arty@phpbb.com>2012-04-01 20:37:45 +0300
commit2d9d8d367389c6bc0cef7852849e3d43ac682789 (patch)
tree7767e7cda103acc7a8b0d8d7b22b7680b5eade35 /tests/template/template_inheritance_test.php
parent1ffc7c1fab85b1eb732b31bfd8a0f48c7351e68a (diff)
downloadforums-2d9d8d367389c6bc0cef7852849e3d43ac682789.tar
forums-2d9d8d367389c6bc0cef7852849e3d43ac682789.tar.gz
forums-2d9d8d367389c6bc0cef7852849e3d43ac682789.tar.bz2
forums-2d9d8d367389c6bc0cef7852849e3d43ac682789.tar.xz
forums-2d9d8d367389c6bc0cef7852849e3d43ac682789.zip
[ticket/10665] New test class for templates with tree
New parent template test class for tests that use styles tree PHPBB3-10665
Diffstat (limited to 'tests/template/template_inheritance_test.php')
-rw-r--r--tests/template/template_inheritance_test.php20
1 files changed, 2 insertions, 18 deletions
diff --git a/tests/template/template_inheritance_test.php b/tests/template/template_inheritance_test.php
index a76658701a..febfed9ef0 100644
--- a/tests/template/template_inheritance_test.php
+++ b/tests/template/template_inheritance_test.php
@@ -7,9 +7,9 @@
*
*/
-require_once dirname(__FILE__) . '/template_test_case.php';
+require_once dirname(__FILE__) . '/template_test_case_with_tree.php';
-class phpbb_template_template_inheritance_test extends phpbb_template_template_test_case
+class phpbb_template_template_inheritance_test extends phpbb_template_template_test_case_with_tree
{
/**
* @todo put test data into templates/xyz.test
@@ -61,20 +61,4 @@ class phpbb_template_template_inheritance_test extends phpbb_template_template_t
$this->run_template($file, $vars, $block_vars, $destroy, $expected, $cache_file);
}
-
- protected function setup_engine(array $new_config = array())
- {
- global $phpbb_root_path, $phpEx, $user;
-
- $defaults = $this->config_defaults();
- $config = new phpbb_config(array_merge($defaults, $new_config));
-
- $this->template_path = dirname(__FILE__) . '/templates';
- $this->parent_template_path = dirname(__FILE__) . '/parent_templates';
- $this->style_resource_locator = new phpbb_style_resource_locator();
- $this->style_provider = new phpbb_style_path_provider();
- $this->template = new phpbb_style_template($phpbb_root_path, $phpEx, $config, $user, $this->style_resource_locator, $this->style_provider);
- $this->style = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $this->style_resource_locator, $this->style_provider, $this->template);
- $this->style->set_custom_style('tests', array($this->template_path, $this->parent_template_path), '');
- }
}