mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-05-04 15:27:34 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-71104-master-2' of git://github.com/mickhawkins/moodle

Browse Source
This commit is contained in:
Travis CI 2021-03-23 13:46:20 +08:00
commit e8baa93c44
2 changed files with 95 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/completionlib.php
View File

@ -1111,13 +1111,13 @@ class completion_info {
$customdata = (array)$cm->customdata;
// Return early if the plugin does not define custom completion rules.
if (empty($customdata['customcompletionrules'])) {
return [];
return $data;
}
// Return early if the activity modules doe not implement the activity_custom_completion class.
$cmcompletionclass = activity_custom_completion::get_cm_completion_class($cm->modname);
if (!$cmcompletionclass) {
return [];
return $data;
}
/** @var activity_custom_completion $customcmcompletion */

104
lib/tests/completionlib_test.php
View File

@ -584,19 +584,22 @@ class core_completionlib_testcase extends advanced_testcase {
public function get_data_provider() {
return [
'No completion record' => [
false, false, false, COMPLETION_INCOMPLETE
false, true, false, COMPLETION_INCOMPLETE
],
'Not completed' => [
false, false, true, COMPLETION_INCOMPLETE
false, true, true, COMPLETION_INCOMPLETE
],
'Completed' => [
false, false, true, COMPLETION_COMPLETE
false, true, true, COMPLETION_COMPLETE
],
'Whole course, complete' => [
true, false, true, COMPLETION_COMPLETE
true, true, true, COMPLETION_COMPLETE
],
'Get data for another user, result should be not cached' => [
false, true, true, COMPLETION_INCOMPLETE
false, false, true, COMPLETION_INCOMPLETE
],
'Get data for another user, including whole course, result should be not cached' => [
true, false, true, COMPLETION_INCOMPLETE
],
];
}
@ -616,17 +619,17 @@ class core_completionlib_testcase extends advanced_testcase {
$this->setup_data();
$user = $this->user;
/** @var \mod_choice_generator $choicegenerator */
$choicegenerator = $this->getDataGenerator()->get_plugin_generator('mod_choice');
$choice = $choicegenerator->create_instance([
'course' => $this->course->id,
'completion' => true,
'completion' => COMPLETION_TRACKING_AUTOMATIC,
'completionview' => true,
'completionsubmit' => true,
]);
$cm = get_coursemodule_from_instance('choice', $choice->id);
// Let's manually create a course completion record instead of going thru the hoops to complete an activity.
// Let's manually create a course completion record instead of going through the hoops to complete an activity.
if ($hasrecord) {
$cmcompletionrecord = (object)[
'coursemoduleid' => $cm->id,
@ -653,6 +656,7 @@ class core_completionlib_testcase extends advanced_testcase {
$completioninfo = new completion_info($this->course);
$result = $completioninfo->get_data($cm, $wholecourse, $user->id);
// Course module ID of the returned completion data must match this activity's course module ID.
$this->assertEquals($cm->id, $result->coursemoduleid);
// User ID of the returned completion data must match the user's ID.
@ -662,7 +666,6 @@ class core_completionlib_testcase extends advanced_testcase {
// If the user has no completion record, then the default record should be returned.
if (!$hasrecord) {
$iscached = false;
$this->assertEquals(0, $result->id);
}
@ -675,15 +678,94 @@ class core_completionlib_testcase extends advanced_testcase {
// Check cached data for other course modules in the course.
// The sample module created in setup_data() should suffice to confirm this.
$othercm = get_coursemodule_from_instance('forum', $this->module1->id);
if ($wholecourse) {
$this->assertArrayHasKey($this->module1->id, $cache->get($key));
$this->assertArrayHasKey($othercm->id, $cache->get($key));
} else {
$this->assertArrayNotHasKey($this->module1->id, $cache->get($key));
$this->assertArrayNotHasKey($othercm->id, $cache->get($key));
}
} else {
// Otherwise, this should not be cached.
$this->assertFalse($cache->get($key));
}
// Check that we are including relevant completion data for the module.
if (!$wholecourse) {
$this->assertTrue(property_exists($result, 'viewed'));
$this->assertTrue(property_exists($result, 'customcompletion'));
}
}
/**
* Tests for completion_info::get_other_cm_completion_data().
*/
public function test_get_other_cm_completion_data() {
global $DB;
$this->setup_data();
$user = $this->user;
$this->setAdminUser();
$choicegenerator = $this->getDataGenerator()->get_plugin_generator('mod_choice');
$choice = $choicegenerator->create_instance([
'course' => $this->course->id,
'completion' => COMPLETION_TRACKING_AUTOMATIC,
'completionsubmit' => true,
]);
$cmchoice = cm_info::create(get_coursemodule_from_instance('choice', $choice->id));
$choice2 = $choicegenerator->create_instance([
'course' => $this->course->id,
'completion' => COMPLETION_TRACKING_AUTOMATIC,
]);
$cmchoice2 = cm_info::create(get_coursemodule_from_instance('choice', $choice2->id));
$workshopgenerator = $this->getDataGenerator()->get_plugin_generator('mod_workshop');
$workshop = $workshopgenerator->create_instance([
'course' => $this->course->id,
'completion' => COMPLETION_TRACKING_AUTOMATIC,
// Submission grade required.
'completiongradeitemnumber' => 0,
]);
$cmworkshop = cm_info::create(get_coursemodule_from_instance('workshop', $workshop->id));
$completioninfo = new completion_info($this->course);
$method = new ReflectionMethod("completion_info", "get_other_cm_completion_data");
$method->setAccessible(true);
// Check that fetching data for a module with custom completion provides its info.
$choicecompletiondata = $method->invoke($completioninfo, $cmchoice, $user->id);
$this->assertArrayHasKey('customcompletion', $choicecompletiondata);
$this->assertArrayHasKey('completionsubmit', $choicecompletiondata['customcompletion']);
$this->assertEquals(COMPLETION_INCOMPLETE, $choicecompletiondata['customcompletion']['completionsubmit']);
// Mock a choice answer so user has completed the requirement.
$choicemockinfo = [
'choiceid' => $cmchoice->instance,
'userid' => $this->user->id
];
$DB->insert_record('choice_answers', $choicemockinfo, false);
// Confirm fetching again reflects the completion.
$choicecompletiondata = $method->invoke($completioninfo, $cmchoice, $user->id);
$this->assertEquals(COMPLETION_COMPLETE, $choicecompletiondata['customcompletion']['completionsubmit']);
// Check that fetching data for a module with no custom completion still provides its grade completion status.
$workshopcompletiondata = $method->invoke($completioninfo, $cmworkshop, $user->id);
$this->assertArrayHasKey('completiongrade', $workshopcompletiondata);
$this->assertArrayNotHasKey('customcompletion', $workshopcompletiondata);
$this->assertEquals(COMPLETION_INCOMPLETE, $workshopcompletiondata['completiongrade']);
// Check that fetching data for a module with no completion conditions does not provide any data.
$choice2completiondata = $method->invoke($completioninfo, $cmchoice2, $user->id);
$this->assertEmpty($choice2completiondata);
}
public function test_internal_set_data() {