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

Merge remote-tracking branch 'github-bantu/ticket/10973' into develop

Browse Source 
* github-bantu/ticket/10973:
  [ticket/10973] Drop all require_once for mocks. Use autoloading.
  [ticket/10973] Add autoloader for autoloading phpbb_mock_ in tests.

Conflicts:
	tests/bbcode/url_bbcode_test.php
	tests/text_processing/censor_text_test.php
This commit is contained in:
Nils Adermann
2012-07-08 23:12:22 +02:00
parent 527f02bb4b d3bbde69c4
commit 9f0259c473
20 changed files with 4 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/text_processing/censor_text_test.php
View File

@@ -9,8 +9,6 @@
require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
require_once dirname(__FILE__) . '/../../phpBB/includes/functions_content.php';
require_once dirname(__FILE__) . '/../mock/user.php';
require_once dirname(__FILE__) . '/../mock/cache.php';
class phpbb_text_processing_censor_text_test extends phpbb_test_case
{
@@ -19,7 +17,7 @@ class phpbb_text_processing_censor_text_test extends phpbb_test_case
global $cache, $user;
$cache = new phpbb_mock_cache;
$user = new phpbb_mock_user;
$user->optionset('viewcensors', false);
return array(
@@ -61,7 +59,7 @@ class phpbb_text_processing_censor_text_test extends phpbb_test_case
array('badword1 badword2 badword3 badword4', 'replacement1 replacement2 replacement3 replacement4'),
array('badword1 badword2 badword3 badword4d', 'replacement1 replacement2 replacement3 badword4d'),
array('abadword1 badword2 badword3 badword4', 'replacement1 replacement2 replacement3 replacement4'),
array("new\nline\ntest", "new\nline\ntest"),
array("tab\ttest\t", "tab\ttest\t"),
array('öäü', 'öäü'),