diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2012-03-31 17:22:54 +0200 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2012-03-31 17:22:54 +0200 |
| commit | 0ae491c5fa9228304e17431ea7aa8ba9303cc193 (patch) | |
| tree | 9d3fcccb13d8bda12ae7f0dec3321c7375d8e621 /tests/template/template_test_case.php | |
| parent | e7a4437c1bccace4a0637241a8f386e686d9c3fb (diff) | |
| parent | 5d07b16ec647f51d51504cf9d6a0861a975ceb8e (diff) | |
| download | forums-0ae491c5fa9228304e17431ea7aa8ba9303cc193.tar forums-0ae491c5fa9228304e17431ea7aa8ba9303cc193.tar.gz forums-0ae491c5fa9228304e17431ea7aa8ba9303cc193.tar.bz2 forums-0ae491c5fa9228304e17431ea7aa8ba9303cc193.tar.xz forums-0ae491c5fa9228304e17431ea7aa8ba9303cc193.zip | |
Merge remote-tracking branch 'cyberalien/feature/merging-style-components' into develop
* cyberalien/feature/merging-style-components: (31 commits)
[feature/merging-style-components] Fix back link on install page
[feature/merging-style-components] Fix for unit tests
[feature/merging-style-components] Moving template initialization out of style
[feature/merging-style-components] Renaming "delete" to "uninstall" for styles
[feature/merging-style-components] Initializing locator and provider separately
[feature/merging-style-components] Fixing few errors in acp_styles
[feature/merging-style-components] Fix notices in acp_styles
[feature/merging-style-components] Updating styles in coding guidelines
[feature/merging-style-components] Changing acp_styles text
[feature/merging-style-components] Updating test cases
[feature/merging-style-components] Updating style initialization
[feature/merging-style-components] Changing style class
[feature/merging-style-components] Changing template class
[feature/merging-style-components] Changing resource locator
[feature/merging-style-components] Changing path provider
[feature/merging-style-components] Renaming style locator
[feature/merging-style-components] Changing $style to $style_id
[feature/merging-style-components] Creating style class
[feature/merging-style-components] New acp_styles template
[feature/merging-style-components] New acp_styles
...
Diffstat (limited to 'tests/template/template_test_case.php')
| -rw-r--r-- | tests/template/template_test_case.php | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/tests/template/template_test_case.php b/tests/template/template_test_case.php index 5b60785fee..a87e531a07 100644 --- a/tests/template/template_test_case.php +++ b/tests/template/template_test_case.php @@ -12,10 +12,11 @@ require_once dirname(__FILE__) . '/../mock/extension_manager.php'; class phpbb_template_template_test_case extends phpbb_test_case { + protected $style; protected $template; protected $template_path; - protected $template_locator; - protected $template_provider; + protected $style_resource_locator; + protected $style_provider; // Keep the contents of the cache for debugging? const PRESERVE_CACHE = true; @@ -63,10 +64,11 @@ class phpbb_template_template_test_case extends phpbb_test_case $config = new phpbb_config(array_merge($defaults, $new_config)); $this->template_path = dirname(__FILE__) . '/templates'; - $this->template_locator = new phpbb_template_locator(); - $this->template_provider = new phpbb_template_path_provider(); - $this->template = new phpbb_template($phpbb_root_path, $phpEx, $config, $user, $this->template_locator, $this->template_provider); - $this->template->set_custom_template($this->template_path, 'tests'); + $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', $this->template_path, ''); } protected function setUp() |