L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-64167 core_message: fix counts to exclude 'self' conversations

Browse Source
This commit is contained in:
Jake Dallimore
2018-11-26 08:52:55 +08:00
parent 425f5adcca
commit 7f6f45c460
3 changed files with 57 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
message/tests/api_test.php
+20 -1
View File
@@ -5706,7 +5706,7 @@ class core_message_api_testcase extends core_message_messagelib_testcase {
public function test_get_conversation_counts_test_cases() {
$typeindividual = \core_message\api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL;
$typegroup = \core_message\api::MESSAGE_CONVERSATION_TYPE_GROUP;
list($user1, $user2, $user3, $user4, $user5, $user6, $user7) = [0, 1, 2, 3, 4, 5, 6];
list($user1, $user2, $user3, $user4, $user5, $user6, $user7, $user8) = [0, 1, 2, 3, 4, 5, 6, 7];
$conversations = [
[
'type' => $typeindividual,
@@ -5736,6 +5736,13 @@ class core_message_api_testcase extends core_message_messagelib_testcase {
'favourites' => [$user6],
'enabled' => false
],
[
'type' => $typeindividual,
'users' => [$user8, $user8],
'messages' => [$user8, $user8],
'favourites' => [],
'enabled' => null // Individual conversations cannot be disabled.
],
];
return [
@@ -5926,6 +5933,17 @@ class core_message_api_testcase extends core_message_messagelib_testcase {
]],
'deletedusers' => []
],
'Conversation with self' => [
'conversationConfigs' => $conversations,
'deletemessagesuser' => null,
'deletemessages' => [],
'arguments' => [$user8],
'expected' => ['favourites' => 0, 'types' => [
\core_message\api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 0,
\core_message\api::MESSAGE_CONVERSATION_TYPE_GROUP => 0
]],
'deletedusers' => []
],
];
}
@@ -5956,6 +5974,7 @@ class core_message_api_testcase extends core_message_messagelib_testcase {
$generator->create_user(),
$generator->create_user(),
$generator->create_user(),
$generator->create_user(),
$generator->create_user()
];