diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2013-01-13 20:11:31 -0500 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2013-01-13 20:11:31 -0500 |
| commit | 227f7f46dfdba990242c96f6d6e27f0d12ab4784 (patch) | |
| tree | 237419120a1a8ddf5e7db0871b6b37aeda036faa /tests | |
| parent | 0b0b5e15c3b7fc55774df09025f6bb206f7df4bd (diff) | |
| parent | 4c50a35b62a46de69b439f9ac8007721d76881b0 (diff) | |
| download | forums-227f7f46dfdba990242c96f6d6e27f0d12ab4784.tar forums-227f7f46dfdba990242c96f6d6e27f0d12ab4784.tar.gz forums-227f7f46dfdba990242c96f6d6e27f0d12ab4784.tar.bz2 forums-227f7f46dfdba990242c96f6d6e27f0d12ab4784.tar.xz forums-227f7f46dfdba990242c96f6d6e27f0d12ab4784.zip | |
Merge PR #1194 branch 'marc1706/ticket/11323' into develop-olympus
# By Marc Alexander
# Via Marc Alexander
* marc1706/ticket/11323:
[ticket/11323] Add tests for inclusion of defined variables
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/template/template_test.php | 17 | ||||
| -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, 22 insertions, 1 deletions
diff --git a/tests/template/template_test.php b/tests/template/template_test.php index 9b3c6ac245..291b424bdd 100644 --- a/tests/template/template_test.php +++ b/tests/template/template_test.php @@ -238,7 +238,22 @@ class phpbb_template_template_test extends phpbb_test_case array('loop' => array(array('VARIABLE' => 'x'), array('VARIABLE' => 'y')), 'loop.inner' => array(array(), array())), array('loop'), '', - ),/* no top level nested loops + ), + 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 --> |