aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-06-20 16:02:24 +0200
committerJoas Schilling <nickvergessen@gmx.de>2014-06-20 16:02:24 +0200
commit06bb40d2ca8b1f90f175d1a0f46ab32109192f73 (patch)
treeb2c3c71a0befdd1868689a3c632d5a93f516c252
parent94bdc1210e11cf71579e0a725089be59ab01522c (diff)
parenta5ca7479b24a1e7ba954f13c80f26d466b80237e (diff)
downloadforums-06bb40d2ca8b1f90f175d1a0f46ab32109192f73.tar
forums-06bb40d2ca8b1f90f175d1a0f46ab32109192f73.tar.gz
forums-06bb40d2ca8b1f90f175d1a0f46ab32109192f73.tar.bz2
forums-06bb40d2ca8b1f90f175d1a0f46ab32109192f73.tar.xz
forums-06bb40d2ca8b1f90f175d1a0f46ab32109192f73.zip
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus: [ticket/12746] Init phpbb_dispatcher being used by delete_post()
-rw-r--r--tests/content_visibility/delete_post_test.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/content_visibility/delete_post_test.php b/tests/content_visibility/delete_post_test.php
index e0a2a3d402..99068729df 100644
--- a/tests/content_visibility/delete_post_test.php
+++ b/tests/content_visibility/delete_post_test.php
@@ -266,7 +266,7 @@ class phpbb_content_visibility_delete_post_test extends phpbb_database_test_case
*/
public function test_delete_post($forum_id, $topic_id, $post_id, $data, $is_soft, $reason, $expected_posts, $expected_topic, $expected_forum)
{
- global $auth, $cache, $config, $db, $phpbb_container, $phpbb_root_path, $phpEx;
+ global $auth, $cache, $config, $db, $phpbb_container, $phpbb_dispatcher, $phpbb_root_path, $phpEx;
$config['search_type'] = 'phpbb_mock_search';
$cache = new phpbb_mock_cache;
@@ -283,6 +283,8 @@ class phpbb_content_visibility_delete_post_test extends phpbb_database_test_case
)));
$user = $this->getMock('\phpbb\user');
+ $phpbb_dispatcher = new phpbb_mock_event_dispatcher();
+
$phpbb_container = new phpbb_mock_container_builder();
$phpbb_container->set('notification_manager', new phpbb_mock_notification_manager());
$phpbb_container->set('content.visibility', new \phpbb\content_visibility($auth, $db, $user, $phpbb_root_path, $phpEx, FORUMS_TABLE, POSTS_TABLE, TOPICS_TABLE, USERS_TABLE));