aboutsummaryrefslogtreecommitdiffstats
path: root/tests/template/templates
diff options
context:
space:
mode:
authorNathaniel Guse <nathaniel.guse@gmail.com>2013-07-10 13:23:36 -0500
committerNathaniel Guse <nathaniel.guse@gmail.com>2013-07-10 13:23:36 -0500
commit8d8979eda76cba8e98e6428542db9aaf00edf2d8 (patch)
tree5afeba37dd055a3bffbcc292e72cbe4393d4c5b3 /tests/template/templates
parentab5a79a823de50667798d4e49fc7758a3fd9f132 (diff)
downloadforums-8d8979eda76cba8e98e6428542db9aaf00edf2d8.tar
forums-8d8979eda76cba8e98e6428542db9aaf00edf2d8.tar.gz
forums-8d8979eda76cba8e98e6428542db9aaf00edf2d8.tar.bz2
forums-8d8979eda76cba8e98e6428542db9aaf00edf2d8.tar.xz
forums-8d8979eda76cba8e98e6428542db9aaf00edf2d8.zip
[ticket/11388] Fixing includejs test
Changed expected output to file?(any supplied argument string)&asset_version =($config['asset_version'])#(any supplied anchor string) Testing lines one at a time to make checking them easier. PHPBB3-11388
Diffstat (limited to 'tests/template/templates')
-rw-r--r--tests/template/templates/includejs.html57
1 files changed, 36 insertions, 21 deletions
diff --git a/tests/template/templates/includejs.html b/tests/template/templates/includejs.html
index dd7b059f12..030681337b 100644
--- a/tests/template/templates/includejs.html
+++ b/tests/template/templates/includejs.html
@@ -1,21 +1,36 @@
-<!-- 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} -->
-<!-- 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}
+<!-- IF TEST === 1 -->
+ <!-- INCLUDEJS parent_and_child.js -->
+<!-- ELSEIF TEST === 2 -->
+ <!-- INCLUDEJS parent_and_child.js?assets_version=0 -->
+<!-- ELSEIF TEST === 3 -->
+ <!-- INCLUDEJS parent_and_child.js?test=1&assets_version=0 -->
+<!-- ELSEIF TEST === 4 -->
+ <!-- INCLUDEJS parent_and_child.js?test=1&amp;assets_version=0 -->
+<!-- ELSEIF TEST === 5 -->
+ <!-- INCLUDEJS parent_and_child.js?test=1;assets_version=0 -->
+<!-- ELSEIF TEST === 6 -->
+ <!-- INCLUDEJS {PARENT} -->
+<!-- ELSEIF TEST === 7 -->
+ <!-- DEFINE $TEST = 'child_only.js' -->
+ <!-- INCLUDEJS {$TEST} -->
+<!-- ELSEIF TEST === 8 -->
+ <!-- INCLUDEJS subdir/{PARENT} -->
+<!-- ELSEIF TEST === 9 -->
+ <!-- INCLUDEJS {SUBDIR}/subsubdir/{PARENT} -->
+<!-- ELSEIF TEST === 10 -->
+ <!-- INCLUDEJS {SUBDIR}/parent_only.{EXT} -->
+<!-- ELSEIF TEST === 11 -->
+ <!-- DEFINE $TEST = 'child_only.js?test1=1&amp;test2=2#test3' -->
+ <!-- INCLUDEJS {$TEST} -->
+<!-- ELSEIF TEST === 12 -->
+ <!-- INCLUDEJS parent_only.js?test1=1&amp;test2=2#test3 -->
+<!-- ELSEIF TEST === 13 -->
+ <!-- INCLUDEJS parent_only.js?test1=1;test2=2#test3 -->
+<!-- ELSEIF TEST === 14 -->
+ <!-- INCLUDEJS parent_only.js?test1=&quot;#test3 -->
+<!-- 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 -->
+<!-- ENDIF -->
+{$SCRIPTS}