diff options
| author | Vjacheslav Trushkin <cyberalien@gmail.com> | 2013-07-11 15:40:28 -0400 |
|---|---|---|
| committer | Vjacheslav Trushkin <cyberalien@gmail.com> | 2013-07-11 15:40:28 -0400 |
| commit | 6eef2aebd7225a44a23dd1c226f601659bdefb09 (patch) | |
| tree | 1d2831f67986ded0e1f22f2500c3d5e815467cc4 /tests/template | |
| parent | 59f34bef087259722e1f7eaa95b96460e007cb30 (diff) | |
| download | forums-6eef2aebd7225a44a23dd1c226f601659bdefb09.tar forums-6eef2aebd7225a44a23dd1c226f601659bdefb09.tar.gz forums-6eef2aebd7225a44a23dd1c226f601659bdefb09.tar.bz2 forums-6eef2aebd7225a44a23dd1c226f601659bdefb09.tar.xz forums-6eef2aebd7225a44a23dd1c226f601659bdefb09.zip | |
[ticket/11647] Fix tests for INCLUDEJS
PHPBB-11647
Diffstat (limited to 'tests/template')
| -rw-r--r-- | tests/template/template_includejs_test.php | 18 | ||||
| -rw-r--r-- | tests/template/templates/includejs.html | 2 |
2 files changed, 10 insertions, 10 deletions
diff --git a/tests/template/template_includejs_test.php b/tests/template/template_includejs_test.php index ea5c30891b..7616b278d6 100644 --- a/tests/template/template_includejs_test.php +++ b/tests/template/template_includejs_test.php @@ -26,19 +26,19 @@ class phpbb_template_template_includejs_test extends phpbb_template_template_tes ), array( array('TEST' => 2), - '<script type="text/javascript" src="' . $this->test_path . '/templates/parent_and_child.js?assets_version=0&assets_version=1"></script>', + '<script type="text/javascript" src="' . $this->test_path . '/templates/parent_and_child.js?assets_version=0"></script>', ), array( array('TEST' => 3), - '<script type="text/javascript" src="' . $this->test_path . '/templates/parent_and_child.js?test=1&assets_version=0&assets_version=1"></script>', + '<script type="text/javascript" src="' . $this->test_path . '/templates/parent_and_child.js?test=1&assets_version=0"></script>', ), array( array('TEST' => 4), - '<script type="text/javascript" src="' . $this->test_path . '/templates/parent_and_child.js?test=1&assets_version=0&assets_version=1"></script>', + '<script type="text/javascript" src="' . $this->test_path . '/templates/parent_and_child.js?test=1&assets_version=0"></script>', ), array( array('TEST' => 5), - '<script type="text/javascript" src="' . $this->test_path . '/templates/parent_and_child.js?test=1;assets_version=0&assets_version=1"></script>', + '<script type="text/javascript" src="' . $this->test_path . '/templates/parent_and_child.js?test=1;assets_version=0"></script>', ), array( array('TEST' => 6), @@ -62,19 +62,19 @@ class phpbb_template_template_includejs_test extends phpbb_template_template_tes ), array( array('TEST' => 11), - '<script type="text/javascript" src="' . $this->test_path . '/templates/child_only.js?test1=1&test2=2&assets_version=1#test3"></script>', + '<script type="text/javascript" src="' . $this->test_path . '/templates/child_only.js?test1=1&test2=2&assets_version=1#test3"></script>', ), array( array('TEST' => 12), - '<script type="text/javascript" src="' . $this->test_path . '/parent_templates/parent_only.js?test1=1&test2=2&assets_version=1#test3"></script>', + '<script type="text/javascript" src="' . $this->test_path . '/parent_templates/parent_only.js?test1=1&test2=2&assets_version=1#test3"></script>', ), array( array('TEST' => 13), - '<script type="text/javascript" src="' . $this->test_path . '/parent_templates/parent_only.js?test1=1;test2=2&assets_version=1#test3"></script>', + '<script type="text/javascript" src="' . $this->test_path . '/parent_templates/parent_only.js?test1=1;test2=2;assets_version=1#test3"></script>', ), array( array('TEST' => 14), - '<script type="text/javascript" src="' . $this->test_path . '/parent_templates/parent_only.js?test1="&assets_version=1#test3"></script>', + '<script type="text/javascript" src="' . $this->test_path . '/parent_templates/parent_only.js?test1="&assets_version=1#test3"></script>', ), array( array('TEST' => 15), @@ -82,7 +82,7 @@ class phpbb_template_template_includejs_test extends phpbb_template_template_tes ), array( array('TEST' => 16), - '<script type="text/javascript" src="http://phpbb.com/b.js?c=d&assets_version=1#f"></script>', + '<script type="text/javascript" src="http://phpbb.com/b.js?c=d&assets_version=2#f"></script>', ), array( array('TEST' => 17), diff --git a/tests/template/templates/includejs.html b/tests/template/templates/includejs.html index 3bcad76af5..2e2c52c857 100644 --- a/tests/template/templates/includejs.html +++ b/tests/template/templates/includejs.html @@ -31,7 +31,7 @@ <!-- ELSEIF TEST === 15 --> <!-- INCLUDEJS http://phpbb.com/b.js?c=d#f --> <!-- ELSEIF TEST === 16 --> - <!-- INCLUDEJS http://phpbb.com/b.js?c=d&assets_version=1#f --> + <!-- INCLUDEJS http://phpbb.com/b.js?c=d&assets_version=2#f --> <!-- ELSEIF TEST === 17 --> <!-- INCLUDEJS //phpbb.com/b.js --> <!-- ENDIF --> |