aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--tests/log/function_add_log_test.php4
-rw-r--r--tests/log/function_view_log_test.php6
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');