From 8d8979eda76cba8e98e6428542db9aaf00edf2d8 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Wed, 10 Jul 2013 13:23:36 -0500
Subject: [PATCH] [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
---
 tests/template/template_includejs_test.php | 105 ++++++++++++++++-----
 tests/template/templates/includejs.html    |  57 ++++++-----
 2 files changed, 118 insertions(+), 44 deletions(-)

diff --git a/tests/template/template_includejs_test.php b/tests/template/template_includejs_test.php
index 0061163eeb..b644c8b6f0 100644
--- a/tests/template/template_includejs_test.php
+++ b/tests/template/template_includejs_test.php
@@ -11,34 +11,93 @@ require_once dirname(__FILE__) . '/template_test_case_with_tree.php';
 
 class phpbb_template_template_includejs_test extends phpbb_template_template_test_case_with_tree
 {
-	public function test_includejs_compilation()
+	public function template_data()
+	{
+		return array(
+			/*
+			array(
+				// vars
+				// expected
+			),
+			*/
+			array(
+				array('TEST' => 1),
+				'<script type="text/javascript" src="' . $this->test_path . '/templates/parent_and_child.js?assets_version=1"></script>',
+			),
+			array(
+				array('TEST' => 2),
+				'<script type="text/javascript" src="' . $this->test_path . '/templates/parent_and_child.js?assets_version=0&assets_version=1"></script>',
+			),
+			array(
+				array('TEST' => 3),
+			'<script type="text/javascript" src="' . $this->test_path . '/templates/parent_and_child.js?test=1&assets_version=0&assets_version=1"></script>',
+			),
+			array(
+				array('TEST' => 4),
+				'<script type="text/javascript" src="' . $this->test_path . '/templates/parent_and_child.js?test=1&amp;assets_version=0&assets_version=1"></script>',
+			),
+			array(
+				array('TEST' => 5),
+				'<script type="text/javascript" src="' . $this->test_path . '/templates/parent_and_child.js?test=1;assets_version=0&assets_version=1"></script>',
+			),
+			array(
+				array('TEST' => 6),
+				'<script type="text/javascript" src="' . $this->test_path . '/parent_templates/parent_only.js?assets_version=1"></script>',
+			),
+			array(
+				array('TEST' => 7),
+				'<script type="text/javascript" src="' . $this->test_path . '/templates/child_only.js?assets_version=1"></script>',
+			),
+			array(
+				array('TEST' => 8),
+				'<script type="text/javascript" src="' . $this->test_path . '/templates/subdir/parent_only.js?assets_version=1"></script>',
+			),
+			array(
+				array('TEST' => 9),
+				'<script type="text/javascript" src="' . $this->test_path . '/templates/subdir/subsubdir/parent_only.js?assets_version=1"></script>',
+			),
+			array(
+				array('TEST' => 10),
+				'<script type="text/javascript" src="' . $this->test_path . '/templates/subdir/parent_only.js?assets_version=1"></script>',
+			),
+			array(
+				array('TEST' => 11),
+				'<script type="text/javascript" src="' . $this->test_path . '/templates/child_only.js?test1=1&amp;test2=2&assets_version=1#test3"></script>',
+			),
+			array(
+				array('TEST' => 12),
+				'<script type="text/javascript" src="' . $this->test_path . '/parent_templates/parent_only.js?test1=1&amp;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=&quot;&assets_version=1#test3"></script>',
+			),
+			array(
+				array('TEST' => 15),
+				'<script type="text/javascript" src="http://phpbb.com/b.js?c=d&assets_version=1#f"></script>',
+			),
+			array(
+				array('TEST' => 16),
+				'<script type="text/javascript" src="http://phpbb.com/b.js?c=d&assets_version=1&assets_version=1#f"></script>',
+			),
+		);
+	}
+
+	/**
+	* @dataProvider template_data
+	*/
+	public function test_includejs_compilation($vars, $expected)
 	{
 		// Reset the engine state
 		$this->setup_engine(array('assets_version' => 1));
 
-		// Prepare correct result
-		$scripts = array(
-			'<script src="' . $this->test_path . '/templates/parent_and_child.js?assets_version=1"></script>',
-			'<script src="' . $this->test_path . '/templates/parent_and_child.js?assets_version=0"></script>',
-			'<script src="' . $this->test_path . '/templates/parent_and_child.js?test=1&assets_version=0"></script>',
-			'<script src="' . $this->test_path . '/templates/parent_and_child.js?test=1&amp;assets_version=0"></script>',
-			'<script src="' . $this->test_path . '/templates/parent_and_child.js?test=1;assets_version=0"></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 src="' . $this->test_path . '/templates/child_only.js?test1=1&amp;test2=2&amp;assets_version=1#test3"></script>',
-			'<script src="' . $this->test_path . '/parent_templates/parent_only.js?test1=1&amp;test2=2&amp;assets_version=1#test3"></script>',
-			'<script src="' . $this->test_path . '/parent_templates/parent_only.js?test1=1;test2=2;assets_version=1#test3"></script>',
-			'<script src="' . $this->test_path . '/parent_templates/parent_only.js?test1=&quot;&amp;assets_version=1#test3"></script>',
-			'<script src="//phpbb.com/b.js"></script>',
-			'<script src="http://phpbb.com/b.js?c=d#f"></script>',
-			'<script src="http://phpbb.com/b.js?c=d&assets_version=1#f"></script>',
-			'<script src="//[1234:d123:a105::123]/test.js"></script>',
-		);
+		$this->template->assign_vars($vars);
 
 		// Run test
-		$this->run_template('includejs.html', array('PARENT' => 'parent_only.js', 'SUBDIR' => 'subdir', 'EXT' => 'js'), array(), array(), implode('', $scripts));
+		$this->run_template('includejs.html', array_merge(array('PARENT' => 'parent_only.js', 'SUBDIR' => 'subdir', 'EXT' => 'js'), $vars), array(), array(), $expected);
 	}
 }
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}