From c6c064a1360cf6ef488adbe516cea5c4d7138f0c Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Tue, 2 Jul 2013 11:21:31 -0500
Subject: [PATCH] [feature/twig] Fix includejs test

PHPBB3-11598
---
 tests/template/template_includejs_test.php | 12 ++++++------
 tests/template/templates/includejs.html    |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/tests/template/template_includejs_test.php b/tests/template/template_includejs_test.php
index c0169bd385..67381b1fd4 100644
--- a/tests/template/template_includejs_test.php
+++ b/tests/template/template_includejs_test.php
@@ -18,12 +18,12 @@ class phpbb_template_template_includejs_test extends phpbb_template_template_tes
 
 		// Prepare correct result
 		$scripts = array(
-			'<script type="text/javascript" src="parent_and_child.js?assets_version=1"></script>',
-			'<script type="text/javascript" src="parent_only.js?assets_version=1"></script>',
-			'<script type="text/javascript" src="child_only.js?assets_version=1"></script>',
-			'<script type="text/javascript" src="subdir/parent_only.js?assets_version=1"></script>',
-			'<script type="text/javascript" src="subdir/subsubdir/parent_only.js?assets_version=1"></script>',
-			'<script type="text/javascript" src="subdir/parent_only.js?assets_version=1"></script>',
+			'<script type="text/javascript" src="tests/template/templates/parent_and_child.js?assets_version=1"></script>',
+			'<script type="text/javascript" src="tests/template/parent_templates/parent_only.js?assets_version=1"></script>',
+			'<script type="text/javascript" src="tests/template/templates/child_only.js?assets_version=1"></script>',
+			'<script type="text/javascript" src="tests/template/templates/subdir/parent_only.js?assets_version=1"></script>',
+			'<script type="text/javascript" src="tests/template/templates/subdir/subsubdir/parent_only.js?assets_version=1"></script>',
+			'<script type="text/javascript" src="tests/template/templates/subdir/parent_only.js?assets_version=1"></script>',
 		);
 
 		// Run test
diff --git a/tests/template/templates/includejs.html b/tests/template/templates/includejs.html
index ef73700eeb..229f1ccc19 100644
--- a/tests/template/templates/includejs.html
+++ b/tests/template/templates/includejs.html
@@ -5,4 +5,4 @@
 <!-- INCLUDEJS subdir/{PARENT} -->
 <!-- INCLUDEJS {SUBDIR}/subsubdir/{PARENT} -->
 <!-- INCLUDEJS {SUBDIR}/parent_only.{EXT} -->
-{SCRIPTS}
+{$SCRIPTS}