makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge PR #1372 branch 'EXreaction/ticket/11435' into develop

Browse source 
# By Nathan Guse (2) and Nathaniel Guse (1)
# Via Nathaniel Guse
* EXreaction/ticket/11435:
  [ticket/11435] Mark extension spacing test as incomplete
  [ticket/11435] Create test to make sure template/event output is equal
  [ticket/11435] Fix comments in events test
This commit is contained in:
Oleg Pudeyev 2013-05-01 14:16:41 -04:00
commit 954edb3eb4
5 changed files with 106 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/variable_spacing.html Normal file
View file

@ -0,0 +1,6 @@
|{VARIABLE}|
{VARIABLE}|{VARIABLE}|
|{VARIABLE}
<div class="{VARIABLE}">test</div>

1
tests/template/datasets/ext_trivial/styles/silver/template/variable_spacing.html Normal file
View file

@ -0,0 +1 @@
<!-- EVENT variable_spacing -->

3
tests/template/template_events_test.php
View file

@ -16,9 +16,10 @@ class phpbb_template_template_events_test extends phpbb_template_template_test_c
return array(
/*
array(
'', // file
'', // Description
'', // dataset
array(), // style names
'', // file
array(), // vars
array(), // block vars
array(), // destroy

91
tests/template/template_spacing_test.php Normal file
View file

@ -0,0 +1,91 @@
<?php
/**
*
* @package testing
* @copyright (c) 2013 phpBB Group
* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
*
*/
require_once dirname(__FILE__) . '/template_test_case.php';
class phpbb_template_template_spacing_test extends phpbb_template_template_test_case
{
public function template_data()
{
return array(
/*
array(
'', // Description
'', // dataset
array(), // style names
'', // file
array(), // vars
array(), // block vars
array(), // destroy
'', // expected result
),
*/
array(
'Spacing in templates',
'ext_trivial',
array(),
'variable_spacing.html',
array(
'VARIABLE' => '{}',
),
array(),
array(),
'|{}|
{}|{}|
|{}
<div class="{}">test</div>',
),
);
}
/**
* @dataProvider template_data
*/
public function test_template($desc, $dataset, $style_names, $file, array $vars, array $block_vars, array $destroy, $expected)
{
// Run test
$cache_file = $this->template->cachepath . str_replace('/', '.', $file) . '.php';
$this->run_template($file, $vars, $block_vars, $destroy, $expected, $cache_file);
}
/**
* @dataProvider template_data
*/
public function test_event($desc, $dataset, $style_names, $file, array $vars, array $block_vars, array $destroy, $expected)
{
$this->markTestIncomplete(
'This test will fail until PHPBB3-11435 is fixed'
);
// Reset the engine state
$this->setup_engine_for_events($dataset, $style_names);
// Run test
$cache_file = $this->template->cachepath . str_replace('/', '.', $file) . '.php';
$this->run_template($file, $vars, $block_vars, $destroy, $expected, $cache_file);
}
protected function setup_engine_for_events($dataset, $style_names, 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__) . "/datasets/$dataset/styles/silver/template";
$this->style_resource_locator = new phpbb_style_resource_locator();
$this->extension_manager = new phpbb_mock_filesystem_extension_manager(
dirname(__FILE__) . "/datasets/$dataset/"
);
$this->template = new phpbb_template($phpbb_root_path, $phpEx, $config, $user, $this->style_resource_locator, new phpbb_template_context, $this->extension_manager);
$this->style_provider = new phpbb_style_path_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('silver', array($this->template_path), $style_names, '');
}
}

6
tests/template/templates/variable_spacing.html Normal file
View file

@ -0,0 +1,6 @@
|{VARIABLE}|
{VARIABLE}|{VARIABLE}|
|{VARIABLE}
<div class="{VARIABLE}">test</div>