Skip to content

E
edx-proctoring
Commit 5f86df09 by Chris Dodge
Options

allow to turn off prerequisite enforcement

parent e724f625
Showing with 72 additions and 63 deletions
edx_proctoring/api.py
......@@ -1108,31 +1108,28 @@ def get_student_view(user_id, course_id, content_id,
credit_state = context['credit_state']
has_mode = _check_eligibility_of_enrollment_mode(credit_state)
has_prerequisites = False
if has_mode:
has_prerequisites = _check_eligibility_of_prerequisites(credit_state)
if not has_mode:
return None
has_prerequisites = _check_eligibility_of_prerequisites(credit_state)
# see if the user has passed all pre-requisite credit eligibility
# checks, otherwise just show the user the exam unproctored
if not has_mode or not has_prerequisites:
if not has_prerequisites and constants.ENFORCE_PREREQUISITES:
# if we are in the right mode and if we don't have
# pre-requisites, then we implicitly decline the exam
if has_mode:
attempt = get_exam_attempt(exam_id, user_id)
if not attempt:
# user hasn't a record of attempt, create one now
# so we can mark it as declined
create_exam_attempt(exam_id, user_id)
update_attempt_status(
exam_id,
user_id,
ProctoredExamStudentAttemptStatus.declined,
raise_if_not_found=False
)
# don't override context, let the courseware show
return None
attempt = get_exam_attempt(exam_id, user_id)
if not attempt:
# user hasn't a record of attempt, create one now
# so we can mark it as declined
create_exam_attempt(exam_id, user_id)
update_attempt_status(
exam_id,
user_id,
ProctoredExamStudentAttemptStatus.declined,
raise_if_not_found=False
)
attempt = get_exam_attempt(exam_id, user_id)
......
edx_proctoring/constants.py
......@@ -41,3 +41,9 @@ REQUIRE_FAILURE_SECOND_REVIEWS = (
'REQUIRE_FAILURE_SECOND_REVIEWS' in settings.PROCTORING_SETTINGS
else getattr(settings, 'REQUIRE_FAILURE_SECOND_REVIEWS', True)
)
ENFORCE_PREREQUISITES = (
settings.PROCTORING_SETTINGS['ENFORCE_PREREQUISITES'] if
'ENFORCE_PREREQUISITES' in settings.PROCTORING_SETTINGS
else False
)
edx_proctoring/tests/test_api.py
......@@ -724,14 +724,19 @@ class ProctoredExamApiTests(LoggedInTestCase):
self.assertIsNone(rendered_response)
@ddt.data(
('reverification', None, True, True, False),
('reverification', 'failed', False, False, True),
('reverification', 'failed', False, True, False),
('reverification', 'satisfied', True, True, False),
('grade', 'failed', True, False, False)
(True, 'reverification', None, True, True, False),
(True, 'reverification', 'failed', False, False, True),
(True, 'reverification', 'failed', True, True, False),
(True, 'reverification', 'satisfied', True, True, False),
(True, 'grade', 'failed', True, False, False),
(False, 'reverification', None, True, True, False),
(False, 'reverification', 'failed', True, False, False),
(False, 'reverification', 'failed', True, True, False),
(False, 'reverification', 'satisfied', True, True, False),
(False, 'grade', 'failed', True, False, False),
)
@ddt.unpack
def test_prereq_scenarios(self, namespace, req_status, show_proctored,
def test_prereq_scenarios(self, enforce_prereq, namespace, req_status, show_proctored,
pre_create_attempt, mark_as_declined):
"""
This test asserts that proctoring will not be displayed under the following
......@@ -740,46 +745,47 @@ class ProctoredExamApiTests(LoggedInTestCase):
- Verified student has not completed all 'reverification' requirements
"""
exam = get_exam_by_id(self.proctored_exam_id)
with patch('edx_proctoring.constants.ENFORCE_PREREQUISITES', enforce_prereq):
exam = get_exam_by_id(self.proctored_exam_id)
if pre_create_attempt:
create_exam_attempt(self.proctored_exam_id, self.user_id)
if pre_create_attempt:
create_exam_attempt(self.proctored_exam_id, self.user_id)
# user hasn't attempted reverifications
rendered_response = get_student_view(
user_id=self.user_id,
course_id=exam['course_id'],
content_id=exam['content_id'],
context={
'is_proctored': True,
'display_name': self.exam_name,
'default_time_limit_mins': 90,
'is_practice_exam': False,
'credit_state': {
'enrollment_mode': 'verified',
'credit_requirement_status': [
{
'namespace': namespace,
'status': req_status,
}
]
# user hasn't attempted reverifications
rendered_response = get_student_view(
user_id=self.user_id,
course_id=exam['course_id'],
content_id=exam['content_id'],
context={
'is_proctored': True,
'display_name': self.exam_name,
'default_time_limit_mins': 90,
'is_practice_exam': False,
'credit_state': {
'enrollment_mode': 'verified',
'credit_requirement_status': [
{
'namespace': namespace,
'status': req_status,
}
]
}
}
}
)
if show_proctored:
self.assertIsNotNone(rendered_response)
else:
self.assertIsNone(rendered_response)
# also the user should have been marked as declined in certain
# cases
if mark_as_declined:
attempt = get_exam_attempt(self.proctored_exam_id, self.user_id)
self.assertEqual(attempt['status'], ProctoredExamStudentAttemptStatus.declined)
else:
attempt = get_exam_attempt(self.proctored_exam_id, self.user_id)
if attempt:
self.assertNotEqual(attempt['status'], ProctoredExamStudentAttemptStatus.declined)
)
if show_proctored:
self.assertIsNotNone(rendered_response)
else:
self.assertIsNone(rendered_response)
# also the user should have been marked as declined in certain
# cases
if mark_as_declined:
attempt = get_exam_attempt(self.proctored_exam_id, self.user_id)
self.assertEqual(attempt['status'], ProctoredExamStudentAttemptStatus.declined)
else:
attempt = get_exam_attempt(self.proctored_exam_id, self.user_id)
if attempt:
self.assertNotEqual(attempt['status'], ProctoredExamStudentAttemptStatus.declined)
def test_student_view_non_student(self):
"""
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment