Merge pull request #15671 from edx/diana/tabs-issues

Handle tab hiding at a different level.

lms/djangoapps/courseware/tabs.py

@@ -70,10 +70,7 @@ class CourseInfoTab(CourseTab):
 
     @classmethod
     def is_enabled(cls, course, user=None):
-        """
-        The "Home" tab is not shown for the new unified course experience.
-        """
-        return not UNIFIED_COURSE_TAB_FLAG.is_enabled(course.id)
+        return True
 
 
 class SyllabusTab(EnrolledTab):
@@ -326,6 +323,9 @@ def get_course_tab_list(request, course):
             if tab.type != 'courseware':
                 continue
             tab.name = _("Entrance Exam")
+        # TODO: LEARNER-611 - once the course_info tab is removed, remove this code
+        if UNIFIED_COURSE_TAB_FLAG.is_enabled(course.id) and tab.type == 'course_info':
+                continue
         if tab.type == 'static_tab' and tab.course_staff_only and \
                 not bool(user and has_access(user, 'staff', course, course.id)):
             continue

lms/djangoapps/courseware/tests/test_tabs.py

@@ -792,6 +792,14 @@ class CourseInfoTabTestCase(TabTestCase):
         tabs = get_course_tab_list(self.request, self.course)
         self.assertEqual(tabs[0].type, 'courseware')
 
+    # TODO: LEARNER-611 - remove once course_info is removed.
+    @override_waffle_flag(UNIFIED_COURSE_TAB_FLAG, active=True)
+    def test_default_tab_for_displayable(self):
+        tabs = xmodule_tabs.CourseTabList.iterate_displayable(self.course, self.user)
+        for i, tab in enumerate(tabs):
+            if i == 0:
+                self.assertEqual(tab.type, 'course_info')
+
 
 @attr(shard=1)
 class DiscussionLinkTestCase(TabTestCase):