aboutsummaryrefslogtreecommitdiffstats
path: root/tests/template
diff options
context:
space:
mode:
authorOleg Pudeyev <oleg@bsdpower.com>2012-04-12 22:54:43 -0400
committerOleg Pudeyev <oleg@bsdpower.com>2012-04-12 22:54:43 -0400
commit2c9d984049db28e029941f523ba84d326b311363 (patch)
tree1651982ffc87deb1f3febf27a542d1cba701842d /tests/template
parent790cc0c54f0f84235a556e4442c42d9d1d5f7195 (diff)
parent8a1d084d6d00500b3ea17a7fd3168ec4f321b31b (diff)
downloadforums-2c9d984049db28e029941f523ba84d326b311363.tar
forums-2c9d984049db28e029941f523ba84d326b311363.tar.gz
forums-2c9d984049db28e029941f523ba84d326b311363.tar.bz2
forums-2c9d984049db28e029941f523ba84d326b311363.tar.xz
forums-2c9d984049db28e029941f523ba84d326b311363.zip
Merge remote-tracking branch 'naderman/ticket/10783' into develop
* naderman/ticket/10783: [ticket/10783] Correctly add assets_version config var to includejs urls
Diffstat (limited to 'tests/template')
-rw-r--r--tests/template/template_includejs_test.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/template/template_includejs_test.php b/tests/template/template_includejs_test.php
index fa23837553..632fde61d1 100644
--- a/tests/template/template_includejs_test.php
+++ b/tests/template/template_includejs_test.php
@@ -14,14 +14,14 @@ class phpbb_template_template_includejs_test extends phpbb_template_template_tes
public function test_includejs_compilation()
{
// Reset the engine state
- $this->setup_engine();
+ $this->setup_engine(array('assets_version' => 1));
// Prepare correct result
$dir = dirname(__FILE__);
$scripts = array(
- '<script src="' . $dir . '/templates/parent_and_child.html"></script>',
- '<script src="' . $dir . '/parent_templates/parent_only.html"></script>',
- '<script src="' . $dir . '/templates/child_only.html"></script>'
+ '<script src="' . $dir . '/templates/parent_and_child.html?assets_version=1"></script>',
+ '<script src="' . $dir . '/parent_templates/parent_only.html?assets_version=1"></script>',
+ '<script src="' . $dir . '/templates/child_only.html?assets_version=1"></script>'
);
// Run test