diff options
| author | Nils Adermann <naderman@naderman.de> | 2012-07-08 23:03:58 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2012-07-08 23:03:58 +0200 |
| commit | 088dbc0b54ab4798e2ec4c0466189f3d7e8256ed (patch) | |
| tree | 54a21a3157c2d503705422d07f60dff4953e97f3 | |
| parent | a7da3760048be7aff726fa2c652165e3b4807f13 (diff) | |
| parent | cde5411e8aad0436ca709a46e109cd38e4c21a9e (diff) | |
| download | forums-088dbc0b54ab4798e2ec4c0466189f3d7e8256ed.tar forums-088dbc0b54ab4798e2ec4c0466189f3d7e8256ed.tar.gz forums-088dbc0b54ab4798e2ec4c0466189f3d7e8256ed.tar.bz2 forums-088dbc0b54ab4798e2ec4c0466189f3d7e8256ed.tar.xz forums-088dbc0b54ab4798e2ec4c0466189f3d7e8256ed.zip | |
Merge remote-tracking branch 'github-bantu/ticket/10974' into develop-olympus
* github-bantu/ticket/10974:
[ticket/10974] Rename tests/mock_user.php -> tests/mock/user.php
| -rw-r--r-- | tests/bbcode/url_bbcode_test.php | 2 | ||||
| -rw-r--r-- | tests/mock/user.php (renamed from tests/mock_user.php) | 0 | ||||
| -rw-r--r-- | tests/text_processing/censor_text_test.php | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/tests/bbcode/url_bbcode_test.php b/tests/bbcode/url_bbcode_test.php index 15bdfc434f..6b5afe5808 100644 --- a/tests/bbcode/url_bbcode_test.php +++ b/tests/bbcode/url_bbcode_test.php @@ -11,7 +11,7 @@ require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php'; require_once dirname(__FILE__) . '/../../phpBB/includes/functions_content.php'; require_once dirname(__FILE__) . '/../../phpBB/includes/bbcode.php'; require_once dirname(__FILE__) . '/../../phpBB/includes/message_parser.php'; -require_once dirname(__FILE__) . '/../mock_user.php'; +require_once dirname(__FILE__) . '/../mock/user.php'; class phpbb_url_bbcode_test extends phpbb_test_case { diff --git a/tests/mock_user.php b/tests/mock/user.php index ec14ce430e..ec14ce430e 100644 --- a/tests/mock_user.php +++ b/tests/mock/user.php diff --git a/tests/text_processing/censor_text_test.php b/tests/text_processing/censor_text_test.php index 8fcdb7ef85..f0e13638a5 100644 --- a/tests/text_processing/censor_text_test.php +++ b/tests/text_processing/censor_text_test.php @@ -9,7 +9,7 @@ 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/user.php'; require_once dirname(__FILE__) . '/../mock/cache.php'; class phpbb_text_processing_censor_text_test extends phpbb_test_case |