mirror of
https://github.com/phpbb/phpbb.git
synced 2025-08-10 02:36:38 +02:00
Merge remote-tracking branch 'github-bantu/ticket/10973' into develop
* 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:
@@ -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('öäü', 'öäü'),
|
||||
|
Reference in New Issue
Block a user