diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2013-01-13 20:12:06 -0500 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2013-01-13 20:13:17 -0500 |
| commit | 62279d46a60e695a71c4748f8722975a37f488bc (patch) | |
| tree | cd6fe9b643e1569430e0b58cc650e58886aa1b40 | |
| parent | 56e6d0531b4d7de70be018e7c136c791fca3b945 (diff) | |
| parent | 227f7f46dfdba990242c96f6d6e27f0d12ab4784 (diff) | |
| download | forums-62279d46a60e695a71c4748f8722975a37f488bc.tar forums-62279d46a60e695a71c4748f8722975a37f488bc.tar.gz forums-62279d46a60e695a71c4748f8722975a37f488bc.tar.bz2 forums-62279d46a60e695a71c4748f8722975a37f488bc.tar.xz forums-62279d46a60e695a71c4748f8722975a37f488bc.zip | |
Merge PR #1194 branch 'develop-olympus' into develop
* develop-olympus:
[ticket/11323] Add tests for inclusion of defined variables
| -rw-r--r-- | tests/template/template_test.php | 20 | ||||
| -rw-r--r-- | tests/template/templates/include_define_variable.html | 2 | ||||
| -rw-r--r-- | tests/template/templates/include_loop_define.html | 4 |
3 files changed, 25 insertions, 1 deletions
diff --git a/tests/template/template_test.php b/tests/template/template_test.php index 83995cb4ac..f43157775a 100644 --- a/tests/template/template_test.php +++ b/tests/template/template_test.php @@ -196,7 +196,25 @@ class phpbb_template_template_test extends phpbb_template_template_test_case array('loop' => array(array('VARIABLE' => 'x'), array('VARIABLE' => 'y')), 'loop.inner' => array(array(), array())), array('loop'), '', - ),/* no top level nested loops + ), + /* Currently fail on develop: + http://tracker.phpbb.com/browse/PHPBB3-11323 + array( + 'include_define_variable.html', + array('VARIABLE' => 'variable.html'), + array(), + array(), + 'variable.html', + ), + array( + 'include_loop_define.html', + array('VARIABLE' => 'value'), + array('loop' => array(array('NESTED_FILE' => 'variable.html'))), + array(), + 'value', + ), + */ + /* no top level nested loops array( 'loop_vars.html', array(), diff --git a/tests/template/templates/include_define_variable.html b/tests/template/templates/include_define_variable.html new file mode 100644 index 0000000000..aff9b574c2 --- /dev/null +++ b/tests/template/templates/include_define_variable.html @@ -0,0 +1,2 @@ +<!-- DEFINE $DEF = '{VARIABLE}' --> +<!-- INCLUDE {$DEF} --> diff --git a/tests/template/templates/include_loop_define.html b/tests/template/templates/include_loop_define.html new file mode 100644 index 0000000000..f539b21396 --- /dev/null +++ b/tests/template/templates/include_loop_define.html @@ -0,0 +1,4 @@ +<!-- BEGIN loop --> +<!-- DEFINE $DEF = '{loop.NESTED_FILE}' --> +<!-- INCLUDE {$DEF} --> +<!-- END loop --> |