Commit adc154ec by Clinton Blackburn Committed by Clinton Blackburn

Removed query counts from publisher tests

It is unclear what purpose these query counts serve. So far they have only served to slow down my own development on new functionality. If we actually need to optimize query counts in the future, we can do so where necessary.

LEARNER-2460
parent b0ce2758
......@@ -1317,7 +1317,7 @@ class DashboardTests(SiteMixin, TestCase):
self.client.logout()
self.client.login(username=UserFactory(), password=USER_PASSWORD)
response = self.assert_dashboard_response(
studio_count=0, published_count=0, progress_count=0, preview_count=0, queries_executed=12
studio_count=0, published_count=0, progress_count=0, preview_count=0
)
self._assert_tabs_with_roles(response)
......@@ -1325,7 +1325,7 @@ class DashboardTests(SiteMixin, TestCase):
def test_with_internal_group(self, tab):
""" Verify that internal user can see courses assigned to the groups. """
response = self.assert_dashboard_response(
studio_count=2, published_count=1, progress_count=2, preview_count=1, queries_executed=24
studio_count=2, published_count=1, progress_count=2, preview_count=1
)
self.assertContains(response, '<li role="tab" id="tab-{tab}" class="tab"'.format(tab=tab))
......@@ -1340,7 +1340,7 @@ class DashboardTests(SiteMixin, TestCase):
self.course_run_1.course.organizations.add(self.organization_extension.organization)
response = self.assert_dashboard_response(
studio_count=0, published_count=0, progress_count=0, preview_count=0, queries_executed=12
studio_count=0, published_count=0, progress_count=0, preview_count=0
)
self._assert_tabs_with_roles(response)
......@@ -1365,14 +1365,14 @@ class DashboardTests(SiteMixin, TestCase):
)
response = self.assert_dashboard_response(
studio_count=0, published_count=0, progress_count=2, preview_count=1, queries_executed=22
studio_count=0, published_count=0, progress_count=2, preview_count=1
)
self._assert_tabs_with_roles(response)
def test_studio_request_course_runs_as_pc(self):
""" Verify that PC user can see only those courses on which he is assigned as PC role. """
response = self.assert_dashboard_response(
studio_count=2, published_count=1, progress_count=2, preview_count=1, queries_executed=24
studio_count=2, published_count=1, progress_count=2, preview_count=1
)
self._assert_tabs_with_roles(response)
......@@ -1380,7 +1380,7 @@ class DashboardTests(SiteMixin, TestCase):
""" Verify that PC user can see only those courses on which he is assigned as PC role. """
self.user1.groups.remove(self.group_project_coordinator)
response = self.assert_dashboard_response(
studio_count=0, published_count=1, progress_count=2, preview_count=1, queries_executed=21
studio_count=0, published_count=1, progress_count=2, preview_count=1
)
self._assert_tabs_with_roles(response)
......@@ -1391,7 +1391,7 @@ class DashboardTests(SiteMixin, TestCase):
self.course_run_2.lms_course_id = 'test-2'
self.course_run_2.save()
response = self.assert_dashboard_response(
studio_count=0, published_count=1, progress_count=2, preview_count=1, queries_executed=22
studio_count=0, published_count=1, progress_count=2, preview_count=1
)
self.assertContains(response, 'No courses are currently ready for a Studio URL.')
......@@ -1400,7 +1400,7 @@ class DashboardTests(SiteMixin, TestCase):
self.course_run_3.course_run_state.name = CourseRunStateChoices.Draft
self.course_run_3.course_run_state.save()
response = self.assert_dashboard_response(
studio_count=3, published_count=0, progress_count=3, preview_count=1, queries_executed=25
studio_count=3, published_count=0, progress_count=3, preview_count=1
)
self.assertContains(response, 'No About pages have been published yet')
self._assert_tabs_with_roles(response)
......@@ -1408,7 +1408,7 @@ class DashboardTests(SiteMixin, TestCase):
def test_published_course_runs(self):
""" Verify that published tab loads course runs list. """
response = self.assert_dashboard_response(
studio_count=2, published_count=1, progress_count=2, preview_count=1, queries_executed=24
studio_count=2, published_count=1, progress_count=2, preview_count=1
)
self.assertContains(response, self.table_class.format(id='published'))
self.assertContains(response, 'About pages for the following course runs have been published in the')
......@@ -1426,7 +1426,7 @@ class DashboardTests(SiteMixin, TestCase):
# Verify that user cannot see any published course run
self.assert_dashboard_response(
studio_count=0, published_count=0, progress_count=0, preview_count=0, queries_executed=16
studio_count=0, published_count=0, progress_count=0, preview_count=0
)
# assign user course role
......@@ -1436,7 +1436,7 @@ class DashboardTests(SiteMixin, TestCase):
# Verify that user can see 1 published course run
response = self.assert_dashboard_response(
studio_count=0, published_count=1, progress_count=0, preview_count=0, queries_executed=17
studio_count=0, published_count=1, progress_count=0, preview_count=0
)
self._assert_tabs_with_roles(response)
......@@ -1450,14 +1450,14 @@ class DashboardTests(SiteMixin, TestCase):
publisher_admin.groups.add(Group.objects.get(name=ADMIN_GROUP_NAME))
self.client.login(username=publisher_admin.username, password=USER_PASSWORD)
response = self.assert_dashboard_response(
studio_count=4, published_count=1, progress_count=3, preview_count=1, queries_executed=21
studio_count=4, published_count=1, progress_count=3, preview_count=1
)
self._assert_tabs_with_roles(response)
def test_with_preview_ready_course_runs(self):
""" Verify that preview ready tabs loads the course runs list. """
response = self.assert_dashboard_response(
studio_count=2, preview_count=1, progress_count=2, published_count=1, queries_executed=24
studio_count=2, preview_count=1, progress_count=2, published_count=1
)
self.assertContains(response, self.table_class.format(id='preview'))
self.assertContains(response, 'About page previews for the following course runs are available for course team')
......@@ -1469,7 +1469,7 @@ class DashboardTests(SiteMixin, TestCase):
self.course_run_2.course_run_state.name = CourseRunStateChoices.Draft
self.course_run_2.course_run_state.save()
response = self.assert_dashboard_response(
studio_count=2, preview_count=0, progress_count=3, published_count=1, queries_executed=23
studio_count=2, preview_count=0, progress_count=3, published_count=1
)
self._assert_tabs_with_roles(response)
......@@ -1478,7 +1478,7 @@ class DashboardTests(SiteMixin, TestCase):
preview url is added or not.
"""
response = self.assert_dashboard_response(
studio_count=2, preview_count=1, progress_count=2, published_count=1, queries_executed=24
studio_count=2, preview_count=1, progress_count=2, published_count=1
)
self._assert_tabs_with_roles(response)
......@@ -1486,24 +1486,21 @@ class DashboardTests(SiteMixin, TestCase):
self.course_run_2.preview_url = None
self.course_run_2.save()
response = self.assert_dashboard_response(
studio_count=2, preview_count=1, progress_count=2, published_count=1, queries_executed=24
studio_count=2, preview_count=1, progress_count=2, published_count=1
)
self._assert_tabs_with_roles(response)
def test_with_in_progress_course_runs(self):
""" Verify that in progress tabs loads the course runs list. """
response = self.assert_dashboard_response(
studio_count=2, preview_count=1, progress_count=2, published_count=1, queries_executed=24
studio_count=2, preview_count=1, progress_count=2, published_count=1
)
self.assertContains(response, self.table_class.format(id='in-progress'))
self._assert_tabs_with_roles(response)
def assert_dashboard_response(
self, studio_count=0, published_count=0, progress_count=0, preview_count=0, queries_executed=0
):
def assert_dashboard_response(self, studio_count=0, published_count=0, progress_count=0, preview_count=0):
""" Dry method to assert the response."""
with self.assertNumQueries(queries_executed):
response = self.client.get(self.page_url)
response = self.client.get(self.page_url)
self.assertEqual(response.status_code, 200)
......@@ -1529,8 +1526,7 @@ class DashboardTests(SiteMixin, TestCase):
self.client.logout()
self.client.login(username=pc_user.username, password=USER_PASSWORD)
with self.assertNumQueries(12):
response = self.client.get(self.page_url)
response = self.client.get(self.page_url)
for tab in ['progress', 'preview', 'studio', 'published']:
self.assertContains(response, '<li role="tab" id="tab-{tab}" class="tab"'.format(tab=tab))
......@@ -1539,8 +1535,7 @@ class DashboardTests(SiteMixin, TestCase):
"""
Verify that site_name is available in context.
"""
with self.assertNumQueries(24):
response = self.client.get(self.page_url)
response = self.client.get(self.page_url)
site = Site.objects.first()
self.assertEqual(response.context['site_name'], site.name)
......@@ -1558,8 +1553,7 @@ class DashboardTests(SiteMixin, TestCase):
course_run.course_run_state.owner_role = PublisherUserRole.CourseTeam
course_run.course_run_state.save()
with self.assertNumQueries(26):
response = self.client.get(self.page_url)
response = self.client.get(self.page_url)
self._assert_filter_counts(response, 'All', 3)
self._assert_filter_counts(response, 'With Course Team', 2)
......@@ -1658,12 +1652,12 @@ class CourseListViewTests(SiteMixin, PaginationMixin, TestCase):
def test_courses_with_no_courses(self):
""" Verify that user cannot see any course on course list page. """
self.assert_course_list_page(course_count=0, queries_executed=9)
self.assert_course_list_page(course_count=0)
def test_courses_with_admin(self):
""" Verify that admin user can see all courses on course list page. """
self.user.groups.add(Group.objects.get(name=ADMIN_GROUP_NAME))
self.assert_course_list_page(course_count=10, queries_executed=33)
self.assert_course_list_page(course_count=10)
def test_courses_with_course_user_role(self):
""" Verify that internal user can see course on course list page. """
......@@ -1671,7 +1665,7 @@ class CourseListViewTests(SiteMixin, PaginationMixin, TestCase):
for course in self.courses:
factories.CourseUserRoleFactory(course=course, user=self.user, role=InternalUserRole.Publisher)
self.assert_course_list_page(course_count=10, queries_executed=34)
self.assert_course_list_page(course_count=10)
def test_courses_with_permission(self):
""" Verify that user can see course with permission on course list page. """
......@@ -1682,12 +1676,11 @@ class CourseListViewTests(SiteMixin, PaginationMixin, TestCase):
course.organizations.add(organization_extension.organization)
assign_perm(OrganizationExtension.VIEW_COURSE, organization_extension.group, organization_extension)
self.assert_course_list_page(course_count=10, queries_executed=66)
self.assert_course_list_page(course_count=10)
def assert_course_list_page(self, course_count, queries_executed):
def assert_course_list_page(self, course_count):
""" Dry method to assert course list page content. """
with self.assertNumQueries(queries_executed):
response = self.client.get(self.courses_url)
response = self.client.get(self.courses_url)
self.assertContains(response, '{} Courses'.format(course_count))
self.assertContains(response, 'Create New Course')
......@@ -1713,9 +1706,7 @@ class CourseListViewTests(SiteMixin, PaginationMixin, TestCase):
toggle_switch('publisher_hide_features_for_pilot', True)
with self.assertNumQueries(19):
response = self.get_courses()
response = self.get_courses()
edit_url['url'] = None
self.assertEqual(response[0]['edit_url'], edit_url)
......@@ -1732,10 +1723,7 @@ class CourseListViewTests(SiteMixin, PaginationMixin, TestCase):
assign_perm(OrganizationExtension.EDIT_COURSE, organization_extension.group, organization_extension)
toggle_switch('publisher_hide_features_for_pilot', False)
with self.assertNumQueries(23):
response = self.client.get(self.courses_url)
response = self.client.get(self.courses_url)
self.assertContains(response, 'Edit')
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment