moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 00:46:50 +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

21
lib/tests/message_test.php
View file

@ -48,6 +48,7 @@ class core_message_testcase extends advanced_testcase {
$user = $this->getDataGenerator()->create_user();
$message = new \core\message\message();
$message->courseid = SITEID;
$message->component = 'moodle';
$message->name = 'instantmessage';
$message->userfrom = $USER;
@ -82,6 +83,7 @@ class core_message_testcase extends advanced_testcase {
$stdclass = $message->get_eventobject_for_processor('test');
$this->assertSame($message->courseid, $stdclass->courseid);
$this->assertSame($message->component, $stdclass->component);
$this->assertSame($message->name, $stdclass->name);
$this->assertSame($message->userfrom, $stdclass->userfrom);
@ -143,6 +145,7 @@ class core_message_testcase extends advanced_testcase {
// Extra content for all types of messages.
$message = new \core\message\message();
$message->courseid = 1;
$message->component = 'moodle';
$message->name = 'instantmessage';
$message->userfrom = $user1;
@ -171,9 +174,19 @@ class core_message_testcase extends advanced_testcase {
$this->assertRegExp('/test message body test/', $email->body);
$sink->clear();
// Test that event fired includes the courseid.
$eventsink = $this->redirectEvents();
$messageid = message_send($message);
$events = $eventsink->get_events();
$event = reset($events);
$this->assertEquals($message->courseid, $event->other['courseid']);
$eventsink->clear();
$sink->clear();
// Extra content for small message only. Shouldn't show up in emails as we sent fullmessage and fullmessagehtml only in
// the emails.
$message = new \core\message\message();
$message->courseid = 1;
$message->component = 'moodle';
$message->name = 'instantmessage';
$message->userfrom = $user1;
@ -199,6 +212,14 @@ class core_message_testcase extends advanced_testcase {
$this->assertNotEmpty($email->header);
$this->assertNotEmpty($email->body);
$this->assertNotRegExp('/test message body test/', $email->body);
// Test that event fired includes the courseid.
$eventsink = $this->redirectEvents();
$messageid = message_send($message);
$events = $eventsink->get_events();
$event = reset($events);
$this->assertEquals($message->courseid, $event->other['courseid']);
$eventsink->close();
$sink->close();
}
}

60
lib/tests/messagelib_test.php
View file

@ -37,7 +37,8 @@ class core_messagelib_testcase extends advanced_testcase {
$preferences = get_message_output_default_preferences();
$this->assertTrue($preferences->$disableprovidersetting == 1);
$message = new stdClass();
$message = new \core\message\message();
$message->courseid = 1;
$message->component = 'moodle';
$message->name = 'instantmessage';
$message->userfrom = get_admin();
@ -189,7 +190,8 @@ class core_messagelib_testcase extends advanced_testcase {
$user2 = $this->getDataGenerator()->create_user();
// Test basic message redirection.
$message = new stdClass();
$message = new \core\message\message();
$message->courseid = 1;
$message->component = 'moodle';
$message->name = 'instantmessage';
$message->userfrom = $user1;
@ -225,7 +227,8 @@ class core_messagelib_testcase extends advanced_testcase {
$this->assertFalse($DB->record_exists('message', array()));
$DB->delete_records('message_read', array());
$message = new stdClass();
$message = new \core\message\message();
$message->courseid = 1;
$message->component = 'moodle';
$message->name = 'instantmessage';
$message->userfrom = $user1->id;
@ -263,7 +266,8 @@ class core_messagelib_testcase extends advanced_testcase {
// Test phpunit problem detection.
$message = new stdClass();
$message = new \core\message\message();
$message->courseid = 1;
$message->component = 'xxxxx';
$message->name = 'instantmessage';
$message->userfrom = $user1;
@ -298,7 +302,8 @@ class core_messagelib_testcase extends advanced_testcase {
// Invalid users.
$message = new stdClass();
$message = new \core\message\message();
$message->courseid = 1;
$message->component = 'moodle';
$message->name = 'instantmessage';
$message->userfrom = $user1;
@ -314,7 +319,8 @@ class core_messagelib_testcase extends advanced_testcase {
$this->assertFalse($messageid);
$this->assertDebuggingCalled('Attempt to send msg to unknown user');
$message = new stdClass();
$message = new \core\message\message();
$message->courseid = 1;
$message->component = 'moodle';
$message->name = 'instantmessage';
$message->userfrom = -1;
@ -330,7 +336,8 @@ class core_messagelib_testcase extends advanced_testcase {
$this->assertFalse($messageid);
$this->assertDebuggingCalled('Attempt to send msg from unknown user');
$message = new stdClass();
$message = new \core\message\message();
$message->courseid = 1;
$message->component = 'moodle';
$message->name = 'instantmessage';
$message->userfrom = $user1;
@ -349,7 +356,8 @@ class core_messagelib_testcase extends advanced_testcase {
// Some debugging hints for devs.
unset($user2->emailstop);
$message = new stdClass();
$message = new \core\message\message();
$message->courseid = 1;
$message->component = 'moodle';
$message->name = 'instantmessage';
$message->userfrom = $user1;
@ -393,7 +401,8 @@ class core_messagelib_testcase extends advanced_testcase {
set_user_preference('message_provider_moodle_instantmessage_loggedoff', 'none', $user2);
$message = new stdClass();
$message = new \core\message\message();
$message->courseid = 1;
$message->component = 'moodle';
$message->name = 'instantmessage';
$message->userfrom = $user1;
@ -420,7 +429,8 @@ class core_messagelib_testcase extends advanced_testcase {
$CFG->messaging = 0;
$message = new stdClass();
$message = new \core\message\message();
$message->courseid = 1;
$message->component = 'moodle';
$message->name = 'instantmessage';
$message->userfrom = $user1;
@ -447,7 +457,8 @@ class core_messagelib_testcase extends advanced_testcase {
$CFG->messaging = 1;
$message = new stdClass();
$message = new \core\message\message();
$message->courseid = 1;
$message->component = 'moodle';
$message->name = 'instantmessage';
$message->userfrom = $user1;
@ -474,7 +485,8 @@ class core_messagelib_testcase extends advanced_testcase {
set_user_preference('message_provider_moodle_instantmessage_loggedoff', 'email', $user2);
$message = new stdClass();
$message = new \core\message\message();
$message->courseid = 1;
$message->component = 'moodle';
$message->name = 'instantmessage';
$message->userfrom = $user1;
@ -504,7 +516,8 @@ class core_messagelib_testcase extends advanced_testcase {
set_user_preference('message_provider_moodle_instantmessage_loggedoff', 'email', $user2);
$message = new stdClass();
$message = new \core\message\message();
$message->courseid = 1;
$message->component = 'moodle';
$message->name = 'instantmessage';
$message->userfrom = $user1;
@ -537,7 +550,8 @@ class core_messagelib_testcase extends advanced_testcase {
set_user_preference('message_provider_moodle_instantmessage_loggedoff', 'email,popup', $user2);
$message = new stdClass();
$message = new \core\message\message();
$message->courseid = 1;
$message->component = 'moodle';
$message->name = 'instantmessage';
$message->userfrom = $user1;
@ -570,7 +584,8 @@ class core_messagelib_testcase extends advanced_testcase {
set_user_preference('message_provider_moodle_instantmessage_loggedoff', 'popup', $user2);
$message = new stdClass();
$message = new \core\message\message();
$message->courseid = 1;
$message->component = 'moodle';
$message->name = 'instantmessage';
$message->userfrom = $user1;
@ -604,7 +619,8 @@ class core_messagelib_testcase extends advanced_testcase {
set_user_preference('message_provider_moodle_instantmessage_loggedoff', 'none', $user2);
$message = new stdClass();
$message = new \core\message\message();
$message->courseid = 1;
$message->component = 'moodle';
$message->name = 'instantmessage';
$message->userfrom = $user1;
@ -635,7 +651,8 @@ class core_messagelib_testcase extends advanced_testcase {
set_user_preference('message_provider_moodle_instantmessage_loggedoff', 'email', $user2);
$message = new stdClass();
$message = new \core\message\message();
$message->courseid = 1;
$message->component = 'moodle';
$message->name = 'instantmessage';
$message->userfrom = $user1;
@ -716,7 +733,8 @@ class core_messagelib_testcase extends advanced_testcase {
$user1 = $this->getDataGenerator()->create_user();
$user2 = $this->getDataGenerator()->create_user();
$message = new stdClass();
$message = new \core\message\message();
$message->courseid = 1;
$message->component = 'moodle';
$message->name = 'instantmessage';
$message->userfrom = $user1;
@ -778,7 +796,8 @@ class core_messagelib_testcase extends advanced_testcase {
$user1 = $this->getDataGenerator()->create_user();
$user2 = $this->getDataGenerator()->create_user();
$message = new stdClass();
$message = new \core\message\message();
$message->courseid = 1;
$message->component = 'moodle';
$message->name = 'instantmessage';
$message->userfrom = $user1;
@ -835,7 +854,8 @@ class core_messagelib_testcase extends advanced_testcase {
);
$file = $fs->create_file_from_string($filerecord, 'Test content');
$message = new stdClass();
$message = new \core\message\message();
$message->courseid = 1;
$message->component = 'moodle';
$message->name = 'instantmessage';
$message->userfrom = get_admin();