Merge pull request #19771 from edx/dahlia/masters-track

Added master's track
This commit is contained in:
Dave St.Germain
2019-02-25 10:11:24 -05:00
committed by GitHub
8 changed files with 101 additions and 7 deletions

View File

@@ -0,0 +1,25 @@
"""
django-rules for courseware related features
"""
from __future__ import absolute_import
from opaque_keys.edx.keys import CourseKey
from student.models import CourseEnrollment
import rules
@rules.predicate
def is_verified_or_masters_track_exam(user, exam):
"""
Returns whether the user is in a verified or master's track
"""
course_id = CourseKey.from_string(exam['course_id'])
mode, is_active = CourseEnrollment.enrollment_mode_for_user(user, course_id)
return is_active and mode in ('verified', 'masters')
# The edx_proctoring.api uses this permission to gate access to the
# proctored experience
can_take_proctored_exam = is_verified_or_masters_track_exam
rules.set_perm('edx_proctoring.can_take_proctored_exam', is_verified_or_masters_track_exam)

View File

@@ -0,0 +1,48 @@
"""
Tests for permissions defined in courseware.rules
"""
import ddt
from django.test import TestCase
from course_modes.tests.factories import CourseModeFactory
from opaque_keys.edx.locator import CourseLocator
from student.models import CourseEnrollment
from student.tests.factories import UserFactory
@ddt.ddt
class PermissionTests(TestCase):
"""
Tests for permissions defined in courseware.rules
"""
def setUp(self):
super(PermissionTests, self).setUp()
self.user = UserFactory()
self.course_id = CourseLocator('MITx', '000', 'Perm_course')
CourseModeFactory(mode_slug='verified', course_id=self.course_id)
CourseModeFactory(mode_slug='masters', course_id=self.course_id)
def tearDown(self):
super(PermissionTests, self).tearDown()
self.user.delete()
@ddt.data(
(None, False),
('audit', False),
('verified', True),
('masters', True),
)
@ddt.unpack
def test_proctoring_perm(self, mode, should_have_perm):
"""
Test that the user has the edx_proctoring.can_take_proctored_exam permission
"""
if mode is not None:
CourseEnrollment.enroll(self.user, self.course_id, mode=mode)
else:
CourseEnrollment.unenroll(self.user, self.course_id)
has_perm = self.user.has_perm('edx_proctoring.can_take_proctored_exam', {'course_id': unicode(self.course_id)})
assert has_perm == should_have_perm

View File

@@ -3384,6 +3384,12 @@ COURSE_ENROLLMENT_MODES = {
"display_name": _("Honor"),
"min_price": 0
},
"masters": {
"id": 7,
"slug": "masters",
"display_name": _("Master's"),
"min_price": 0
},
}
CONTENT_TYPE_GATE_GROUP_IDS = {