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

MDL-43337 enrol: Missing break in get_enrolled_users WS

Browse Source
This commit is contained in:
Frederic Massart
2014-02-13 12:07:06 +08:00
parent c9c9a4a76b
commit 07b9d5e9df
2 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
enrol/externallib.php
+1
View File
@@ -415,6 +415,7 @@ class core_enrol_external extends external_api {
foreach ($thefields as $f) {
$userfields[] = clean_param($f, PARAM_ALPHANUMEXT);
}
break;
case 'limitfrom' :
$limitfrom = clean_param($option['value'], PARAM_INT);
break;
enrol/tests/externallib_test.php
+21 -2
View File
@@ -43,6 +43,8 @@ class core_enrol_externallib_testcase extends externallib_advanced_testcase {
$course = self::getDataGenerator()->create_course();
$user1 = self::getDataGenerator()->create_user();
$user2 = self::getDataGenerator()->create_user();
$user3 = self::getDataGenerator()->create_user();
$this->setUser($user3);
// Set the required capabilities by the external function.
$context = context_course::instance($course->id);
@@ -52,7 +54,7 @@ class core_enrol_externallib_testcase extends externallib_advanced_testcase {
// Enrol the users in the course.
$this->getDataGenerator()->enrol_user($user1->id, $course->id, $roleid, 'manual');
$this->getDataGenerator()->enrol_user($user2->id, $course->id, $roleid, 'manual');
$this->getDataGenerator()->enrol_user($USER->id, $course->id, $roleid, 'manual');
$this->getDataGenerator()->enrol_user($user3->id, $course->id, $roleid, 'manual');
// Call the external function.
$enrolledusers = core_enrol_external::get_enrolled_users($course->id);
@@ -60,8 +62,25 @@ class core_enrol_externallib_testcase extends externallib_advanced_testcase {
// We need to execute the return values cleaning process to simulate the web service server.
$enrolledusers = external_api::clean_returnvalue(core_enrol_external::get_enrolled_users_returns(), $enrolledusers);
// Check we retrieve the good total number of enrolled users.
// Check the result set.
$this->assertEquals(3, count($enrolledusers));
$this->assertArrayHasKey('email', $enrolledusers[0]);
// Call the function with some parameters set.
$enrolledusers = core_enrol_external::get_enrolled_users($course->id, array(
array('name' => 'limitfrom', 'value' => 2),
array('name' => 'limitnumber', 'value' => 1),
array('name' => 'userfields', 'value' => 'id')
));
// We need to execute the return values cleaning process to simulate the web service server.
$enrolledusers = external_api::clean_returnvalue(core_enrol_external::get_enrolled_users_returns(), $enrolledusers);
// Check the result set, we should only get the 3rd result, which is $user3.
$this->assertCount(1, $enrolledusers);
$this->assertEquals($user3->id, $enrolledusers[0]['id']);
$this->assertArrayHasKey('id', $enrolledusers[0]);
$this->assertArrayNotHasKey('email', $enrolledusers[0]);
// Call without required capability.
$this->unassignUserCapability('moodle/course:viewparticipants', $context->id, $roleid);