moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 16:36:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDL-47162 core_message: Add course id to message eventdata

Browse source
This commit is contained in:
Amanda Doughty 2016-07-20 12:40:34 +01:00 • committed by Eloy Lafuente (stronk7)
parent 577bd70d38
commit cc350fd9c8
34 changed files with 345 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

1
mod/forum/lib.php
View file

@ -834,6 +834,7 @@ function forum_cron() {
mtrace('Sending ', '');
$eventdata = new \core\message\message();
$eventdata->courseid = $course->id;
$eventdata->component = 'mod_forum';
$eventdata->name = 'posts';
$eventdata->userfrom = $userfrom;

36
mod/forum/tests/mail_test.php
View file

@ -252,6 +252,42 @@ class mod_forum_mail_testcase extends advanced_testcase {
return $messages;
}
public function test_cron_message_includes_courseid() {
$this->resetAfterTest(true);
// Create a course, with a forum.
$course = $this->getDataGenerator()->create_course();
$options = array('course' => $course->id, 'forcesubscribe' => FORUM_FORCESUBSCRIBE);
$forum = $this->getDataGenerator()->create_module('forum', $options);
// Create two users enrolled in the course as students.
list($author, $recipient) = $this->helper_create_users($course, 2);
// Post a discussion to the forum.
list($discussion, $post) = $this->helper_post_to_forum($forum, $author);
// Run cron and check that \core\event\message_sent contains the course id.
// Close the message sink so that message_send is run.
$this->helper->messagesink->close();
// Catch just the cron events. For each message sent two events are fired:
// core\event\message_sent
// core\event\message_viewed.
$this->helper->eventsink = $this->redirectEvents();
forum_cron();
// Get the events and close the sink so that remaining events can be triggered.
$events = $this->helper->eventsink->get_events();
$this->helper->eventsink->close();
// Reset the message sink for other tests.
$this->helper->messagesink = $this->redirectMessages();
$event = reset($events);
$this->assertEquals($course->id, $event->other['courseid']);
}
public function test_forced_subscription() {
$this->resetAfterTest(true);