diff --git a/lms/djangoapps/courseware/toggles.py b/lms/djangoapps/courseware/toggles.py index e1b2d34d1d..acc44b0e93 100644 --- a/lms/djangoapps/courseware/toggles.py +++ b/lms/djangoapps/courseware/toggles.py @@ -101,21 +101,6 @@ COURSEWARE_PROCTORING_IMPROVEMENTS = CourseWaffleFlag( WAFFLE_FLAG_NAMESPACE, 'proctoring_improvements', __name__ ) -# .. toggle_name: courseware.exam_resume_proctoring_improvements -# .. toggle_implementation: CourseWaffleFlag -# .. toggle_default: False -# .. toggle_description: Waffle flag to toggle various exam resumption enhancements to the proctoring experience, -# including but not limited to the addition of a "Resume" action for exam attempts in the "error" state to the -# Student Special Exam Attempts panel of the Special Exams tab of the Instructor Dashboard, etc. -# .. toggle_use_cases: temporary -# .. toggle_creation_date: 2020-01-25 -# .. toggle_target_removal_date: None -# .. toggle_warnings: None -# .. toggle_tickets: MST-597 -EXAM_RESUME_PROCTORING_IMPROVEMENTS = CourseWaffleFlag( - WAFFLE_FLAG_NAMESPACE, 'exam_resume_proctoring_improvements', __name__ -) - # .. toggle_name: courseware.optimized_render_xblock # .. toggle_implementation: CourseWaffleFlag # .. toggle_default: False diff --git a/lms/djangoapps/instructor/tests/test_proctoring.py b/lms/djangoapps/instructor/tests/test_proctoring.py index 95f25f72f6..1791df8361 100644 --- a/lms/djangoapps/instructor/tests/test_proctoring.py +++ b/lms/djangoapps/instructor/tests/test_proctoring.py @@ -14,7 +14,6 @@ from edx_toggles.toggles.testutils import override_waffle_flag from common.djangoapps.student.roles import CourseInstructorRole, CourseStaffRole from common.djangoapps.student.tests.factories import AdminFactory -from lms.djangoapps.courseware.toggles import EXAM_RESUME_PROCTORING_IMPROVEMENTS from xmodule.modulestore.tests.django_utils import SharedModuleStoreTestCase from xmodule.modulestore.tests.factories import CourseFactory @@ -179,32 +178,6 @@ class TestProctoringDashboardViews(SharedModuleStoreTestCase): self.instructor.save() self._assert_escalation_email_available(True) - @override_waffle_flag(EXAM_RESUME_PROCTORING_IMPROVEMENTS, True) - def test_exam_resume_proctoring_improvements_toggle_enabled(self): - """ - The value of the feature toggle EXAM_RESUME_PROCTORING_IMPROVEMENTS should be included in the response - via the data-enable-exam-resume-proctoring-improvements data attribute when the toggle is enabled. - """ - self.setup_course(True, True) - self.instructor.is_staff = True - self.instructor.save() - - response = self.client.get(self.url) - assert 'data-enable-exam-resume-proctoring-improvements="True"' in response.content.decode('utf-8') - - @override_waffle_flag(EXAM_RESUME_PROCTORING_IMPROVEMENTS, False) - def test_exam_resume_proctoring_improvements_toggle_disabled(self): - """ - The value of the feature toggle EXAM_RESUME_PROCTORING_IMPROVEMENTS should be included in the response - via the data-enable-exam-resume-proctoring-improvements data attribute when the toggle is disabled. - """ - self.setup_course(True, True) - self.instructor.is_staff = True - self.instructor.save() - - response = self.client.get(self.url) - assert 'data-enable-exam-resume-proctoring-improvements="False"' in response.content.decode('utf-8') - def test_review_dashboard(self): """ The exam review dashboard will appear for backends that support the feature diff --git a/lms/djangoapps/instructor/views/instructor_dashboard.py b/lms/djangoapps/instructor/views/instructor_dashboard.py index 3d4efaca2a..6e95191635 100644 --- a/lms/djangoapps/instructor/views/instructor_dashboard.py +++ b/lms/djangoapps/instructor/views/instructor_dashboard.py @@ -50,7 +50,6 @@ from lms.djangoapps.certificates.models import ( from lms.djangoapps.courseware.access import has_access from lms.djangoapps.courseware.courses import get_course_by_id, get_studio_url from lms.djangoapps.courseware.module_render import get_module_by_usage_id -from lms.djangoapps.courseware.toggles import EXAM_RESUME_PROCTORING_IMPROVEMENTS from lms.djangoapps.discussion.django_comment_client.utils import available_division_schemes, has_forum_access from lms.djangoapps.grades.api import is_writable_gradebook_enabled from openedx.core.djangoapps.course_groups.cohorts import DEFAULT_COHORT_NAME, get_course_cohorts, is_course_cohorted @@ -278,7 +277,6 @@ def _section_special_exams(course, access): 'escalation_email': escalation_email, 'show_dashboard': is_backend_dashboard_available(course_key), 'show_onboarding': does_backend_support_onboarding(course.proctoring_provider), - 'enable_exam_resume_proctoring_improvements': EXAM_RESUME_PROCTORING_IMPROVEMENTS.is_enabled(course.id), } return section_data diff --git a/lms/templates/instructor/instructor_dashboard_2/special_exams.html b/lms/templates/instructor/instructor_dashboard_2/special_exams.html index 063d66c5d2..1793a115aa 100644 --- a/lms/templates/instructor/instructor_dashboard_2/special_exams.html +++ b/lms/templates/instructor/instructor_dashboard_2/special_exams.html @@ -13,7 +13,7 @@ import pytz

${_('Allowance Section')}

- % if section_data['show_onboarding'] and section_data['enable_exam_resume_proctoring_improvements']: + % if section_data['show_onboarding']:

${_('Student Onboarding Status')}

@@ -21,7 +21,7 @@ import pytz % endif

${_('Student Special Exam Attempts')}

-
+
% if section_data['show_dashboard']:
diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 9822c5c82f..433331b84e 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -107,7 +107,7 @@ edx-milestones==0.3.1 # via -r requirements/edx/base.in edx-opaque-keys[django]==2.2.0 # via -r requirements/edx/paver.txt, edx-bulk-grades, edx-ccx-keys, edx-completion, edx-drf-extensions, edx-enterprise, edx-milestones, edx-organizations, edx-proctoring, edx-user-state-client, edx-when, lti-consumer-xblock, xmodule edx-organizations==6.9.0 # via -r requirements/edx/base.in edx-proctoring-proctortrack==1.0.5 # via -r requirements/edx/base.in -edx-proctoring==3.7.16 # via -r requirements/edx/base.in, edx-proctoring-proctortrack +edx-proctoring==3.8.0 # via -r requirements/edx/base.in, edx-proctoring-proctortrack edx-rbac==1.4.2 # via edx-enterprise edx-rest-api-client==5.3.0 # via -r requirements/edx/base.in, edx-enterprise, edx-proctoring edx-search==3.0.0 # via -r requirements/edx/base.in diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 33dd72d316..a527ba320f 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -119,7 +119,7 @@ edx-milestones==0.3.1 # via -r requirements/edx/testing.txt edx-opaque-keys[django]==2.2.0 # via -r requirements/edx/testing.txt, edx-bulk-grades, edx-ccx-keys, edx-completion, edx-drf-extensions, edx-enterprise, edx-milestones, edx-organizations, edx-proctoring, edx-user-state-client, edx-when, lti-consumer-xblock, xmodule edx-organizations==6.9.0 # via -r requirements/edx/testing.txt edx-proctoring-proctortrack==1.0.5 # via -r requirements/edx/testing.txt -edx-proctoring==3.7.16 # via -r requirements/edx/testing.txt, edx-proctoring-proctortrack +edx-proctoring==3.8.0 # via -r requirements/edx/testing.txt, edx-proctoring-proctortrack edx-rbac==1.4.2 # via -r requirements/edx/testing.txt, edx-enterprise edx-rest-api-client==5.3.0 # via -r requirements/edx/testing.txt, edx-enterprise, edx-proctoring edx-search==3.0.0 # via -r requirements/edx/testing.txt diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 76a39d8c41..6c6e8d5c65 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -116,7 +116,7 @@ edx-milestones==0.3.1 # via -r requirements/edx/base.txt edx-opaque-keys[django]==2.2.0 # via -r requirements/edx/base.txt, edx-bulk-grades, edx-ccx-keys, edx-completion, edx-drf-extensions, edx-enterprise, edx-milestones, edx-organizations, edx-proctoring, edx-user-state-client, edx-when, lti-consumer-xblock, xmodule edx-organizations==6.9.0 # via -r requirements/edx/base.txt edx-proctoring-proctortrack==1.0.5 # via -r requirements/edx/base.txt -edx-proctoring==3.7.16 # via -r requirements/edx/base.txt, edx-proctoring-proctortrack +edx-proctoring==3.8.0 # via -r requirements/edx/base.txt, edx-proctoring-proctortrack edx-rbac==1.4.2 # via -r requirements/edx/base.txt, edx-enterprise edx-rest-api-client==5.3.0 # via -r requirements/edx/base.txt, edx-enterprise, edx-proctoring edx-search==3.0.0 # via -r requirements/edx/base.txt