diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2012-12-07 16:05:57 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2012-12-07 16:05:57 +0100 |
| commit | 0f94ff91383ee0ed533048db96a34164ba94b0a4 (patch) | |
| tree | 958843c667c4d6d60817ef42d0aa72f80e52bc98 | |
| parent | 37530abd394ebc22480a133ffd1ca41276d73b43 (diff) | |
| download | forums-0f94ff91383ee0ed533048db96a34164ba94b0a4.tar forums-0f94ff91383ee0ed533048db96a34164ba94b0a4.tar.gz forums-0f94ff91383ee0ed533048db96a34164ba94b0a4.tar.bz2 forums-0f94ff91383ee0ed533048db96a34164ba94b0a4.tar.xz forums-0f94ff91383ee0ed533048db96a34164ba94b0a4.zip | |
[ticket/10714] Add global variables for the unit tests
PHPBB3-10714
| -rw-r--r-- | tests/log/function_add_log_test.php | 4 | ||||
| -rw-r--r-- | tests/log/function_view_log_test.php | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/tests/log/function_add_log_test.php b/tests/log/function_add_log_test.php index 77c4578baa..7ed862c523 100644 --- a/tests/log/function_add_log_test.php +++ b/tests/log/function_add_log_test.php @@ -142,7 +142,7 @@ class phpbb_log_function_add_log_test extends phpbb_database_test_case */ public function test_add_log_function($expected, $user_id, $mode, $required1, $additional1 = null, $additional2 = null, $additional3 = null) { - global $db, $user, $phpbb_dispatcher; + global $db, $cache, $user, $phpbb_log, $phpbb_dispatcher; if ($expected) { @@ -155,7 +155,9 @@ class phpbb_log_function_add_log_test extends phpbb_database_test_case } $db = $this->new_dbal(); + $cache = new phpbb_mock_cache; $phpbb_dispatcher = new phpbb_mock_event_dispatcher(); + $phpbb_log = new phpbb_log(LOG_TABLE); $user->ip = 'user_ip'; if ($user_id) diff --git a/tests/log/function_view_log_test.php b/tests/log/function_view_log_test.php index 790597e9c8..f7e2c51c32 100644 --- a/tests/log/function_view_log_test.php +++ b/tests/log/function_view_log_test.php @@ -24,7 +24,8 @@ class phpbb_log_function_view_log_test extends phpbb_database_test_case public static function test_view_log_function_data() { - global $phpEx; + global $phpEx, $phpbb_dispatcher; + $phpbb_dispatcher = new phpbb_mock_event_dispatcher(); $expected_data_sets = array( 1 => array( @@ -299,11 +300,12 @@ class phpbb_log_function_view_log_test extends phpbb_database_test_case */ public function test_view_log_function($expected, $expected_returned, $mode, $log_count, $limit = 5, $offset = 0, $forum_id = 0, $topic_id = 0, $user_id = 0, $limit_days = 0, $sort_by = 'l.log_id ASC', $keywords = '') { - global $cache, $db, $user, $auth, $phpbb_dispatcher; + global $cache, $db, $user, $auth, $phpbb_log, $phpbb_dispatcher; $db = $this->new_dbal(); $cache = new phpbb_mock_cache; $phpbb_dispatcher = new phpbb_mock_event_dispatcher(); + $phpbb_log = new phpbb_log(LOGS_TABLE); // Create auth mock $auth = $this->getMock('phpbb_auth'); |