diff options
| author | Nils Adermann <naderman@naderman.de> | 2012-07-08 23:12:22 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2012-07-08 23:12:22 +0200 |
| commit | 9f0259c473f2108464b63aab62298e5052c0a8a7 (patch) | |
| tree | cd61b62929cf8f57c4e5b03b8133a1d3742725e4 /tests/text_processing | |
| parent | 527f02bb4b7e023c822fa2fe648784a77d7b9cc9 (diff) | |
| parent | d3bbde69c441a5d795a16e66c9cc7a9194f42218 (diff) | |
| download | forums-9f0259c473f2108464b63aab62298e5052c0a8a7.tar forums-9f0259c473f2108464b63aab62298e5052c0a8a7.tar.gz forums-9f0259c473f2108464b63aab62298e5052c0a8a7.tar.bz2 forums-9f0259c473f2108464b63aab62298e5052c0a8a7.tar.xz forums-9f0259c473f2108464b63aab62298e5052c0a8a7.zip | |
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
Diffstat (limited to 'tests/text_processing')
| -rw-r--r-- | tests/text_processing/censor_text_test.php | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/tests/text_processing/censor_text_test.php b/tests/text_processing/censor_text_test.php index f0e13638a5..043d8eb27d 100644 --- a/tests/text_processing/censor_text_test.php +++ b/tests/text_processing/censor_text_test.php @@ -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('öäü', 'öäü'), |