mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-13 04:04:12 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop' into ticket/10665

Browse Source 
* upstream/develop:
  [ticket/10733] Fixing test
  [ticket/10733] Removing static from data providers
  [ticket/10731] Fixed addquote() to work on opera browser.
  [ticket/10731] Fixed addquote() to work on opera browser.
  [Ticket/10675] Correct language string ATTACH_DISK_FULL
  [feature/event-dispatcher] Adding composer.phar to .gitignore for olympus
  [ticket/10705] Change WARNINGS_ZERO_TOTAL in subsilver2
  [ticket/10705] Change WARNINGS_ZERO_TOTAL in prosilver
  [ticket/10705] Change WARNINGS_ZERO_TOTAL in en language
  [ticket/10675] Add disk full language string when posting attachments
This commit is contained in:
Vjacheslav Trushkin
2012-04-01 19:28:37 +03:00
parent 4b2ede433e 2b3cfa0f7b
commit b548389207
20 changed files with 51 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/template/template_inheritance_test.php
View File

@@ -14,7 +14,7 @@ class phpbb_template_template_inheritance_test extends phpbb_template_template_t
/**
* @todo put test data into templates/xyz.test
*/
public static function template_data()
public function template_data()
{
return array(
// First element of the array is test name - keep them distinct

16
tests/template/template_locate_test.php
View File

@@ -11,44 +11,44 @@ require_once dirname(__FILE__) . '/template_test_case.php';
class phpbb_template_template_locate_test extends phpbb_template_template_test_case
{
public static function template_data()
public function template_data()
{
return array(
// 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())

4
tests/template/template_test.php
View File

@@ -15,7 +15,7 @@ class phpbb_template_template_test extends phpbb_template_template_test_case
/**
* @todo put test data into templates/xyz.test
*/
public static function template_data()
public function template_data()
{
return array(
/*
@@ -394,7 +394,7 @@ class phpbb_template_template_test extends phpbb_template_template_test_case
$this->run_template('php.html', array(), array(), array(), 'test', $cache_file);
}
public static function alter_block_array_data()
public function alter_block_array_data()
{
return array(
array(