Julian/phpbb_board3-portal_tlw
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '2.1.x'

Browse Source 
Conflicts:
	tests/unit/event/listener_test.php
This commit is contained in:
Marc Alexander
2015-06-24 16:06:50 +02:00
parent cba13d7a7d 281aa4fcc7
commit 0761948012
23 changed files with 830 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tests/unit/functions/check_file_src_test.php
View File

@@ -7,7 +7,6 @@
*
*/
require_once(dirname(__FILE__) . '/../../../includes/functions.php');
require_once(dirname(__FILE__) . '/../../../../../../includes/functions_acp.php');
require_once(dirname(__FILE__) . '/../../../../../../includes/functions.php');

1
tests/unit/functions/fetch_news_test.php
View File

@@ -7,7 +7,6 @@
*
*/
require_once(dirname(__FILE__) . '/../../../includes/functions.php');
require_once(dirname(__FILE__) . '/../../../../../../includes/functions_acp.php');
require_once(dirname(__FILE__) . '/../../../../../../includes/functions.php');
require_once(dirname(__FILE__) . '/../../../../../../includes/utf/utf_tools.php');

18
tests/unit/functions/functions_test.php
View File

@@ -7,7 +7,6 @@
*
*/
require_once(dirname(__FILE__) . '/../../../includes/functions.php');
require_once(dirname(__FILE__) . '/../../../../../../includes/utf/utf_tools.php');
require_once(dirname(__FILE__) . '/../../../../../../includes/functions_content.php');
@@ -34,23 +33,6 @@ class phpbb_unit_functions_functions_test extends \board3\portal\tests\testframe
->will($this->returnValue(array('match' => array('/disallowed_word/'), 'replace' => array(''))));
}
public function data_sql_table_exists()
{
return array(
array(true, 'phpbb_config'),
array(true, 'phpbb_styles'),
array(false, 'phpbb_foobar'),
);
}
/**
* @dataProvider data_sql_table_exists
*/
public function test_sql_table_exists($expected, $table)
{
$this->assertEquals($expected, sql_table_exists($table));
}
public function data_character_limit()
{
return array(

2
tests/unit/functions/get_user_groups_test.php
View File

@@ -7,8 +7,6 @@
*
*/
require_once(dirname(__FILE__) . '/../../../includes/functions.php');
class phpbb_unit_functions_get_user_groups_test extends \board3\portal\tests\testframework\database_test_case
{
public function getDataSet()

2
tests/unit/functions/simple_test.php
View File

@@ -7,8 +7,6 @@
*
*/
require_once(dirname(__FILE__) . '/../../../includes/functions.php');
class phpbb_functions_simple_test extends PHPUnit_Framework_TestCase
{
public function test_ap_validate()