aboutsummaryrefslogtreecommitdiffstats
path: root/tests/template/templates
diff options
context:
space:
mode:
authorNathaniel Guse <nathaniel.guse@gmail.com>2013-07-10 11:38:48 -0500
committerNathaniel Guse <nathaniel.guse@gmail.com>2013-07-10 11:38:48 -0500
commitf88cdce43a2af0cf3672fd3846ae87477591805d (patch)
tree98b065aa94a6b5b49e4de62c7e4284105b24c62b /tests/template/templates
parent47ec38c011f3d3d86dacdc3126fc36cdec8b1072 (diff)
parent9725eb19f8dbc124febe0189799c0b2af0215c63 (diff)
downloadforums-f88cdce43a2af0cf3672fd3846ae87477591805d.tar
forums-f88cdce43a2af0cf3672fd3846ae87477591805d.tar.gz
forums-f88cdce43a2af0cf3672fd3846ae87477591805d.tar.bz2
forums-f88cdce43a2af0cf3672fd3846ae87477591805d.tar.xz
forums-f88cdce43a2af0cf3672fd3846ae87477591805d.zip
Merge remote-tracking branch 'remotes/cyberalien/feature/twig/includejs_tests' into feature/twig
# By Vjacheslav Trushkin # Via Vjacheslav Trushkin * remotes/cyberalien/feature/twig/includejs_tests: [feature/twig] Unit tests for includejs
Diffstat (limited to 'tests/template/templates')
-rw-r--r--tests/template/templates/includejs.html15
1 files changed, 14 insertions, 1 deletions
diff --git a/tests/template/templates/includejs.html b/tests/template/templates/includejs.html
index 229f1ccc19..dd7b059f12 100644
--- a/tests/template/templates/includejs.html
+++ b/tests/template/templates/includejs.html
@@ -1,8 +1,21 @@
<!-- INCLUDEJS parent_and_child.js -->
+<!-- INCLUDEJS parent_and_child.js?assets_version=0 -->
+<!-- INCLUDEJS parent_and_child.js?test=1&assets_version=0 -->
+<!-- INCLUDEJS parent_and_child.js?test=1&amp;assets_version=0 -->
+<!-- INCLUDEJS parent_and_child.js?test=1;assets_version=0 -->
<!-- INCLUDEJS {PARENT} -->
<!-- DEFINE $TEST = 'child_only.js' -->
<!-- INCLUDEJS {$TEST} -->
<!-- INCLUDEJS subdir/{PARENT} -->
<!-- INCLUDEJS {SUBDIR}/subsubdir/{PARENT} -->
<!-- INCLUDEJS {SUBDIR}/parent_only.{EXT} -->
-{$SCRIPTS}
+<!-- DEFINE $TEST = 'child_only.js?test1=1&amp;test2=2#test3' -->
+<!-- INCLUDEJS {$TEST} -->
+<!-- INCLUDEJS parent_only.js?test1=1&amp;test2=2#test3 -->
+<!-- INCLUDEJS parent_only.js?test1=1;test2=2#test3 -->
+<!-- INCLUDEJS parent_only.js?test1=&quot;#test3 -->
+<!-- INCLUDEJS //phpbb.com/b.js -->
+<!-- INCLUDEJS http://phpbb.com/b.js?c=d#f -->
+<!-- INCLUDEJS http://phpbb.com/b.js?c=d&assets_version=1#f -->
+<!-- INCLUDEJS //[1234:d123:a105::123]/test.js -->
+{SCRIPTS}