Merge branch 'develop-olympus' into develop

* develop-olympus: [ticket/10974] Rename tests/mock_user.php -> tests/mock/user.php Conflicts: tests/bbcode/url_bbcode_test.php
phpbb · Jul 8, 2012 · 527f02b · 527f02b
2 parents 576cd6d + 088dbc0
commit 527f02b
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git 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_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';
 require_once dirname(__FILE__) . '/../mock/request.php';
 
 class phpbb_url_bbcode_test extends phpbb_test_case

diff --git a/tests/mock_user.php → tests/mock/user.php b/tests/mock_user.php → tests/mock/user.php
diff --git 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