From 4b2ede433e9336cf115fdd41e5c88738b03aa448 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <arty@phpbb.com>
Date: Sun, 1 Apr 2012 11:17:13 +0300
Subject: [ticket/10665] INCLUDEJS unit test

Adding INLCUDEJS test

PHPBB3-10665
---
 tests/template/template_includejs_test.php | 48 ++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100644 tests/template/template_includejs_test.php

(limited to 'tests/template/template_includejs_test.php')

diff --git a/tests/template/template_includejs_test.php b/tests/template/template_includejs_test.php
new file mode 100644
index 0000000000..e0229e978b
--- /dev/null
+++ b/tests/template/template_includejs_test.php
@@ -0,0 +1,48 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2011 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+require_once dirname(__FILE__) . '/template_test_case.php';
+
+class phpbb_template_template_includejs_test extends phpbb_template_template_test_case
+{
+	public function test_includejs_compilation()
+	{
+		// Reset the engine state
+		$this->setup_engine();
+
+		// Prepare correct result
+		$dir = dirname(__FILE__);
+		$scripts = array(
+			'<script src="' . $dir . '/templates/parent_and_child.html"></script>',
+			'<script src="' . $dir . '/parent_templates/parent_only.html"></script>',
+			'<script src="' . $dir . '/templates/child_only.html"></script>'
+		);
+
+		// Run test
+		$cache_file = $this->template->cachepath . 'includejs.html.php';
+		$this->run_template('includejs.html', array('PARENT' => 'parent_only.html'), array(), array(), implode('', $scripts), $cache_file);
+	}
+
+	protected function setup_engine(array $new_config = array())
+	{
+		global $phpbb_root_path, $phpEx, $user;
+
+		$defaults = $this->config_defaults();
+		$config = new phpbb_config(array_merge($defaults, $new_config));
+
+		$this->template_path = dirname(__FILE__) . '/templates';
+		$this->parent_template_path = dirname(__FILE__) . '/parent_templates';
+		$this->style_resource_locator = new phpbb_style_resource_locator();
+		$this->style_provider = new phpbb_style_path_provider();
+		$this->template = new phpbb_style_template($phpbb_root_path, $phpEx, $config, $user, $this->style_resource_locator, $this->style_provider);
+		$this->style = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $this->style_resource_locator, $this->style_provider, $this->template);
+		$this->style->set_custom_style('tests', array($this->template_path, $this->parent_template_path), '');
+		$this->template->set_filenames(array('body' => 'includejs.html'));
+	}
+}
-- 
cgit v1.2.1


From 2d9d8d367389c6bc0cef7852849e3d43ac682789 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <arty@phpbb.com>
Date: Sun, 1 Apr 2012 20:37:45 +0300
Subject: [ticket/10665] New test class for templates with tree

New parent template test class for tests that use styles tree

PHPBB3-10665
---
 tests/template/template_includejs_test.php | 21 ++-------------------
 1 file changed, 2 insertions(+), 19 deletions(-)

(limited to 'tests/template/template_includejs_test.php')

diff --git a/tests/template/template_includejs_test.php b/tests/template/template_includejs_test.php
index e0229e978b..fa23837553 100644
--- a/tests/template/template_includejs_test.php
+++ b/tests/template/template_includejs_test.php
@@ -7,9 +7,9 @@
 *
 */
 
-require_once dirname(__FILE__) . '/template_test_case.php';
+require_once dirname(__FILE__) . '/template_test_case_with_tree.php';
 
-class phpbb_template_template_includejs_test extends phpbb_template_template_test_case
+class phpbb_template_template_includejs_test extends phpbb_template_template_test_case_with_tree
 {
 	public function test_includejs_compilation()
 	{
@@ -28,21 +28,4 @@ class phpbb_template_template_includejs_test extends phpbb_template_template_tes
 		$cache_file = $this->template->cachepath . 'includejs.html.php';
 		$this->run_template('includejs.html', array('PARENT' => 'parent_only.html'), array(), array(), implode('', $scripts), $cache_file);
 	}
-
-	protected function setup_engine(array $new_config = array())
-	{
-		global $phpbb_root_path, $phpEx, $user;
-
-		$defaults = $this->config_defaults();
-		$config = new phpbb_config(array_merge($defaults, $new_config));
-
-		$this->template_path = dirname(__FILE__) . '/templates';
-		$this->parent_template_path = dirname(__FILE__) . '/parent_templates';
-		$this->style_resource_locator = new phpbb_style_resource_locator();
-		$this->style_provider = new phpbb_style_path_provider();
-		$this->template = new phpbb_style_template($phpbb_root_path, $phpEx, $config, $user, $this->style_resource_locator, $this->style_provider);
-		$this->style = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $this->style_resource_locator, $this->style_provider, $this->template);
-		$this->style->set_custom_style('tests', array($this->template_path, $this->parent_template_path), '');
-		$this->template->set_filenames(array('body' => 'includejs.html'));
-	}
 }
-- 
cgit v1.2.1


From 8a1d084d6d00500b3ea17a7fd3168ec4f321b31b Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Fri, 13 Apr 2012 04:03:07 +0200
Subject: [ticket/10783] Correctly add assets_version config var to includejs
 urls

PHPBB3-10783
---
 tests/template/template_includejs_test.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'tests/template/template_includejs_test.php')

diff --git a/tests/template/template_includejs_test.php b/tests/template/template_includejs_test.php
index fa23837553..632fde61d1 100644
--- a/tests/template/template_includejs_test.php
+++ b/tests/template/template_includejs_test.php
@@ -14,14 +14,14 @@ class phpbb_template_template_includejs_test extends phpbb_template_template_tes
 	public function test_includejs_compilation()
 	{
 		// Reset the engine state
-		$this->setup_engine();
+		$this->setup_engine(array('assets_version' => 1));
 
 		// Prepare correct result
 		$dir = dirname(__FILE__);
 		$scripts = array(
-			'<script src="' . $dir . '/templates/parent_and_child.html"></script>',
-			'<script src="' . $dir . '/parent_templates/parent_only.html"></script>',
-			'<script src="' . $dir . '/templates/child_only.html"></script>'
+			'<script src="' . $dir . '/templates/parent_and_child.html?assets_version=1"></script>',
+			'<script src="' . $dir . '/parent_templates/parent_only.html?assets_version=1"></script>',
+			'<script src="' . $dir . '/templates/child_only.html?assets_version=1"></script>'
 		);
 
 		// Run test
-- 
cgit v1.2.1


From 51347ebc09d18a55fa93fe86ef50a215148c935f Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Sun, 29 Apr 2012 00:30:08 +0300
Subject: [ticket/10800] Changing template paths in tests

Changing template paths in tests from absolute to relative

PHPBB3-10800
---
 tests/template/template_includejs_test.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'tests/template/template_includejs_test.php')

diff --git a/tests/template/template_includejs_test.php b/tests/template/template_includejs_test.php
index 632fde61d1..d80254072b 100644
--- a/tests/template/template_includejs_test.php
+++ b/tests/template/template_includejs_test.php
@@ -17,11 +17,10 @@ class phpbb_template_template_includejs_test extends phpbb_template_template_tes
 		$this->setup_engine(array('assets_version' => 1));
 
 		// Prepare correct result
-		$dir = dirname(__FILE__);
 		$scripts = array(
-			'<script src="' . $dir . '/templates/parent_and_child.html?assets_version=1"></script>',
-			'<script src="' . $dir . '/parent_templates/parent_only.html?assets_version=1"></script>',
-			'<script src="' . $dir . '/templates/child_only.html?assets_version=1"></script>'
+			'<script src="' . $this->test_path . '/templates/parent_and_child.html?assets_version=1"></script>',
+			'<script src="' . $this->test_path . '/parent_templates/parent_only.html?assets_version=1"></script>',
+			'<script src="' . $this->test_path . '/templates/child_only.html?assets_version=1"></script>'
 		);
 
 		// Run test
-- 
cgit v1.2.1


From 5114edcafe440df04357d789c03b390d6da48db5 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Tue, 1 May 2012 17:41:46 +0300
Subject: [ticket/10800] Changing html to js for includejs tests

Changing .html to .js files for includejs tests

PHPBB3-10800
---
 tests/template/template_includejs_test.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'tests/template/template_includejs_test.php')

diff --git a/tests/template/template_includejs_test.php b/tests/template/template_includejs_test.php
index d80254072b..a8f9a9037f 100644
--- a/tests/template/template_includejs_test.php
+++ b/tests/template/template_includejs_test.php
@@ -18,13 +18,13 @@ 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.html?assets_version=1"></script>',
-			'<script src="' . $this->test_path . '/parent_templates/parent_only.html?assets_version=1"></script>',
-			'<script src="' . $this->test_path . '/templates/child_only.html?assets_version=1"></script>'
+			'<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>'
 		);
 
 		// Run test
 		$cache_file = $this->template->cachepath . 'includejs.html.php';
-		$this->run_template('includejs.html', array('PARENT' => 'parent_only.html'), array(), array(), implode('', $scripts), $cache_file);
+		$this->run_template('includejs.html', array('PARENT' => 'parent_only.js'), array(), array(), implode('', $scripts), $cache_file);
 	}
 }
-- 
cgit v1.2.1