mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-20 16:04:25 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-64017_master-fix' of https://github.com/markn86/moodle

Browse Source
This commit is contained in:
Adrian Greeve 2019-04-23 13:32:55 +08:00 committed by Eloy Lafuente (stronk7)
commit 0e483ba3a8
2 changed files with 32 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
message/output/email/classes/task/send_email_task.php
View File

@ -133,7 +133,8 @@ class send_email_task extends scheduled_task {
// isn't related to an actual group in a course. However, for
// now this will have to do before 3.7 code freeze.
// See related MDL-63814.
$sql = "SELECT mc.id, mc.name, c.id as courseid, c.fullname as coursename, g.id as groupid, g.picture, g.hidepicture
$sql = "SELECT DISTINCT mc.id, mc.name, c.id as courseid, c.fullname as coursename, g.id as groupid,
g.picture, g.hidepicture
FROM {message_conversations} mc
JOIN {groups} g
ON mc.itemid = g.id

45
message/output/email/tests/send_email_task_test.php
View File

@ -91,31 +91,46 @@ class core_message_send_email_task_testcase extends advanced_testcase {
foreach ($conversations as $conversation) {
$conversationid = $conversation->id;
$message = new \core\message\message();
$message->courseid = 1;
$message->component = 'moodle';
$message->name = 'instantmessage';
$message->userfrom = $user1;
$message->convid = $conversationid;
$message->subject = 'message subject';
$message->fullmessage = 'message body';
$message->fullmessageformat = FORMAT_MARKDOWN;
$message->fullmessagehtml = '<p>message body</p>';
$message->smallmessage = 'small message';
$message->notification = '0';
// Let's send 5 messages.
for ($i = 1; $i <= 5; $i++) {
$message = new \core\message\message();
$message->courseid = 1;
$message->component = 'moodle';
$message->name = 'instantmessage';
$message->userfrom = $user1;
$message->convid = $conversationid;
$message->subject = 'message subject';
$message->fullmessage = 'message body';
$message->fullmessageformat = FORMAT_MARKDOWN;
$message->fullmessagehtml = '<p>message body</p>';
$message->smallmessage = 'small message';
$message->notification = '0';
message_send($message);
message_send($message);
}
}
}
$this->assertEquals(2, $DB->count_records('message_email_messages'));
$this->assertEquals(10, $DB->count_records('message_email_messages'));
// Only 1 email is sent as the 2 messages are included in it at a digest.
// Only 1 email is sent as the messages are included in it at a digest.
$sink = $this->redirectEmails();
$task = new \message_email\task\send_email_task();
$task->execute();
$this->assertEquals(1, $sink->count());
// Confirm it contains the correct data.
$emails = $sink->get_messages();
$email = reset($emails);
$this->assertSame(get_string('emaildigestsubject', 'message_email'), $email->subject);
$this->assertSame($user2->email, $email->to);
$this->assertNotEmpty($email->header);
$emailbody = quoted_printable_decode($email->body);
$this->assertContains('Group 1', $emailbody);
$this->assertContains('Group 2', $emailbody);
// 5 unread messages per conversation, this will be listed twice.
$this->assertRegExp("/<span\b[^>]*>5<\/span> Unread message\w+/", $emailbody);
// Confirm table was emptied after task was run.
$this->assertEquals(0, $DB->count_records('message_email_messages'));