diff options
| author | Vjacheslav Trushkin <cyberalien@gmail.com> | 2013-07-11 18:13:48 -0400 |
|---|---|---|
| committer | Vjacheslav Trushkin <cyberalien@gmail.com> | 2013-07-11 18:13:48 -0400 |
| commit | f5c2119e7cd0359614300be9a2bd116965a1ec7c (patch) | |
| tree | 49d6a7e2cf35d826ed0780bdcf0d3090e9651b7c /tests/template/template_includejs_test.php | |
| parent | 94fc0cccdc49962e3111e291de8800a0d2d50837 (diff) | |
| download | forums-f5c2119e7cd0359614300be9a2bd116965a1ec7c.tar forums-f5c2119e7cd0359614300be9a2bd116965a1ec7c.tar.gz forums-f5c2119e7cd0359614300be9a2bd116965a1ec7c.tar.bz2 forums-f5c2119e7cd0359614300be9a2bd116965a1ec7c.tar.xz forums-f5c2119e7cd0359614300be9a2bd116965a1ec7c.zip | |
[ticket/11647] Always use & for URLs
Remove code for URLs separated with ;
Add test case for mix of & and & in URLs
PHPBB3-11647
Diffstat (limited to 'tests/template/template_includejs_test.php')
| -rw-r--r-- | tests/template/template_includejs_test.php | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/tests/template/template_includejs_test.php b/tests/template/template_includejs_test.php index 7616b278d6..b67fa123a1 100644 --- a/tests/template/template_includejs_test.php +++ b/tests/template/template_includejs_test.php @@ -30,17 +30,13 @@ class phpbb_template_template_includejs_test extends phpbb_template_template_tes ), array( array('TEST' => 3), - '<script type="text/javascript" src="' . $this->test_path . '/templates/parent_and_child.js?test=1&assets_version=0"></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"></script>', ), array( - array('TEST' => 5), - '<script type="text/javascript" src="' . $this->test_path . '/templates/parent_and_child.js?test=1;assets_version=0"></script>', - ), - array( array('TEST' => 6), '<script type="text/javascript" src="' . $this->test_path . '/parent_templates/parent_only.js?assets_version=1"></script>', ), @@ -69,10 +65,6 @@ class phpbb_template_template_includejs_test extends phpbb_template_template_tes '<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>', - ), - array( array('TEST' => 14), '<script type="text/javascript" src="' . $this->test_path . '/parent_templates/parent_only.js?test1="&assets_version=1#test3"></script>', ), @@ -88,6 +80,10 @@ class phpbb_template_template_includejs_test extends phpbb_template_template_tes array('TEST' => 17), '<script type="text/javascript" src="//phpbb.com/b.js"></script>', ), + array( + array('TEST' => 18), + '<script type="text/javascript" src="' . $this->test_path . '/templates/parent_and_child.js?test=1&test2=0&assets_version=1"></script>', + ), ); } |