diff options
| author | Nils Adermann <naderman@naderman.de> | 2012-11-10 07:46:50 -0800 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2012-11-10 07:46:50 -0800 |
| commit | f0cfae1f014e5defd373bac74b5d915fc3568c7a (patch) | |
| tree | 04f0c8ef151c7e8e0d7adf2452624c24c4a71dd8 /tests/template/template_includejs_test.php | |
| parent | 3f933c6870188d0e47e186fddfdc4f3b56a57009 (diff) | |
| parent | a05f354fdf903d00e85d8e4ad1d50f9ef906534d (diff) | |
| download | forums-f0cfae1f014e5defd373bac74b5d915fc3568c7a.tar forums-f0cfae1f014e5defd373bac74b5d915fc3568c7a.tar.gz forums-f0cfae1f014e5defd373bac74b5d915fc3568c7a.tar.bz2 forums-f0cfae1f014e5defd373bac74b5d915fc3568c7a.tar.xz forums-f0cfae1f014e5defd373bac74b5d915fc3568c7a.zip | |
Merge pull request #881 from Fyorl/ticket/10970
Allow INCLUDE template macros to accept paths of the form {FOO}/a/{BAR}/c
Diffstat (limited to 'tests/template/template_includejs_test.php')
| -rw-r--r-- | tests/template/template_includejs_test.php | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/tests/template/template_includejs_test.php b/tests/template/template_includejs_test.php index a8f9a9037f..22b020208b 100644 --- a/tests/template/template_includejs_test.php +++ b/tests/template/template_includejs_test.php @@ -20,11 +20,14 @@ class phpbb_template_template_includejs_test extends phpbb_template_template_tes $scripts = array( '<script src="' . $this->test_path . '/templates/parent_and_child.js?assets_version=1"></script>', '<script src="' . $this->test_path . '/parent_templates/parent_only.js?assets_version=1"></script>', - '<script src="' . $this->test_path . '/templates/child_only.js?assets_version=1"></script>' + '<script src="' . $this->test_path . '/templates/child_only.js?assets_version=1"></script>', + '<script src="' . $this->test_path . '/templates/subdir/parent_only.js?assets_version=1"></script>', + '<script src="' . $this->test_path . '/templates/subdir/subsubdir/parent_only.js?assets_version=1"></script>', + '<script src="' . $this->test_path . '/templates/subdir/parent_only.js?assets_version=1"></script>', ); // Run test $cache_file = $this->template->cachepath . 'includejs.html.php'; - $this->run_template('includejs.html', array('PARENT' => 'parent_only.js'), array(), array(), implode('', $scripts), $cache_file); + $this->run_template('includejs.html', array('PARENT' => 'parent_only.js', 'SUBDIR' => 'subdir', 'EXT' => 'js'), array(), array(), implode('', $scripts), $cache_file); } } |