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