Fix the tests

analytics_dashboard/courses/tests/test_views/__init__.py

@@ -256,7 +256,7 @@ class CourseEnrollmentViewTestMixin(CourseViewTestMixin):
                 'scope': 'course',
                 'lens': 'enrollment',
                 'report': 'demographics',
-                'depth': ''
+                'depth': 'age'
             },
             {
                 'name': 'geography',
@@ -295,12 +295,33 @@ class CourseEnrollmentDemographicsMixin(CourseEnrollmentViewTestMixin):
     def assertTertiaryNavs(self, nav, course_id):
         reverse_kwargs = {'course_id': course_id}
         expected = [
-            {'name': 'age', 'label': _('Age'),
-             'href': reverse('courses:enrollment:demographics_age', kwargs=reverse_kwargs)},
-            {'name': 'education', 'label': _('Education'),
-             'href': reverse('courses:enrollment:demographics_education', kwargs=reverse_kwargs)},
-            {'name': 'gender', 'label': _('Gender'),
-             'href': reverse('courses:enrollment:demographics_gender', kwargs=reverse_kwargs)}
+            {
+                'name': 'age',
+                'label': _('Age'),
+                'href': reverse('courses:enrollment:demographics_age', kwargs=reverse_kwargs),
+                'scope': 'course',
+                'lens': 'enrollment',
+                'report': 'demographics',
+                'depth': 'age'
+            },
+            {
+                'name': 'education',
+                'label': _('Education'),
+                'href': reverse('courses:enrollment:demographics_education', kwargs=reverse_kwargs),
+                'scope': 'course',
+                'lens': 'enrollment',
+                'report': 'demographics',
+                'depth': 'education'
+            },
+            {
+                'name': 'gender',
+                'label': _('Gender'),
+                'href': reverse('courses:enrollment:demographics_gender', kwargs=reverse_kwargs),
+                'scope': 'course',
+                'lens': 'enrollment',
+                'report': 'demographics',
+                'depth': 'gender'
+            }
         ]
         self.assertNavs(nav, expected, self.active_tertiary_nav_label)
 

analytics_dashboard/courses/tests/test_views/test_engagement.py

@@ -70,14 +70,15 @@ class CourseEngagementViewTestMixin(PatchMixin, CourseAPIMixin):  # pylint: disa
                 'label': _('Videos'),
                 'scope': 'course',
                 'lens': 'engagement',
-                'report': 'content',
+                'report': 'videos',
                 'depth': ''
             },
         ]
 
     def assertSecondaryNavs(self, nav, course_id):
         expected = self.get_expected_secondary_nav(course_id)
-        self.assertListEqual(nav, expected)
+        for i, expected_item in enumerate(expected):
+            self.assertDictEqual(nav[i], expected_item)
 
 
 @override_switch('enable_engagement_videos_pages', active=True)

analytics_dashboard/courses/utils.py

@@ -25,6 +25,11 @@ def get_encoded_module_id(module_id):
     return UsageKey.from_string(module_id).html_id()
 
 
+def get_page_name(page_name_object):
+    """Given a page_name object (scope, lens, report, depth), return a string with the levels concatenated in order."""
+    return '_'.join([page_name_object[lvl] for lvl in ['scope', 'lens', 'report', 'depth'] if page_name_object[lvl]])
+
+
 class number(object):
     @staticmethod
     def is_number(word):

analytics_dashboard/courses/views/__init__.py

@@ -29,7 +29,7 @@ from core.utils import CourseStructureApiClient, sanitize_cache_key
 from courses import permissions
 from courses.presenters.performance import CourseReportDownloadPresenter
 from courses.serializers import LazyEncoder
-from courses.utils import is_feature_enabled
+from courses.utils import is_feature_enabled, get_page_name
 
 from help.views import ContextSensitiveHelpMixin
 
@@ -140,8 +140,7 @@ class TrackedViewMixin(object):
 
     def get_context_data(self, **kwargs):
         context = super(TrackedViewMixin, self).get_context_data(**kwargs)
-        self.page_name['name'] = '_'.join([self.page_name[lvl]
-                                           for lvl in ['scope', 'lens', 'report', 'depth'] if self.page_name[lvl]])
+        self.page_name['name'] = get_page_name(self.page_name)
         context['js_data'] = context.get('js_data', {})
         context['js_data'].update({
             'tracking': {
@@ -454,7 +453,10 @@ class CourseTemplateView(ContextSensitiveHelpMixin, CourseContextMixin, CourseVi
     @property
     def help_token(self):
         # Rather than duplicate the definition, simply return the page name.
-        return self.page_name.get('name', 'default')
+        page_name = get_page_name(self.page_name)
+        if not page_name:
+            page_name = 'default'
+        return page_name
 
     def get_last_updated_message(self, last_updated):
         if last_updated:

analytics_dashboard/help/tests.py

@@ -42,7 +42,7 @@ class HelpURLMiddlewareTests(TestCase):
         self.assertHelpURLEqual('Not a real token', DOC_INDEX)
 
         # If the context has a valid page_token set, help_url should be set to the corresponding docs page.
-        self.assertHelpURLEqual('enrollment_activity', DOC_ENROLLMENT_ACTIVITY)
+        self.assertHelpURLEqual('course_enrollment_activity', DOC_ENROLLMENT_ACTIVITY)
 
     def test_process_template_response_with_error(self):
         """
@@ -67,4 +67,4 @@ class UtilsTests(TestCase):
         self.assertValidDocURL('Not a real token', DOC_INDEX)
 
         # If valid page_token passed, return the corresponding docs page.
-        self.assertValidDocURL('enrollment_activity', DOC_ENROLLMENT_ACTIVITY)
+        self.assertValidDocURL('course_enrollment_activity', DOC_ENROLLMENT_ACTIVITY)