Merge pull request #17860 from edx/yro/EDUCATOR-2333

Delete visual_progress_enabled waffle flag.

common/djangoapps/student/tests/test_views.py

@@ -720,8 +720,7 @@ class StudentDashboardTests(SharedModuleStoreTestCase, MilestonesTestCaseMixin,
 
         submit_completions_for_testing(self.user, course_key, block_keys)
 
-        with patch('completion.utilities.visual_progress_enabled', return_value=True):
-            response = self.client.get(reverse('dashboard'))
+        response = self.client.get(reverse('dashboard'))
 
         course_key_string = str(course_key)
         resume_block_key_string = str(block_keys[-1])
@@ -808,8 +807,7 @@ class StudentDashboardTests(SharedModuleStoreTestCase, MilestonesTestCaseMixin,
                 )
             )
 
-        with patch('completion.utilities.visual_progress_enabled', return_value=True):
-            response = self.client.get(reverse('dashboard'))
+        response = self.client.get(reverse('dashboard'))
 
         html_for_view_buttons = [
             self._remove_whitespace_from_html_string(button)

common/lib/xmodule/xmodule/seq_module.py

@@ -210,8 +210,6 @@ class SequenceModule(SequenceFields, ProctoringFields, XModule):
 
         if dispatch == 'get_completion':
             completion_service = self.runtime.service(self, 'completion')
-            if not completion_service.visual_progress_enabled():
-                return None
 
             usage_key = data.get('usage_key', None)
             item = self.get_child(UsageKey.from_string(usage_key))
@@ -472,8 +470,9 @@ class SequenceModule(SequenceFields, ProctoringFields, XModule):
                 'path': " > ".join(display_names + [item.display_name_with_default]),
             }
 
-            if is_user_authenticated and completion_service.visual_progress_enabled():
-                iteminfo['complete'] = completion_service.vertical_is_complete(item)
+            if is_user_authenticated:
+                if item.location.block_type == 'vertical':
+                    iteminfo['complete'] = completion_service.vertical_is_complete(item)
 
             contents.append(iteminfo)
 

common/lib/xmodule/xmodule/tests/test_sequence.py

@@ -280,22 +280,6 @@ class SequenceBlockTestCase(XModuleXmlImportTest):
         # assert content shown as normal
         self._assert_ungated(html, self.sequence_1_2)
 
-    def test_handle_ajax_get_completion_disabled(self):
-        """
-        Test when completion service is turned off by waffle, the ajax call returns correct
-        None value
-        """
-        completion_waffle_mock = Mock()
-        completion_waffle_mock.return_value.visual_progress_enabled.return_value = False
-        self.sequence_3_1.xmodule_runtime._services['completion'] = completion_waffle_mock  # pylint: disable=protected-access
-        for child in self.sequence_3_1.get_children():
-            usage_key = unicode(child.location)
-            completion_return = self.sequence_3_1.handle_ajax(
-                'get_completion',
-                {'usage_key': usage_key}
-            )
-            self.assertIs(completion_return, None)
-
     def test_handle_ajax_get_completion_success(self):
         """
         Test that the completion data is returned successfully on

common/test/acceptance/tests/lms/test_lms_course_home.py

@@ -124,16 +124,6 @@ class CourseHomeTest(CourseHomeBaseTest):
         bookmarks_page = BookmarksPage(self.browser, self.course_id)
         self.assertTrue(bookmarks_page.is_browser_on_page())
 
-        # Test "Resume Course" button from header
-        self.course_home_page.visit()
-        self.course_home_page.resume_course_from_header()
-        self.assertTrue(self.courseware_page.nav.is_on_section('Test Section 2', 'Test Subsection 3'))
-
-        # Test "Resume Course" button from within outline
-        self.course_home_page.visit()
-        self.course_home_page.outline.resume_course_from_outline()
-        self.assertTrue(self.courseware_page.nav.is_on_section('Test Section 2', 'Test Subsection 3'))
-
 
 @attr('a11y')
 class CourseHomeA11yTest(CourseHomeBaseTest):