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

MDL-65726 core_roles: allow to create roles in install.php

Browse Source
This commit is contained in:
Marina Glancy 2019-05-29 10:28:03 +02:00
parent c0542b8a08
commit ff51af495f
2 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
enrol/self/tests/self_test.php
View File

@ -669,7 +669,7 @@ class enrol_self_testcase extends advanced_testcase {
$context = context_course::instance($course1->id);
// Get editing teacher role.
$editingteacherrole = $DB->get_record('role', ['archetype' => 'editingteacher']);
$editingteacherrole = $DB->get_record('role', ['shortname' => 'editingteacher']);
$this->assertNotEmpty($editingteacherrole);
// Enable self enrolment plugin and set to send email from course contact.
@ -700,7 +700,7 @@ class enrol_self_testcase extends advanced_testcase {
$this->assertEquals($user1->email, $contact->email);
// Get manager role, and enrol user as manager.
$managerrole = $DB->get_record('role', ['archetype' => 'manager']);
$managerrole = $DB->get_record('role', ['shortname' => 'manager']);
$this->assertNotEmpty($managerrole);
$instance1->customint4 = ENROL_SEND_EMAIL_FROM_KEY_HOLDER;
$DB->update_record('enrol', $instance1);

22
lib/tests/accesslib_test.php
View File

@ -340,7 +340,9 @@ class core_accesslib_testcase extends advanced_testcase {
$user = $this->getDataGenerator()->create_user();
$course = $this->getDataGenerator()->create_course();
role_assign($CFG->coursecontact, $user->id, context_course::instance($course->id));
$contactroles = preg_split('/,/', $CFG->coursecontact);
$roleid = reset($contactroles);
role_assign($roleid, $user->id, context_course::instance($course->id));
$this->assertTrue(has_coursecontact_role($user->id));
}
@ -800,7 +802,7 @@ class core_accesslib_testcase extends advanced_testcase {
create_role('New student role', 'student2', 'New student description', 'student');
$roles = get_archetype_roles('student');
$this->assertCount(2, $roles);
$this->assertGreaterThanOrEqual(2, count($roles));
}
/**
@ -1508,14 +1510,8 @@ class core_accesslib_testcase extends advanced_testcase {
$allroles = get_all_roles();
$expected = array($id2=>$allroles[$id2]);
foreach (get_role_archetypes() as $archetype) {
$defaults = get_default_contextlevels($archetype);
if (in_array(CONTEXT_COURSE, $defaults)) {
$roles = get_archetype_roles($archetype);
foreach ($roles as $role) {
$expected[$role->id] = $role;
}
}
foreach (get_roles_for_contextlevels(CONTEXT_COURSE) as $roleid) {
$expected[$roleid] = $roleid;
}
$roles = get_default_enrol_roles($coursecontext);
@ -2694,7 +2690,7 @@ class core_accesslib_testcase extends advanced_testcase {
$testcourses = array();
$testpages = array();
$testblocks = array();
$allroles = $DB->get_records_menu('role', array(), 'id', 'archetype, id');
$allroles = $DB->get_records_menu('role', array(), 'id', 'shortname, id');
$systemcontext = context_system::instance();
$frontpagecontext = context_course::instance(SITEID);
@ -3616,8 +3612,8 @@ class core_accesslib_testcase extends advanced_testcase {
$this->resetAfterTest(true);
$froncontext = context_course::instance($SITE->id);
$student = $DB->get_record('role', array('archetype'=>'student'));
$teacher = $DB->get_record('role', array('archetype'=>'teacher'));
$student = $DB->get_record('role', array('shortname'=>'student'));
$teacher = $DB->get_record('role', array('shortname'=>'teacher'));
$existingcaps = $DB->get_records('capabilities', array(), 'id', 'name, captype, contextlevel, component, riskbitmask');