From 8bda356dabae89b8dff62796a6bf6e9b57cd85c1 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Mon, 24 Jun 2013 22:40:17 -0500
Subject: [PATCH] [feature/twig] Correct includejs test

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

diff --git a/tests/template/template_includejs_test.php b/tests/template/template_includejs_test.php
index 22b020208b..c0169bd385 100644
--- a/tests/template/template_includejs_test.php
+++ b/tests/template/template_includejs_test.php
@@ -18,16 +18,15 @@ class phpbb_template_template_includejs_test extends phpbb_template_template_tes
 
 		// Prepare correct result
 		$scripts = array(
-			'<script src="' . $this->test_path . '/templates/parent_and_child.js?assets_version=1"></script>',
-			'<script src="' . $this->test_path . '/parent_templates/parent_only.js?assets_version=1"></script>',
-			'<script src="' . $this->test_path . '/templates/child_only.js?assets_version=1"></script>',
-			'<script src="' . $this->test_path . '/templates/subdir/parent_only.js?assets_version=1"></script>',
-			'<script src="' . $this->test_path . '/templates/subdir/subsubdir/parent_only.js?assets_version=1"></script>',
-			'<script src="' . $this->test_path . '/templates/subdir/parent_only.js?assets_version=1"></script>',
+			'<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>',
 		);
 
 		// Run test
-		$cache_file = $this->template->cachepath . 'includejs.html.php';
-		$this->run_template('includejs.html', array('PARENT' => 'parent_only.js', 'SUBDIR' => 'subdir', 'EXT' => 'js'), array(), array(), implode('', $scripts), $cache_file);
+		$this->run_template('includejs.html', array('PARENT' => 'parent_only.js', 'SUBDIR' => 'subdir', 'EXT' => 'js'), array(), array(), implode('', $scripts));
 	}
 }
diff --git a/tests/template/templates/includejs.html b/tests/template/templates/includejs.html
index ef73700eeb..eca6e90637 100644
--- a/tests/template/templates/includejs.html
+++ b/tests/template/templates/includejs.html
@@ -1,8 +1,8 @@
-<!-- INCLUDEJS parent_and_child.js -->
-<!-- INCLUDEJS {PARENT} -->
+<!-- INCLUDEJS 'parent_and_child.js' -->
+<!-- INCLUDEJS PARENT -->
 <!-- DEFINE $TEST = 'child_only.js' -->
-<!-- INCLUDEJS {$TEST} -->
-<!-- INCLUDEJS subdir/{PARENT} -->
-<!-- INCLUDEJS {SUBDIR}/subsubdir/{PARENT} -->
-<!-- INCLUDEJS {SUBDIR}/parent_only.{EXT} -->
+<!-- INCLUDEJS TEST -->
+<!-- INCLUDEJS 'subdir/' ~ PARENT -->
+<!-- INCLUDEJS SUBDIR ~ '/subsubdir/' ~ PARENT -->
+<!-- INCLUDEJS SUBDIR ~ '/parent_only.' ~ EXT -->
 {SCRIPTS}