Merging PHX-239, PHX-240 fixes to 0.12.5 release

edx_proctoring/admin.py

@@ -386,7 +386,6 @@ class ProctoredExamAttemptForm(forms.ModelForm):
         (ProctoredExamStudentAttemptStatus.second_review_required, _('Second Review Required')),
         (ProctoredExamStudentAttemptStatus.verified, _('Verified')),
         (ProctoredExamStudentAttemptStatus.rejected, _('Rejected')),
-        (ProctoredExamStudentAttemptStatus.not_reviewed, _('Not Reviewed')),
         (ProctoredExamStudentAttemptStatus.error, _('Error')),
     ]
 

edx_proctoring/api.py

@@ -1559,9 +1559,6 @@ def _get_practice_exam_view(exam, context, exam_id, user_id, course_id):
     attempt_status = attempt['status'] if attempt else None
 
     if not attempt_status:
-        if _has_due_date_passed(exam['due_date']):
-            student_view_template = 'proctored_exam/expired.html'
-        else:
         student_view_template = 'practice_exam/entrance.html'
     elif attempt_status == ProctoredExamStudentAttemptStatus.started:
         # when we're taking the exam we should not override the view

edx_proctoring/models.py

@@ -159,9 +159,6 @@ class ProctoredExamStudentAttemptStatus(object):
     # the exam has been rejected
     rejected = 'rejected'
 
-    # the exam was not reviewed
-    not_reviewed = 'not_reviewed'
-
     # the exam is believed to be in error
     error = 'error'
 
@@ -180,7 +177,7 @@ class ProctoredExamStudentAttemptStatus(object):
         """
         return status in [
             cls.declined, cls.timed_out, cls.submitted, cls.second_review_required,
-            cls.verified, cls.rejected, cls.not_reviewed, cls.error
+            cls.verified, cls.rejected, cls.error
         ]
 
     @classmethod
@@ -199,8 +196,7 @@ class ProctoredExamStudentAttemptStatus(object):
         Returns a boolean if the passed in to_status calls for an update to the credit requirement status.
         """
         return to_status in [
-            cls.verified, cls.rejected, cls.declined, cls.not_reviewed,
-            cls.submitted, cls.error
+            cls.verified, cls.rejected, cls.declined, cls.submitted, cls.error
         ]
 
     @classmethod

edx_proctoring/static/proctoring/js/views/proctored_exam_attempt_view.js

@@ -18,7 +18,6 @@ var edx = edx || {};
         submitted: gettext('Submitted'),
         verified: gettext('Verified'),
         rejected: gettext('Rejected'),
-        not_reviewed: gettext('Not reviewed'),
         error: gettext('Error')
     };
     var viewHelper = {

edx_proctoring/tests/test_api.py

@@ -1373,58 +1373,6 @@ class ProctoredExamApiTests(LoggedInTestCase):
         else:
             self.assertIsNone(None)
 
-    @ddt.data(
-        (True, False),
-        (True, True),
-        (False, False),
-    )
-    @ddt.unpack
-    def test_practice_exam_attempt_with_past_due_datetime(self, is_proctored, is_practice):
-        """
-        Test for get_student_view for practice proctored exam with past due datetime
-        """
-
-        due_date = datetime.now(pytz.UTC) + timedelta(days=1)
-
-        # exam is created with due datetime which has already passed
-        self._create_exam_with_due_time(
-            is_proctored=is_proctored,
-            is_practice_exam=is_practice,
-            due_date=due_date
-        )
-
-        # due_date is exactly after 24 hours, if student arrives after 2 days
-        # then he can not attempt the proctored exam
-        reset_time = due_date + timedelta(days=2)
-        with freeze_time(reset_time):
-            rendered_response = get_student_view(
-                user_id=self.user_id,
-                course_id=self.course_id,
-                content_id=self.content_id_for_exam_with_due_date,
-                context={
-                    'is_proctored': True,
-                    'is_practice_exam': True,
-                    'display_name': self.exam_name,
-                    'default_time_limit_mins': self.default_time_limit
-                }
-            )
-            self.assertIn(self.exam_expired_msg, rendered_response)
-
-            # call the view again, because the first call set the exam attempt to 'expired'
-            # this second call will render the view based on the state
-            rendered_response = get_student_view(
-                user_id=self.user_id,
-                course_id=self.course_id,
-                content_id=self.content_id_for_exam_with_due_date,
-                context={
-                    'is_proctored': True,
-                    'is_practice_exam': True,
-                    'display_name': self.exam_name,
-                    'default_time_limit_mins': self.default_time_limit
-                }
-            )
-            self.assertIn(self.exam_expired_msg, rendered_response)
-
     def test_proctored_exam_attempt_with_past_due_datetime(self):
         """
         Test for get_student_view for proctored exam with past due datetime
@@ -2145,7 +2093,6 @@ class ProctoredExamApiTests(LoggedInTestCase):
         (ProctoredExamStudentAttemptStatus.submitted, ProctoredExamStudentAttemptStatus.ready_to_start),
         (ProctoredExamStudentAttemptStatus.verified, ProctoredExamStudentAttemptStatus.started),
         (ProctoredExamStudentAttemptStatus.rejected, ProctoredExamStudentAttemptStatus.started),
-        (ProctoredExamStudentAttemptStatus.not_reviewed, ProctoredExamStudentAttemptStatus.started),
         (ProctoredExamStudentAttemptStatus.error, ProctoredExamStudentAttemptStatus.started),
         (ProctoredExamStudentAttemptStatus.submitted, ProctoredExamStudentAttemptStatus.error),
     )
@@ -2616,7 +2563,6 @@ class ProctoredExamApiTests(LoggedInTestCase):
         ProctoredExamStudentAttemptStatus.ready_to_submit,
         ProctoredExamStudentAttemptStatus.declined,
         ProctoredExamStudentAttemptStatus.timed_out,
-        ProctoredExamStudentAttemptStatus.not_reviewed,
         ProctoredExamStudentAttemptStatus.error
     )
     @patch.dict('settings.PROCTORING_SETTINGS', {'ALLOW_TIMED_OUT_STATE': True})