[ticket/12382] Mark broken nested loop with include as incomplete

PHPBB3-12382
This commit is contained in:
Joas Schilling 2014-04-14 18:56:34 +02:00
parent b3a758a43b
commit 91eaae122f
2 changed files with 15 additions and 2 deletions

View file

@ -102,6 +102,7 @@ Zeta test event in all',
), ),
array(), array(),
'event_loop[0[subloop:0]]', 'event_loop[0[subloop:0]]',
'Event files are missing opened parent loops: PHPBB3-12382',
), ),
); );
} }
@ -109,8 +110,13 @@ Zeta test event in all',
/** /**
* @dataProvider template_data * @dataProvider template_data
*/ */
public function test_event($desc, $dataset, $style_names, $file, array $vars, array $block_vars, array $destroy, $expected) public function test_event($desc, $dataset, $style_names, $file, array $vars, array $block_vars, array $destroy, $expected, $incomplete_message = '')
{ {
if ($incomplete_message)
{
$this->markTestIncomplete($incomplete_message);
}
// Reset the engine state // Reset the engine state
$this->setup_engine_for_events($dataset, $style_names); $this->setup_engine_for_events($dataset, $style_names);

View file

@ -329,6 +329,8 @@ class phpbb_template_template_test extends phpbb_template_template_test_case
), ),
array(), array(),
"[bar|[bar|]][bar1|[bar1|[bar1|works]]]", "[bar|[bar|]][bar1|[bar1|[bar1|works]]]",
array(),
'Included files are missing opened parent loops: PHPBB3-12382',
), ),
/* Does not pass with the current implementation. /* Does not pass with the current implementation.
array( array(
@ -373,8 +375,13 @@ class phpbb_template_template_test extends phpbb_template_template_test_case
/** /**
* @dataProvider template_data * @dataProvider template_data
*/ */
public function test_template($file, array $vars, array $block_vars, array $destroy, $expected, $lang_vars = array()) public function test_template($file, array $vars, array $block_vars, array $destroy, $expected, $lang_vars = array(), $incomplete_message = '')
{ {
if ($incomplete_message)
{
$this->markTestIncomplete($incomplete_message);
}
$this->run_template($file, $vars, $block_vars, $destroy, $expected, $lang_vars); $this->run_template($file, $vars, $block_vars, $destroy, $expected, $lang_vars);
} }