diff --git a/tests/notification/fixtures/submit_post_notification.xml b/tests/notification/fixtures/submit_post_notification.xml
index c082402056..5c59edf073 100644
--- a/tests/notification/fixtures/submit_post_notification.xml
+++ b/tests/notification/fixtures/submit_post_notification.xml
@@ -33,6 +33,13 @@
1
+
+ quote
+ 5
+ 1
+ 1
+
+
post
8
@@ -73,6 +80,62 @@
0
+
+ user_id
+ username_clean
+ user_permissions
+ user_sig
+ user_occ
+ user_interests
+
+ 2
+ poster
+
+
+
+
+
+
+ 3
+ test
+
+
+
+
+
+
+ 4
+ unauthorized
+
+
+
+
+
+
+ 5
+ notified
+
+
+
+
+
+
+ 6
+ disabled
+
+
+
+
+
+
+ 7
+ default
+
+
+
+
+
+
item_type
item_id
@@ -86,6 +149,13 @@
1
+
+ quote
+ 0
+ 2
+
+ 1
+
post
0
@@ -93,6 +163,13 @@
1
+
+ quote
+ 0
+ 3
+
+ 1
+
post
0
@@ -100,6 +177,13 @@
1
+
+ quote
+ 0
+ 4
+
+ 1
+
post
0
@@ -107,6 +191,13 @@
1
+
+ quote
+ 0
+ 5
+
+ 1
+
post
0
@@ -114,6 +205,13 @@
1
+
+ quote
+ 0
+ 6
+
+ 0
+
post
0
diff --git a/tests/notification/submit_post_notifications_test.php b/tests/notification/submit_post_type_post_test.php
similarity index 98%
rename from tests/notification/submit_post_notifications_test.php
rename to tests/notification/submit_post_type_post_test.php
index 6b61624481..b1e4b86b15 100644
--- a/tests/notification/submit_post_notifications_test.php
+++ b/tests/notification/submit_post_type_post_test.php
@@ -12,7 +12,7 @@ require_once dirname(__FILE__) . '/../../phpBB/includes/functions_content.php';
require_once dirname(__FILE__) . '/../../phpBB/includes/functions_posting.php';
require_once dirname(__FILE__) . '/../../phpBB/includes/utf/utf_tools.php';
-class phpbb_notification_submit_post_notifications_test extends phpbb_database_test_case
+class phpbb_notification_submit_post_type_post_test extends phpbb_database_test_case
{
protected $notifications, $db, $container, $user, $config, $auth, $cache;
diff --git a/tests/notification/submit_post_type_quote_test.php b/tests/notification/submit_post_type_quote_test.php
new file mode 100644
index 0000000000..82f4eaf189
--- /dev/null
+++ b/tests/notification/submit_post_type_quote_test.php
@@ -0,0 +1,180 @@
+createXMLDataSet(dirname(__FILE__) . '/fixtures/submit_post_notification.xml');
+ }
+
+ public function setUp()
+ {
+ parent::setUp();
+
+ global $auth, $cache, $config, $db, $phpbb_container, $phpbb_dispatcher, $user, $request, $phpEx, $phpbb_root_path;
+
+ // Database
+ $this->db = $this->new_dbal();
+ $db = $this->db;
+
+ // Cache
+ $cache = new phpbb_mock_cache();
+
+ // Auth
+ $auth = $this->getMock('phpbb_auth');
+ $auth->expects($this->any())
+ ->method('acl_get')
+ ->with($this->stringContains('_'),
+ $this->anything())
+ ->will($this->returnValueMap(array(
+ array('f_noapprove', 1, true),
+ array('f_postcount', 1, true),
+ array('m_edit', 1, false),
+ )));
+
+ $auth->expects($this->any())
+ ->method('acl_get_list')
+ ->with($this->anything(),
+ $this->stringContains('_'),
+ $this->greaterThan(0))
+ ->will($this->returnValueMap(array(
+ array(
+ array('3', '4', '5', '6', '7'),
+ 'f_read',
+ 1,
+ array(
+ 1 => array(
+ 'f_read' => array(3, 5, 6, 7),
+ ),
+ ),
+ ),
+ )));
+
+ // Config
+ $config = new phpbb_config(array('num_topics' => 1,'num_posts' => 1,));
+ set_config(null, null, null, $config);
+ set_config_count(null, null, null, $config);
+
+ // Event dispatcher
+ $phpbb_dispatcher = new phpbb_mock_event_dispatcher();
+
+ // User
+ $user = $this->getMock('phpbb_user');
+ $user->ip = '';
+ $user->data = array(
+ 'user_id' => 2,
+ 'username' => 'user-name',
+ 'is_registered' => true,
+ 'user_colour' => '',
+ );
+
+ // Request
+ $type_cast_helper = $this->getMock('phpbb_request_type_cast_helper_interface');
+ $request = $this->getMock('phpbb_request');
+
+ // Container
+ $phpbb_container = new phpbb_mock_container_builder();
+
+ $user_loader = new phpbb_user_loader($db, $phpbb_root_path, '.' . $phpEx, USERS_TABLE);
+
+ // Notification Manager
+ $phpbb_notifications = new phpbb_notification_manager(array(), array(),
+ $phpbb_container, $user_loader, $db, $user,
+ $phpbb_root_path, '.' . $phpEx,
+ NOTIFICATION_TYPES_TABLE, NOTIFICATIONS_TABLE, USER_NOTIFICATIONS_TABLE);
+ $phpbb_container->set('notification_manager', $phpbb_notifications);
+
+ // Notification Types
+ $notification_types = array('quote', 'bookmark', 'post');
+ foreach ($notification_types as $type)
+ {
+ $class_name = 'phpbb_notification_type_' . $type;
+ $phpbb_container->set('notification.type.' . $type, new $class_name(
+ $user_loader, $db, $cache, $user, $auth, $config,
+ $phpbb_root_path, '.' . $phpEx,
+ NOTIFICATION_TYPES_TABLE, NOTIFICATIONS_TABLE, USER_NOTIFICATIONS_TABLE));
+ }
+ }
+
+ /**
+ * submit_post() Notifications test
+ *
+ * submit_post() $mode = 'reply'
+ * Notification item_type = 'quote'
+ *
+ * User => State description
+ * 2 => Poster, should NOT receive a notification
+ * 3 => Quoted, should receive a notification
+ * 4 => Quoted, but unauthed to read, should NOT receive a notification
+ * 5 => Quoted, but already notified, should NOT receive a new notification
+ * 6 => Quoted, but option disabled, should NOT receive a notification
+ * 7 => Quoted, option set to default, should receive a notification
+ */
+ public function test_type_quote()
+ {
+ $sql = 'SELECT user_id, item_id, item_parent_id
+ FROM ' . NOTIFICATIONS_TABLE . "
+ WHERE item_type = 'quote'
+ ORDER BY user_id, item_id ASC";
+ $result = $this->db->sql_query($sql);
+ $this->assertEquals(array(
+ array('user_id' => 5, 'item_id' => 1, 'item_parent_id' => 1),
+ ), $this->db->sql_fetchrowset($result));
+ $this->db->sql_freeresult($result);
+
+ $poll = array();
+ $data = array(
+ 'forum_id' => 1,
+ 'topic_id' => 1,
+ 'topic_title' => 'topic_title',
+ 'icon_id' => 0,
+ 'enable_bbcode' => 0,
+ 'enable_smilies' => 0,
+ 'enable_urls' => 0,
+ 'enable_sig' => 0,
+ 'message' => implode(' ', array(
+ '[quote="poster":uid]poster should not be notified[/quote:uid]',
+ '[quote="test":uid]test should be notified[/quote:uid]',
+ '[quote="unauthorized":uid]unauthorized to read, should not receive a notification[/quote:uid]',
+ '[quote="notified":uid]already notified, should not receive a new notification[/quote:uid]',
+ '[quote="disabled":uid]option disabled, should not receive a notification[/quote:uid]',
+ '[quote="default":uid]option set to default, should receive a notification[/quote:uid]',
+ '[quote="doesn\'t exist":uid]user does not exist, should not receive a notification[/quote:uid]',
+ )),
+ 'message_md5' => '',
+ 'attachment_data' => array(),
+ 'bbcode_bitfield' => '',
+ 'bbcode_uid' => 'uid',
+ 'post_edit_locked' => false,
+ //'force_approved_state' => 1,
+ );
+
+ submit_post('reply', '', 'poster-name', POST_NORMAL, $poll, $data, false, false);
+
+ $sql = 'SELECT user_id, item_id, item_parent_id
+ FROM ' . NOTIFICATIONS_TABLE . "
+ WHERE item_type = 'quote'
+ ORDER BY user_id ASC, item_id ASC";
+ $result = $this->db->sql_query($sql);
+ $this->assertEquals(array(
+ array('user_id' => 3, 'item_id' => 1, 'item_parent_id' => 1),
+ array('user_id' => 5, 'item_id' => 1, 'item_parent_id' => 1),
+ array('user_id' => 7, 'item_id' => 1, 'item_parent_id' => 1),
+ ), $this->db->sql_fetchrowset($result));
+ $this->db->sql_freeresult($result);
+ }
+}