1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-04-13 12:22:03 +02:00

[ticket/16544] Fix notifications tests

PHPBB3-16544
This commit is contained in:
rxu 2020-07-01 21:12:35 +07:00
parent aa76f6b9f2
commit 02f54ef219
No known key found for this signature in database
GPG Key ID: 955F0567380E586A
8 changed files with 545 additions and 9 deletions

View File

@ -32,6 +32,7 @@ abstract class phpbb_tests_notification_base extends phpbb_database_test_case
'notification.type.bookmark',
'notification.type.disapprove_post',
'notification.type.disapprove_topic',
'notification.type.forum',
'notification.type.pm',
'notification.type.post',
'notification.type.post_in_queue',

View File

@ -56,6 +56,11 @@
<value>notification.type.post</value>
<value>1</value>
</row>
<row>
<value>2</value>
<value>notification.type.forum</value>
<value>1</value>
</row>
</table>
<table name="phpbb_posts">
<column>post_id</column>
@ -213,5 +218,54 @@
<value>notification.method.email</value>
<value>1</value>
</row>
<row>
<value>notification.type.forum</value>
<value>0</value>
<value>2</value>
<value>notification.method.email</value>
<value>1</value>
</row>
<row>
<value>notification.type.forum</value>
<value>0</value>
<value>3</value>
<value>notification.method.email</value>
<value>1</value>
</row>
<row>
<value>notification.type.forum</value>
<value>0</value>
<value>4</value>
<value>notification.method.email</value>
<value>1</value>
</row>
<row>
<value>notification.type.forum</value>
<value>0</value>
<value>5</value>
<value>notification.method.email</value>
<value>1</value>
</row>
<row>
<value>notification.type.forum</value>
<value>0</value>
<value>6</value>
<value>notification.method.email</value>
<value>1</value>
</row>
<row>
<value>notification.type.forum</value>
<value>0</value>
<value>7</value>
<value>notification.method.email</value>
<value>1</value>
</row>
<row>
<value>notification.type.forum</value>
<value>0</value>
<value>8</value>
<value>notification.method.email</value>
<value>1</value>
</row>
</table>
</dataset>

View File

@ -0,0 +1,262 @@
<?xml version="1.0" encoding="UTF-8" ?>
<dataset>
<table name="phpbb_forums_watch">
<column>forum_id</column>
<column>user_id</column>
<column>notify_status</column>
<row>
<value>1</value>
<value>2</value>
<value>0</value>
</row>
<row>
<value>1</value>
<value>3</value>
<value>0</value>
</row>
<row>
<value>1</value>
<value>4</value>
<value>0</value>
</row>
<row>
<value>1</value>
<value>5</value>
<value>0</value>
</row>
<row>
<value>1</value>
<value>6</value>
<value>0</value>
</row>
</table>
<table name="phpbb_notifications">
<column>notification_id</column>
<column>notification_type_id</column>
<column>user_id</column>
<column>item_id</column>
<column>item_parent_id</column>
<column>notification_read</column>
<column>notification_data</column>
<row>
<value>1</value>
<value>1</value>
<value>5</value>
<value>1</value>
<value>1</value>
<value>0</value>
<value></value>
</row>
<row>
<value>2</value>
<value>1</value>
<value>8</value>
<value>1</value>
<value>1</value>
<value>0</value>
<value></value>
</row>
</table>
<table name="phpbb_notification_types">
<column>notification_type_id</column>
<column>notification_type_name</column>
<column>notification_type_enabled</column>
<row>
<value>1</value>
<value>notification.type.forum</value>
<value>1</value>
</row>
<row>
<value>2</value>
<value>notification.type.post</value>
<value>1</value>
</row>
</table>
<table name="phpbb_posts">
<column>post_id</column>
<column>topic_id</column>
<column>forum_id</column>
<column>post_text</column>
<row>
<value>1</value>
<value>1</value>
<value>1</value>
<value></value>
</row>
</table>
<table name="phpbb_topics">
<column>topic_id</column>
<column>forum_id</column>
<row>
<value>1</value>
<value>1</value>
</row>
</table>
<table name="phpbb_topics_watch">
<column>topic_id</column>
<column>user_id</column>
<column>notify_status</column>
<row>
<value>1</value>
<value>6</value>
<value>0</value>
</row>
<row>
<value>1</value>
<value>7</value>
<value>0</value>
</row>
<row>
<value>1</value>
<value>8</value>
<value>0</value>
</row>
</table>
<table name="phpbb_users">
<column>user_id</column>
<column>username_clean</column>
<column>user_permissions</column>
<column>user_sig</column>
<row>
<value>2</value>
<value>poster</value>
<value></value>
<value></value>
</row>
<row>
<value>3</value>
<value>test</value>
<value></value>
<value></value>
</row>
<row>
<value>4</value>
<value>unauthorized</value>
<value></value>
<value></value>
</row>
<row>
<value>5</value>
<value>notified</value>
<value></value>
<value></value>
</row>
<row>
<value>6</value>
<value>disabled</value>
<value></value>
<value></value>
</row>
<row>
<value>7</value>
<value>default</value>
<value></value>
<value></value>
</row>
</table>
<table name="phpbb_user_notifications">
<column>item_type</column>
<column>item_id</column>
<column>user_id</column>
<column>method</column>
<column>notify</column>
<row>
<value>notification.type.post</value>
<value>0</value>
<value>2</value>
<value>notification.method.board</value>
<value>1</value>
</row>
<row>
<value>notification.type.post</value>
<value>0</value>
<value>3</value>
<value>notification.method.board</value>
<value>1</value>
</row>
<row>
<value>notification.type.post</value>
<value>0</value>
<value>4</value>
<value>notification.method.board</value>
<value>1</value>
</row>
<row>
<value>notification.type.post</value>
<value>0</value>
<value>5</value>
<value>notification.method.board</value>
<value>1</value>
</row>
<row>
<value>notification.type.post</value>
<value>0</value>
<value>6</value>
<value>notification.method.board</value>
<value>1</value>
</row>
<row>
<value>notification.type.post</value>
<value>0</value>
<value>7</value>
<value>notification.method.board</value>
<value>1</value>
</row>
<row>
<value>notification.type.post</value>
<value>0</value>
<value>8</value>
<value>notification.method.board</value>
<value>1</value>
</row>
<row>
<value>notification.type.forum</value>
<value>0</value>
<value>2</value>
<value>notification.method.board</value>
<value>1</value>
</row>
<row>
<value>notification.type.forum</value>
<value>0</value>
<value>3</value>
<value>notification.method.board</value>
<value>1</value>
</row>
<row>
<value>notification.type.forum</value>
<value>0</value>
<value>4</value>
<value>notification.method.board</value>
<value>1</value>
</row>
<row>
<value>notification.type.forum</value>
<value>0</value>
<value>5</value>
<value>notification.method.board</value>
<value>1</value>
</row>
<row>
<value>notification.type.forum</value>
<value>0</value>
<value>6</value>
<value>notification.method.board</value>
<value>1</value>
</row>
<row>
<value>notification.type.forum</value>
<value>0</value>
<value>7</value>
<value>notification.method.board</value>
<value>1</value>
</row>
<row>
<value>notification.type.forum</value>
<value>0</value>
<value>8</value>
<value>notification.method.board</value>
<value>1</value>
</row>
</table>
</dataset>

View File

@ -56,6 +56,11 @@
<value>notification.type.post</value>
<value>1</value>
</row>
<row>
<value>2</value>
<value>notification.type.forum</value>
<value>1</value>
</row>
</table>
<table name="phpbb_posts">
<column>post_id</column>
@ -204,5 +209,54 @@
<value>notification.method.board</value>
<value>1</value>
</row>
<row>
<value>notification.type.forum</value>
<value>0</value>
<value>2</value>
<value>notification.method.board</value>
<value>1</value>
</row>
<row>
<value>notification.type.forum</value>
<value>0</value>
<value>3</value>
<value>notification.method.board</value>
<value>1</value>
</row>
<row>
<value>notification.type.forum</value>
<value>0</value>
<value>4</value>
<value>notification.method.board</value>
<value>1</value>
</row>
<row>
<value>notification.type.forum</value>
<value>0</value>
<value>5</value>
<value>notification.method.board</value>
<value>1</value>
</row>
<row>
<value>notification.type.forum</value>
<value>0</value>
<value>6</value>
<value>notification.method.board</value>
<value>1</value>
</row>
<row>
<value>notification.type.forum</value>
<value>0</value>
<value>7</value>
<value>notification.method.board</value>
<value>1</value>
</row>
<row>
<value>notification.type.forum</value>
<value>0</value>
<value>8</value>
<value>notification.method.board</value>
<value>1</value>
</row>
</table>
</dataset>

View File

@ -157,7 +157,20 @@ class notification_method_email_test extends phpbb_tests_notification_base
public function data_notification_email()
{
return [
/**
* Normal post
*
* User => State description
* 2 => Topic id=1 and id=2 subscribed, should receive a new topics post notification
* 3 => Topic id=1 subscribed, should receive a new topic post notification
* 4 => Topic id=1 subscribed, should receive a new topic post notification
* 5 => Topic id=1 subscribed, post id=1 already notified, should receive a new topic post notification
* 6 => Topic id=1 and forum id=1 subscribed, should receive a new topic/forum post notification
* 7 => Forum id=1 subscribed, should NOT receive a new topic post but a forum post notification
* 8 => Forum id=1 subscribed, post id=1 already notified, should NOT receive a new topic post but a forum post notification
*/
[
'notification.type.post',
[
'forum_id' => '1',
'post_id' => '2',
@ -169,11 +182,23 @@ class notification_method_email_test extends phpbb_tests_notification_base
4 => ['user_id' => '4'],
5 => ['user_id' => '5'],
6 => ['user_id' => '6'],
],
],
[
'notification.type.forum',
[
'forum_id' => '1',
'post_id' => '3',
'topic_id' => '1',
],
[
6 => ['user_id' => '6'],
7 => ['user_id' => '7'],
8 => ['user_id' => '8']
],
],
[
'notification.type.post',
[
'forum_id' => '1',
'post_id' => '4',
@ -181,12 +206,33 @@ class notification_method_email_test extends phpbb_tests_notification_base
],
[
2 => ['user_id' => '2'],
],
],
[
'notification.type.forum',
[
'forum_id' => '1',
'post_id' => '5',
'topic_id' => '2',
],
[
6 => ['user_id' => '6'],
7 => ['user_id' => '7'],
8 => ['user_id' => '8'],
],
],
[
'notification.type.post',
[
'forum_id' => '2',
'post_id' => '6',
'topic_id' => '3',
],
[
],
],
[
'notification.type.forum',
[
'forum_id' => '2',
'post_id' => '6',
@ -201,7 +247,7 @@ class notification_method_email_test extends phpbb_tests_notification_base
/**
* @dataProvider data_notification_email
*/
public function test_notification_email($post_data, $expected_users)
public function test_notification_email($notification_type, $post_data, $expected_users)
{
$post_data = array_merge(['post_time' => 1349413322], $post_data);
$notification_options = [
@ -209,21 +255,21 @@ class notification_method_email_test extends phpbb_tests_notification_base
'item_parent_id' => $post_data['topic_id'],
];
$notified_users = $this->notification_method_email->get_notified_users($this->notifications->get_notification_type_id('notification.type.post'), $notification_options);
$notified_users = $this->notification_method_email->get_notified_users($this->notifications->get_notification_type_id($notification_type), $notification_options);
$this->assertEquals(0, count($notified_users), 'Assert no user has been notified yet');
$this->notifications->add_notifications('notification.type.post', $post_data);
$this->notifications->add_notifications($notification_type, $post_data);
$notified_users = $this->notification_method_email->get_notified_users($this->notifications->get_notification_type_id('notification.type.post'), $notification_options);
$notified_users = $this->notification_method_email->get_notified_users($this->notifications->get_notification_type_id($notification_type), $notification_options);
$this->assertEquals($expected_users, $notified_users, 'Assert that expected users have been notified');
$post_data['post_id']++;
$notification_options['item_id'] = $post_data['post_id'];
$post_data['post_time'] = 1349413323;
$this->notifications->add_notifications('notification.type.post', $post_data);
$this->notifications->add_notifications($notification_type, $post_data);
$notified_users2 = $this->notification_method_email->get_notified_users($this->notifications->get_notification_type_id('notification.type.post'), $notification_options);
$notified_users2 = $this->notification_method_email->get_notified_users($this->notifications->get_notification_type_id($notification_type), $notification_options);
$this->assertEquals($expected_users, $notified_users2, 'Assert that expected users stay the same after replying to same topic');
}
}

View File

@ -72,6 +72,7 @@ class phpbb_notification_test extends phpbb_tests_notification_base
public function test_subscriptions()
{
$expected_subscriptions = array(
'notification.type.forum' => array('notification.method.board'),
'notification.type.post' => array('notification.method.board'),
'notification.type.topic' => array('notification.method.board'),
'notification.type.quote' => array('notification.method.board'),

View File

@ -0,0 +1,109 @@
<?php
/**
*
* This file is part of the phpBB Forum Software package.
*
* @copyright (c) phpBB Limited <https://www.phpbb.com>
* @license GNU General Public License, version 2 (GPL-2.0)
*
* For full copyright and license information, please see
* the docs/CREDITS.txt file.
*
*/
require_once dirname(__FILE__) . '/submit_post_base.php';
class phpbb_notification_submit_post_type_forum_test extends phpbb_notification_submit_post_base
{
protected $item_type = 'notification.type.forum';
public function setUp(): void
{
parent::setUp();
global $auth;
// Add additional permissions
$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),
'f_read',
1,
array(
1 => array(
'f_read' => array(3, 5, 6),
),
),
),
array(
array(3, 4, 5, 6, 7, 8),
'f_read',
1,
array(
1 => array(
'f_read' => array(3, 5, 6, 7, 8),
),
),
),
)));
}
/**
* submit_post() Notifications test
*
* submit_post() $mode = 'reply'
* Notification item_type = 'notification.type.forum'
*/
public function submit_post_data()
{
return array(
/**
* Normal post
*
* User => State description
* 2 => Poster, should NOT receive a notification
* 3 => Forum subscribed, should receive a notification
* 4 => Forum subscribed, but unauthed to read, should NOT receive a notification
* 5 => Forum subscribed, but already notified, should NOT receive a new notification
* 6 => Topic and forum subscribed, should receive ONE notification
* 7 => Topic subscribed, should NOT receive a notification
* 8 => Topic subscribed, and already notified, should NOT receive a new notification
*/
array(
array(),
array(
array('user_id' => 5, 'item_id' => 1, 'item_parent_id' => 1),
array('user_id' => 8, 'item_id' => 1, 'item_parent_id' => 1),
),
array(
array('user_id' => 3, 'item_id' => 2, 'item_parent_id' => 1),
array('user_id' => 5, 'item_id' => 1, 'item_parent_id' => 1),
array('user_id' => 6, 'item_id' => 2, 'item_parent_id' => 1),
array('user_id' => 8, 'item_id' => 1, 'item_parent_id' => 1),
),
),
/**
* Unapproved post
*
* No new notifications
*/
array(
array('force_approved_state' => false),
array(
array('user_id' => 5, 'item_id' => 1, 'item_parent_id' => 1),
array('user_id' => 8, 'item_id' => 1, 'item_parent_id' => 1),
),
array(
array('user_id' => 5, 'item_id' => 1, 'item_parent_id' => 1),
array('user_id' => 8, 'item_id' => 1, 'item_parent_id' => 1),
),
),
);
}
}

View File

@ -30,6 +30,16 @@ class phpbb_notification_submit_post_type_post_test extends phpbb_notification_s
$this->stringContains('_'),
$this->greaterThan(0))
->will($this->returnValueMap(array(
array(
array(3, 4, 5, 6),
'f_read',
1,
array(
1 => array(
'f_read' => array(3, 5, 6),
),
),
),
array(
array(3, 4, 5, 6, 7, 8),
'f_read',
@ -61,8 +71,8 @@ class phpbb_notification_submit_post_type_post_test extends phpbb_notification_s
* 4 => Topic subscribed, but unauthed to read, should NOT receive a notification
* 5 => Topic subscribed, but already notified, should NOT receive a new notification
* 6 => Topic and forum subscribed, should receive ONE notification
* 7 => Forum subscribed, should receive a notification
* 8 => Forum subscribed, but already notified, should NOT receive a new notification
* 7 => Forum subscribed, should NOT receive a notification
* 8 => Forum subscribed, and already notified, should NOT receive a new notification
*/
array(
array(),
@ -74,7 +84,6 @@ class phpbb_notification_submit_post_type_post_test extends phpbb_notification_s
array('user_id' => 3, 'item_id' => 2, 'item_parent_id' => 1),
array('user_id' => 5, 'item_id' => 1, 'item_parent_id' => 1),
array('user_id' => 6, 'item_id' => 2, 'item_parent_id' => 1),
array('user_id' => 7, 'item_id' => 2, 'item_parent_id' => 1),
array('user_id' => 8, 'item_id' => 1, 'item_parent_id' => 1),
),
),