aboutsummaryrefslogtreecommitdiffstats
path: root/tests/template
diff options
context:
space:
mode:
authorVjacheslav Trushkin <arty@phpbb.com>2012-04-01 19:20:42 +0300
committerVjacheslav Trushkin <arty@phpbb.com>2012-04-01 19:20:42 +0300
commiteaba2ed9ca6025358de0432bb569cfb2e3ca6985 (patch)
tree5633cf801ce16bbf8e527f8915206daed3a920be /tests/template
parentf5bac7686b1678dbd33eddd368d845237bb18943 (diff)
downloadforums-eaba2ed9ca6025358de0432bb569cfb2e3ca6985.tar
forums-eaba2ed9ca6025358de0432bb569cfb2e3ca6985.tar.gz
forums-eaba2ed9ca6025358de0432bb569cfb2e3ca6985.tar.bz2
forums-eaba2ed9ca6025358de0432bb569cfb2e3ca6985.tar.xz
forums-eaba2ed9ca6025358de0432bb569cfb2e3ca6985.zip
[ticket/10733] Fixing test
Changing expected and result in locator test PHPBB3-10733
Diffstat (limited to 'tests/template')
-rw-r--r--tests/template/template_locate_test.php14
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/template/template_locate_test.php b/tests/template/template_locate_test.php
index 8edbd6a008..89a4ae6fb1 100644
--- a/tests/template/template_locate_test.php
+++ b/tests/template/template_locate_test.php
@@ -17,38 +17,38 @@ class phpbb_template_template_locate_test extends phpbb_template_template_test_c
// First element of the array is test name - keep them distinct
array(
'simple inheritance - only parent template exists',
+ dirname(__FILE__) . '/parent_templates/parent_only.html',
'parent_only.html',
false,
true,
- dirname(__FILE__) . '/parent_templates/parent_only.html',
),
array(
'simple inheritance - only child template exists',
+ dirname(__FILE__) . '/templates/child_only.html',
'child_only.html',
false,
true,
- dirname(__FILE__) . '/templates/child_only.html',
),
array(
'simple inheritance - both parent and child templates exist',
+ dirname(__FILE__) . '/templates/parent_and_child.html',
'parent_and_child.html',
false,
true,
- dirname(__FILE__) . '/templates/parent_and_child.html',
),
array(
'find first template - only child template exists in main style',
+ 'child_only.html',
array('parent_only.html', 'child_only.html'),
false,
false,
- 'child_only.html',
),
array(
'find first template - both templates exist in main style',
+ 'parent_and_child.html',
array('parent_and_child.html', 'child_only.html'),
false,
false,
- 'parent_and_child.html',
),
);
}
@@ -56,14 +56,14 @@ class phpbb_template_template_locate_test extends phpbb_template_template_test_c
/**
* @dataProvider template_data
*/
- public function test_template($name, $files, $return_default, $return_full_path, $expected)
+ public function test_template($name, $expected, $files, $return_default, $return_full_path)
{
// Reset the engine state
$this->setup_engine();
// Locate template
$result = $this->template->locate($files, $return_default, $return_full_path);
- $this->assertEquals($result, $expected);
+ $this->assertSame($expected, $result);
}
protected function setup_engine(array $new_config = array())