From beb95eb69cf9eaf47e0b871d1d417f39ab949601 Mon Sep 17 00:00:00 2001
From: Nimisha Asthagiri <nasthagiri@edx.org>
Date: Sat, 28 Sep 2019 18:34:46 -0400
Subject: [PATCH] Python 3: assertIn -> assertContains consistency

---
 .../contentstore/tests/test_export_git.py     |  6 +-
 .../contentstore/views/tests/test_library.py  |  2 +-
 .../contentstore/views/tests/test_videos.py   |  6 +-
 cms/djangoapps/maintenance/tests.py           |  4 +-
 lms/djangoapps/branding/tests/test_views.py   |  2 +-
 .../bulk_email/tests/test_course_optout.py    |  2 +-
 .../certificates/tests/test_views.py          |  4 +-
 .../certificates/tests/test_webview_views.py  | 92 +++++++++----------
 .../courseware/tests/test_entrance_exam.py    |  2 +-
 .../courseware/tests/test_navigation.py       |  6 +-
 lms/djangoapps/courseware/tests/test_views.py |  2 +-
 .../dashboard/tests/test_sysadmin.py          | 10 +-
 lms/djangoapps/instructor/tests/test_api.py   | 18 ++--
 .../tests/test_tasks_helper.py                |  8 +-
 .../shoppingcart/tests/test_views.py          | 10 +-
 15 files changed, 87 insertions(+), 87 deletions(-)

diff --git a/cms/djangoapps/contentstore/tests/test_export_git.py b/cms/djangoapps/contentstore/tests/test_export_git.py
index 8b9e5f3b3f..a969968cac 100644
--- a/cms/djangoapps/contentstore/tests/test_export_git.py
+++ b/cms/djangoapps/contentstore/tests/test_export_git.py
@@ -88,7 +88,7 @@ class TestExportGit(CourseTestCase):
         modulestore().update_item(self.course_module, self.user.id)
 
         response = self.client.get('{}?action=push'.format(self.test_url))
-        self.assertIn('Export Failed:', response.content.decode('utf-8'))
+        self.assertContains(response, 'Export Failed:')
 
     def test_exception_translation(self):
         """
@@ -107,7 +107,7 @@ class TestExportGit(CourseTestCase):
 
         self.make_bare_repo_with_course('test_repo')
         response = self.client.get('{}?action=push'.format(self.test_url))
-        self.assertIn('Export Succeeded', response.content.decode('utf-8'))
+        self.assertContains(response, 'Export Succeeded')
 
     def test_repo_with_dots(self):
         """
@@ -115,7 +115,7 @@ class TestExportGit(CourseTestCase):
         """
         self.make_bare_repo_with_course('test.repo')
         response = self.client.get('{}?action=push'.format(self.test_url))
-        self.assertIn('Export Succeeded', response.content.decode('utf-8'))
+        self.assertContains(response, 'Export Succeeded')
 
     def test_dirty_repo(self):
         """
diff --git a/cms/djangoapps/contentstore/views/tests/test_library.py b/cms/djangoapps/contentstore/views/tests/test_library.py
index c324fc8fd8..2b052db99c 100644
--- a/cms/djangoapps/contentstore/views/tests/test_library.py
+++ b/cms/djangoapps/contentstore/views/tests/test_library.py
@@ -341,4 +341,4 @@ class UnitTestLibraries(CourseTestCase):
         # Now extra_user should apear in the list:
         response = self.client.get(manage_users_url)
         self.assertEqual(response.status_code, 200)
-        self.assertIn(extra_user.username, response.content.decode('utf-8'))
+        self.assertContains(response, extra_user.username)
diff --git a/cms/djangoapps/contentstore/views/tests/test_videos.py b/cms/djangoapps/contentstore/views/tests/test_videos.py
index 4bcc27ab9e..d4f6ac2d6c 100644
--- a/cms/djangoapps/contentstore/views/tests/test_videos.py
+++ b/cms/djangoapps/contentstore/views/tests/test_videos.py
@@ -325,10 +325,10 @@ class VideosHandlerTestCase(VideoUploadTestMixin, CourseTestCase):
         response = self.client.get(self.url)
         self.assertEqual(response.status_code, 200)
         self.assertRegexpMatches(response["Content-Type"], "^text/html(;.*)?$")
-        self.assertIn(_get_default_video_image_url(), response.content.decode('utf-8'))
+        self.assertContains(response, _get_default_video_image_url())
         # Crude check for presence of data in returned HTML
         for video in self.previous_uploads:
-            self.assertIn(video["edx_video_id"], response.content.decode('utf-8'))
+            self.assertContains(response, video["edx_video_id"])
         self.assertNotContains(response, 'video_upload_pagination')
 
     @override_waffle_flag(ENABLE_VIDEO_UPLOAD_PAGINATION, active=True)
@@ -338,7 +338,7 @@ class VideosHandlerTestCase(VideoUploadTestMixin, CourseTestCase):
         """
         response = self.client.get(self.url)
         self.assertEqual(response.status_code, 200)
-        self.assertIn('video_upload_pagination', response.content.decode('utf-8'))
+        self.assertContains(response, 'video_upload_pagination')
 
     def test_post_non_json(self):
         response = self.client.post(self.url, {"files": []})
diff --git a/cms/djangoapps/maintenance/tests.py b/cms/djangoapps/maintenance/tests.py
index 9887caa733..4135de466e 100644
--- a/cms/djangoapps/maintenance/tests.py
+++ b/cms/djangoapps/maintenance/tests.py
@@ -289,7 +289,7 @@ class TestAnnouncementsViews(MaintenanceViewTestCase):
         """
         url = reverse("maintenance:announcement_index")
         response = self.client.get(url)
-        self.assertIn('<div class="announcement-container">', response.content.decode('utf-8'))
+        self.assertContains(response, '<div class="announcement-container">')
 
     def test_create(self):
         """
@@ -308,7 +308,7 @@ class TestAnnouncementsViews(MaintenanceViewTestCase):
         announcement.save()
         url = reverse("maintenance:announcement_edit", kwargs={"pk": announcement.pk})
         response = self.client.get(url)
-        self.assertIn('<div class="wrapper-form announcement-container">', response.content.decode('utf-8'))
+        self.assertContains(response, '<div class="wrapper-form announcement-container">')
         self.client.post(url, {"content": "Test Edit Announcement", "active": True})
         announcement = Announcement.objects.get(pk=announcement.pk)
         self.assertEquals(announcement.content, "Test Edit Announcement")
diff --git a/lms/djangoapps/branding/tests/test_views.py b/lms/djangoapps/branding/tests/test_views.py
index 9900e24aeb..628619afa9 100644
--- a/lms/djangoapps/branding/tests/test_views.py
+++ b/lms/djangoapps/branding/tests/test_views.py
@@ -315,4 +315,4 @@ class TestIndex(SiteMixin, TestCase):
         self.use_site(self.site_other)
         self.client.login(username=self.user.username, password="password")
         response = self.client.get(reverse("dashboard"))
-        self.assertIn(self.site_configuration_other.values["MKTG_URLS"]["ROOT"], response.content.decode('utf-8'))
+        self.assertContains(response, self.site_configuration_other.values["MKTG_URLS"]["ROOT"])
diff --git a/lms/djangoapps/bulk_email/tests/test_course_optout.py b/lms/djangoapps/bulk_email/tests/test_course_optout.py
index 8407889567..ae705a7c3c 100644
--- a/lms/djangoapps/bulk_email/tests/test_course_optout.py
+++ b/lms/djangoapps/bulk_email/tests/test_course_optout.py
@@ -57,7 +57,7 @@ class TestOptoutCourseEmails(ModuleStoreTestCase):
         response = self.client.get(url)
         email_section = '<div class="vert-left send-email" id="section-send-email">'
         # If this fails, it is likely because BulkEmailFlag.is_enabled() is set to False
-        self.assertIn(email_section, response.content.decode('utf-8'))
+        self.assertContains(response, email_section)
 
     def test_optout_course(self):
         """
diff --git a/lms/djangoapps/certificates/tests/test_views.py b/lms/djangoapps/certificates/tests/test_views.py
index c008d877c4..9af3af3002 100644
--- a/lms/djangoapps/certificates/tests/test_views.py
+++ b/lms/djangoapps/certificates/tests/test_views.py
@@ -295,7 +295,7 @@ class CertificatesViewsSiteTests(ModuleStoreTestCase):
         self.assertIn(
             'My Platform Site offers interactive online classes and MOOCs.', response.content.decode('utf-8')
         )
-        self.assertIn('About My Platform Site', response.content.decode('utf-8'))
+        self.assertContains(response, 'About My Platform Site')
 
     @override_settings(FEATURES=FEATURES_WITH_CERTS_ENABLED)
     def test_html_view_site_configuration_missing(self):
@@ -305,7 +305,7 @@ class CertificatesViewsSiteTests(ModuleStoreTestCase):
         )
         self._add_course_certificates(count=1, signatory_count=2)
         response = self.client.get(test_url)
-        self.assertIn('edX', response.content.decode('utf-8'))
+        self.assertContains(response, 'edX')
         self.assertNotContains(response, 'My Platform Site')
         self.assertNotIn(
             'This should not survive being overwritten by static content', response.content.decode('utf-8')
diff --git a/lms/djangoapps/certificates/tests/test_webview_views.py b/lms/djangoapps/certificates/tests/test_webview_views.py
index cd4e7563b0..a74e87f03e 100644
--- a/lms/djangoapps/certificates/tests/test_webview_views.py
+++ b/lms/djangoapps/certificates/tests/test_webview_views.py
@@ -319,8 +319,8 @@ class CertificatesViewsTests(CommonCertificatesTestCase, CacheIsolationTestCase)
         test_url = get_certificate_url(course_id=self.cert.course_id, uuid=self.cert.verify_uuid)
         response = self.client.get(test_url, HTTP_HOST='test.localhost')
         self.assertEqual(response.status_code, 200)
-        self.assertIn("Post on Facebook", response.content.decode('utf-8'))
-        self.assertIn('test_facebook_my_site', response.content.decode('utf-8'))
+        self.assertContains(response, "Post on Facebook")
+        self.assertContains(response, 'test_facebook_my_site')
 
     @override_settings(FEATURES=FEATURES_WITH_CERTS_ENABLED)
     @ddt.data(
@@ -569,19 +569,19 @@ class CertificatesViewsTests(CommonCertificatesTestCase, CacheIsolationTestCase)
             course_id=six.text_type(self.course.id)
         )
         response = self.client.get(test_url)
-        self.assertIn(str(self.cert.verify_uuid), response.content.decode('utf-8'))
+        self.assertContains(response, str(self.cert.verify_uuid))
 
         # Hit any "verified" mode-specific branches
         self.cert.mode = 'verified'
         self.cert.save()
         response = self.client.get(test_url)
-        self.assertIn(str(self.cert.verify_uuid), response.content.decode('utf-8'))
+        self.assertContains(response, str(self.cert.verify_uuid))
 
         # Hit any 'xseries' mode-specific branches
         self.cert.mode = 'xseries'
         self.cert.save()
         response = self.client.get(test_url)
-        self.assertIn(str(self.cert.verify_uuid), response.content.decode('utf-8'))
+        self.assertContains(response, str(self.cert.verify_uuid))
 
     @override_settings(FEATURES=FEATURES_WITH_CERTS_ENABLED)
     def test_render_certificate_only_for_downloadable_status(self):
@@ -597,15 +597,15 @@ class CertificatesViewsTests(CommonCertificatesTestCase, CacheIsolationTestCase)
 
         # Validate certificate
         response = self.client.get(test_url)
-        self.assertIn(str(self.cert.verify_uuid), response.content.decode('utf-8'))
+        self.assertContains(response, str(self.cert.verify_uuid))
 
         # Change status to 'generating' and validate that Certificate Web View returns "Invalid Certificate"
         self.cert.status = CertificateStatuses.generating
         self.cert.save()
         response = self.client.get(test_url)
-        self.assertIn("Invalid Certificate", response.content.decode('utf-8'))
-        self.assertIn("Cannot Find Certificate", response.content.decode('utf-8'))
-        self.assertIn("We cannot find a certificate with this URL or ID number.", response.content.decode('utf-8'))
+        self.assertContains(response, "Invalid Certificate")
+        self.assertContains(response, "Cannot Find Certificate")
+        self.assertContains(response, "We cannot find a certificate with this URL or ID number.")
 
     @ddt.data(
         (CertificateStatuses.downloadable, True),
@@ -632,11 +632,11 @@ class CertificatesViewsTests(CommonCertificatesTestCase, CacheIsolationTestCase)
         response = self.client.get(test_url)
 
         if eligible_for_certificate:
-            self.assertIn(str(self.cert.verify_uuid), response.content.decode('utf-8'))
+            self.assertContains(response, str(self.cert.verify_uuid))
         else:
-            self.assertIn("Invalid Certificate", response.content.decode('utf-8'))
-            self.assertIn("Cannot Find Certificate", response.content.decode('utf-8'))
-            self.assertIn("We cannot find a certificate with this URL or ID number.", response.content.decode('utf-8'))
+            self.assertContains(response, "Invalid Certificate")
+            self.assertContains(response, "Cannot Find Certificate")
+            self.assertContains(response, "We cannot find a certificate with this URL or ID number.")
             self.assertNotContains(response, str(self.cert.verify_uuid))
 
     @override_settings(FEATURES=FEATURES_WITH_CERTS_ENABLED)
@@ -652,14 +652,14 @@ class CertificatesViewsTests(CommonCertificatesTestCase, CacheIsolationTestCase)
 
         # Validate certificate
         response = self.client.get(test_url)
-        self.assertIn(str(self.cert.verify_uuid), response.content.decode('utf-8'))
+        self.assertContains(response, str(self.cert.verify_uuid))
 
         # invalidate certificate and verify that "Cannot Find Certificate" is returned
         self.cert.invalidate()
         response = self.client.get(test_url)
-        self.assertIn("Invalid Certificate", response.content.decode('utf-8'))
-        self.assertIn("Cannot Find Certificate", response.content.decode('utf-8'))
-        self.assertIn("We cannot find a certificate with this URL or ID number.", response.content.decode('utf-8'))
+        self.assertContains(response, "Invalid Certificate")
+        self.assertContains(response, "Cannot Find Certificate")
+        self.assertContains(response, "We cannot find a certificate with this URL or ID number.")
 
     @override_settings(FEATURES=FEATURES_WITH_CERTS_ENABLED)
     def test_html_lang_attribute_is_dynamic_for_invalid_certificate_html_view(self):
@@ -677,12 +677,12 @@ class CertificatesViewsTests(CommonCertificatesTestCase, CacheIsolationTestCase)
         user_language = 'fr'
         self.client.cookies[settings.LANGUAGE_COOKIE] = user_language
         response = self.client.get(test_url)
-        self.assertIn('<html class="no-js" lang="fr">', response.content.decode('utf-8'))
+        self.assertContains(response, '<html class="no-js" lang="fr">')
 
         user_language = 'ar'
         self.client.cookies[settings.LANGUAGE_COOKIE] = user_language
         response = self.client.get(test_url)
-        self.assertIn('<html class="no-js" lang="ar">', response.content.decode('utf-8'))
+        self.assertContains(response, '<html class="no-js" lang="ar">')
 
     @override_settings(FEATURES=FEATURES_WITH_CERTS_ENABLED)
     def test_html_lang_attribute_is_dynamic_for_certificate_html_view(self):
@@ -698,12 +698,12 @@ class CertificatesViewsTests(CommonCertificatesTestCase, CacheIsolationTestCase)
         user_language = 'fr'
         self.client.cookies[settings.LANGUAGE_COOKIE] = user_language
         response = self.client.get(test_url)
-        self.assertIn('<html class="no-js" lang="fr">', response.content.decode('utf-8'))
+        self.assertContains(response, '<html class="no-js" lang="fr">')
 
         user_language = 'ar'
         self.client.cookies[settings.LANGUAGE_COOKIE] = user_language
         response = self.client.get(test_url)
-        self.assertIn('<html class="no-js" lang="ar">', response.content.decode('utf-8'))
+        self.assertContains(response, '<html class="no-js" lang="ar">')
 
     @override_settings(FEATURES=FEATURES_WITH_CERTS_ENABLED)
     def test_html_view_for_non_viewable_certificate_and_for_student_user(self):
@@ -730,9 +730,9 @@ class CertificatesViewsTests(CommonCertificatesTestCase, CacheIsolationTestCase)
             course_id=six.text_type(self.course.id)
         )
         response = self.client.get(test_url)
-        self.assertIn("Invalid Certificate", response.content.decode('utf-8'))
-        self.assertIn("Cannot Find Certificate", response.content.decode('utf-8'))
-        self.assertIn("We cannot find a certificate with this URL or ID number.", response.content.decode('utf-8'))
+        self.assertContains(response, "Invalid Certificate")
+        self.assertContains(response, "Cannot Find Certificate")
+        self.assertContains(response, "We cannot find a certificate with this URL or ID number.")
 
     @override_settings(FEATURES=FEATURES_WITH_CERTS_ENABLED)
     def test_render_html_view_with_valid_signatories(self):
@@ -743,11 +743,11 @@ class CertificatesViewsTests(CommonCertificatesTestCase, CacheIsolationTestCase)
         )
 
         response = self.client.get(test_url)
-        self.assertIn('course_title_0', response.content.decode('utf-8'))
-        self.assertIn('Signatory_Name 0', response.content.decode('utf-8'))
-        self.assertIn('Signatory_Title 0', response.content.decode('utf-8'))
-        self.assertIn('Signatory_Organization 0', response.content.decode('utf-8'))
-        self.assertIn('/static/certificates/images/demo-sig0.png', response.content.decode('utf-8'))
+        self.assertContains(response, 'course_title_0')
+        self.assertContains(response, 'Signatory_Name 0')
+        self.assertContains(response, 'Signatory_Title 0')
+        self.assertContains(response, 'Signatory_Organization 0')
+        self.assertContains(response, '/static/certificates/images/demo-sig0.png')
 
     @override_settings(FEATURES=FEATURES_WITH_CERTS_ENABLED)
     def test_course_display_name_not_override_with_course_title(self):
@@ -773,7 +773,7 @@ class CertificatesViewsTests(CommonCertificatesTestCase, CacheIsolationTestCase)
 
         response = self.client.get(test_url)
         self.assertNotContains(response, 'test_course_title_0')
-        self.assertIn('refundable course', response.content.decode('utf-8'))
+        self.assertContains(response, 'refundable course')
 
     @override_settings(FEATURES=FEATURES_WITH_CERTS_ENABLED)
     def test_course_display_overrides(self):
@@ -794,8 +794,8 @@ class CertificatesViewsTests(CommonCertificatesTestCase, CacheIsolationTestCase)
         self.store.update_item(self.course, self.user.id)
 
         response = self.client.get(test_url)
-        self.assertIn('overridden_number', response.content.decode('utf-8'))
-        self.assertIn('overridden_org', response.content.decode('utf-8'))
+        self.assertContains(response, 'overridden_number')
+        self.assertContains(response, 'overridden_org')
 
     @override_settings(FEATURES=FEATURES_WITH_CERTS_ENABLED)
     def test_certificate_view_without_org_logo(self):
@@ -858,7 +858,7 @@ class CertificatesViewsTests(CommonCertificatesTestCase, CacheIsolationTestCase)
         )
         response = self.client.get(test_url)
         self.assertNotContains(response, '<script>')
-        self.assertIn('&lt;script&gt;course_title&lt;/script&gt;', response.content.decode('utf-8'))
+        self.assertContains(response, '&lt;script&gt;course_title&lt;/script&gt;')
 
     @override_settings(FEATURES=FEATURES_WITH_CERTS_DISABLED)
     def test_render_html_view_disabled_feature_flag_returns_static_url(self):
@@ -875,7 +875,7 @@ class CertificatesViewsTests(CommonCertificatesTestCase, CacheIsolationTestCase)
             course_id="missing/course/key"
         )
         response = self.client.get(test_url)
-        self.assertIn('invalid', response.content.decode('utf-8'))
+        self.assertContains(response, 'invalid')
 
     @override_settings(FEATURES=FEATURES_WITH_CERTS_ENABLED)
     def test_render_html_view_invalid_user(self):
@@ -885,7 +885,7 @@ class CertificatesViewsTests(CommonCertificatesTestCase, CacheIsolationTestCase)
             course_id=six.text_type(self.course.id)
         )
         response = self.client.get(test_url)
-        self.assertIn('invalid', response.content.decode('utf-8'))
+        self.assertContains(response, 'invalid')
 
     @override_settings(FEATURES=FEATURES_WITH_CERTS_ENABLED)
     def test_render_html_view_non_int_user(self):
@@ -908,7 +908,7 @@ class CertificatesViewsTests(CommonCertificatesTestCase, CacheIsolationTestCase)
         self.assertListEqual(list(GeneratedCertificate.eligible_certificates.all()), [])
 
         response = self.client.get(test_url)
-        self.assertIn('invalid', response.content.decode('utf-8'))
+        self.assertContains(response, 'invalid')
 
     @override_settings(FEATURES=FEATURES_WITH_CERTS_ENABLED, PLATFORM_NAME=u'Űńíćődé Űńívéŕśítӳ')
     def test_render_html_view_with_unicode_platform_name(self):
@@ -937,21 +937,21 @@ class CertificatesViewsTests(CommonCertificatesTestCase, CacheIsolationTestCase)
         response = self.client.get(test_url + '?preview=honor')
         # accessing certificate web view in preview mode without
         # staff or instructor access should show invalid certificate
-        self.assertIn('Cannot Find Certificate', response.content.decode('utf-8'))
+        self.assertContains(response, 'Cannot Find Certificate')
 
         CourseStaffRole(self.course.id).add_users(self.user)
 
         response = self.client.get(test_url + '?preview=honor')
         self.assertNotContains(response, self.course.display_name.encode('utf-8'))
-        self.assertIn('course_title_0', response.content.decode('utf-8'))
-        self.assertIn('Signatory_Title 0', response.content.decode('utf-8'))
+        self.assertContains(response, 'course_title_0')
+        self.assertContains(response, 'Signatory_Title 0')
 
         # mark certificate inactive but accessing in preview mode.
         self._add_course_certificates(count=1, signatory_count=2, is_active=False)
         response = self.client.get(test_url + '?preview=honor')
         self.assertNotContains(response, self.course.display_name.encode('utf-8'))
-        self.assertIn('course_title_0', response.content.decode('utf-8'))
-        self.assertIn('Signatory_Title 0', response.content.decode('utf-8'))
+        self.assertContains(response, 'course_title_0')
+        self.assertContains(response, 'Signatory_Title 0')
 
     @override_settings(FEATURES=FEATURES_WITH_CERTS_ENABLED)
     def test_render_html_view_with_preview_mode_when_user_already_has_cert(self):
@@ -971,8 +971,8 @@ class CertificatesViewsTests(CommonCertificatesTestCase, CacheIsolationTestCase)
         # so let's try to preview in 'verified' mode.
         response = self.client.get(test_url + '?preview=verified')
         self.assertNotContains(response, self.course.display_name.encode('utf-8'))
-        self.assertIn('course_title_0', response.content.decode('utf-8'))
-        self.assertIn('Signatory_Title 0', response.content.decode('utf-8'))
+        self.assertContains(response, 'course_title_0')
+        self.assertContains(response, 'Signatory_Title 0')
 
     @override_settings(FEATURES=FEATURES_WITH_CERTS_ENABLED)
     @ddt.data(
@@ -1019,7 +1019,7 @@ class CertificatesViewsTests(CommonCertificatesTestCase, CacheIsolationTestCase)
             course_id=six.text_type(self.course.id)
         )
         response = self.client.get(test_url)
-        self.assertIn("Invalid Certificate", response.content.decode('utf-8'))
+        self.assertContains(response, "Invalid Certificate")
 
     @override_settings(FEATURES=FEATURES_WITH_CERTS_ENABLED)
     def test_render_500_view_invalid_certificate_configuration(self):
@@ -1031,7 +1031,7 @@ class CertificatesViewsTests(CommonCertificatesTestCase, CacheIsolationTestCase)
             course_id=six.text_type(self.course.id)
         )
         response = self.client.get(test_url + "?preview=honor")
-        self.assertIn("Invalid Certificate Configuration", response.content.decode('utf-8'))
+        self.assertContains(response, "Invalid Certificate Configuration")
 
         # Verify that Exception is raised when certificate is not in the preview mode
         with self.assertRaises(Exception):
@@ -1529,7 +1529,7 @@ class CertificatesViewsTests(CommonCertificatesTestCase, CacheIsolationTestCase)
         response = self.client.get(test_url)
         self.assertEqual(response.status_code, 200)
         if include_effort:
-            self.assertIn('hours of effort: 40', response.content.decode('utf-8'))
+            self.assertContains(response, 'hours of effort: 40')
         else:
             self.assertNotContains(response, 'hours of effort')
 
diff --git a/lms/djangoapps/courseware/tests/test_entrance_exam.py b/lms/djangoapps/courseware/tests/test_entrance_exam.py
index 1aad2624af..fa1009eb82 100644
--- a/lms/djangoapps/courseware/tests/test_entrance_exam.py
+++ b/lms/djangoapps/courseware/tests/test_entrance_exam.py
@@ -552,7 +552,7 @@ class EntranceExamTestCases(LoginEnrollmentTestCase, ModuleStoreTestCase, Milest
             'problem_check',
         )
         self.assertEqual(response.status_code, 200)
-        self.assertIn('entrance_exam_passed', response.content.decode('utf-8'))
+        self.assertContains(response, 'entrance_exam_passed')
 
     def _assert_chapter_loaded(self, course, chapter):
         """
diff --git a/lms/djangoapps/courseware/tests/test_navigation.py b/lms/djangoapps/courseware/tests/test_navigation.py
index 769cd21e45..1f558c3f7d 100644
--- a/lms/djangoapps/courseware/tests/test_navigation.py
+++ b/lms/djangoapps/courseware/tests/test_navigation.py
@@ -242,7 +242,7 @@ class TestNavigation(SharedModuleStoreTestCase, LoginEnrollmentTestCase):
             kwargs={'course_id': test_course_id}
         )
         response = self.assert_request_status_code(200, url)
-        self.assertIn("No content has been added to this course", response.content.decode('utf-8'))
+        self.assertContains(response, "No content has been added to this course")
 
         section = ItemFactory.create(
             parent_location=self.test_course.location,
@@ -254,7 +254,7 @@ class TestNavigation(SharedModuleStoreTestCase, LoginEnrollmentTestCase):
         )
         response = self.assert_request_status_code(200, url)
         self.assertNotContains(response, "No content has been added to this course")
-        self.assertIn("New Section", response.content.decode('utf-8'))
+        self.assertContains(response, "New Section")
 
         subsection = ItemFactory.create(
             parent_location=section.location,
@@ -265,7 +265,7 @@ class TestNavigation(SharedModuleStoreTestCase, LoginEnrollmentTestCase):
             kwargs={'course_id': test_course_id}
         )
         response = self.assert_request_status_code(200, url)
-        self.assertIn("New Subsection", response.content.decode('utf-8'))
+        self.assertContains(response, "New Subsection")
         self.assertNotContains(response, "sequence-nav")
 
         ItemFactory.create(
diff --git a/lms/djangoapps/courseware/tests/test_views.py b/lms/djangoapps/courseware/tests/test_views.py
index 63f91191f1..ad827be7b6 100644
--- a/lms/djangoapps/courseware/tests/test_views.py
+++ b/lms/djangoapps/courseware/tests/test_views.py
@@ -2386,7 +2386,7 @@ class TestIndexView(ModuleStoreTestCase):
                 }
             ) + '?activate_block_id=test_block_id'
         )
-        self.assertIn("Activate Block ID: test_block_id", response.content.decode('utf-8'))
+        self.assertContains(response, "Activate Block ID: test_block_id")
 
     @ddt.data(
         [False, COURSE_VISIBILITY_PRIVATE, CourseUserType.ANONYMOUS, False],
diff --git a/lms/djangoapps/dashboard/tests/test_sysadmin.py b/lms/djangoapps/dashboard/tests/test_sysadmin.py
index 3bdb9d5a41..067c08bcbd 100644
--- a/lms/djangoapps/dashboard/tests/test_sysadmin.py
+++ b/lms/djangoapps/dashboard/tests/test_sysadmin.py
@@ -212,13 +212,13 @@ class TestSysAdminMongoCourseImport(SysadminBaseTestCase):
         response = self.client.get(reverse('gitlogs'))
 
         # Check that our earlier import has a log with a link to details
-        self.assertIn('/gitlogs/course-v1:MITx+edx4edx+edx4edx', response.content.decode('utf-8'))
+        self.assertContains(response, '/gitlogs/course-v1:MITx+edx4edx+edx4edx')
 
         response = self.client.get(
             reverse('gitlogs_detail', kwargs={
                 'course_id': 'course-v1:MITx+edx4edx+edx4edx'}))
 
-        self.assertIn('======&gt; IMPORTING course', response.content.decode('utf-8'))
+        self.assertContains(response, '======&gt; IMPORTING course')
 
         self._rm_edx4edx()
 
@@ -247,7 +247,7 @@ class TestSysAdminMongoCourseImport(SysadminBaseTestCase):
             with (override_settings(TIME_ZONE=timezone)):
                 date_text = get_time_display(date, tz_format, settings.TIME_ZONE)
                 response = self.client.get(reverse('gitlogs'))
-                self.assertIn(date_text, response.content.decode('UTF-8'))
+                self.assertContains(response, date_text)
 
         self._rm_edx4edx()
 
@@ -284,7 +284,7 @@ class TestSysAdminMongoCourseImport(SysadminBaseTestCase):
                 'course_id': 'course-v1:MITx+edx4edx+edx4edx'
             })
         )
-        self.assertIn('No git import logs have been recorded for this course.', response.content.decode('utf-8'))
+        self.assertContains(response, 'No git import logs have been recorded for this course.')
 
         self._rm_edx4edx()
 
@@ -358,6 +358,6 @@ class TestSysAdminMongoCourseImport(SysadminBaseTestCase):
             reverse('gitlogs_detail', kwargs={
                 'course_id': 'course-v1:MITx+edx4edx+edx4edx'
             }))
-        self.assertIn('======&gt; IMPORTING course', response.content.decode('utf-8'))
+        self.assertContains(response, '======&gt; IMPORTING course')
 
         self._rm_edx4edx()
diff --git a/lms/djangoapps/instructor/tests/test_api.py b/lms/djangoapps/instructor/tests/test_api.py
index 3c1b9f7f5e..428275f106 100644
--- a/lms/djangoapps/instructor/tests/test_api.py
+++ b/lms/djangoapps/instructor/tests/test_api.py
@@ -2643,7 +2643,7 @@ class TestInstructorAPILevelsDataDump(SharedModuleStoreTestCase, LoginEnrollment
         response = self.client.get(redeem_url)
         self.assertEquals(response.status_code, 200)
         # check button text
-        self.assertIn('Activate Course Enrollment', response.content.decode('utf-8'))
+        self.assertContains(response, 'Activate Course Enrollment')
 
         response = self.client.post(redeem_url)
         self.assertEquals(response.status_code, 200)
@@ -3176,7 +3176,7 @@ class TestInstructorAPILevelsDataDump(SharedModuleStoreTestCase, LoginEnrollment
         self.client.login(username=self.instructor.username, password='test')
         url = reverse('get_enrollment_report', kwargs={'course_id': text_type(self.course.id)})
         response = self.client.post(url, {})
-        self.assertIn('The detailed enrollment report is being created.', response.content.decode('utf-8'))
+        self.assertContains(response, 'The detailed enrollment report is being created.')
 
     def test_bulk_purchase_detailed_report(self):
         """
@@ -3231,7 +3231,7 @@ class TestInstructorAPILevelsDataDump(SharedModuleStoreTestCase, LoginEnrollment
 
         url = reverse('get_enrollment_report', kwargs={'course_id': text_type(self.course.id)})
         response = self.client.post(url, {})
-        self.assertIn('The detailed enrollment report is being created.', response.content.decode('utf-8'))
+        self.assertContains(response, 'The detailed enrollment report is being created.')
 
     def test_create_registration_code_without_invoice_and_order(self):
         """
@@ -3253,7 +3253,7 @@ class TestInstructorAPILevelsDataDump(SharedModuleStoreTestCase, LoginEnrollment
 
         url = reverse('get_enrollment_report', kwargs={'course_id': text_type(self.course.id)})
         response = self.client.post(url, {})
-        self.assertIn('The detailed enrollment report is being created.', response.content.decode('utf-8'))
+        self.assertContains(response, 'The detailed enrollment report is being created.')
 
     def test_invoice_payment_is_still_pending_for_registration_codes(self):
         """
@@ -3278,7 +3278,7 @@ class TestInstructorAPILevelsDataDump(SharedModuleStoreTestCase, LoginEnrollment
 
         url = reverse('get_enrollment_report', kwargs={'course_id': text_type(self.course.id)})
         response = self.client.post(url, {})
-        self.assertIn('The detailed enrollment report is being created.', response.content.decode('utf-8'))
+        self.assertContains(response, 'The detailed enrollment report is being created.')
 
     @patch('lms.djangoapps.instructor.views.api.anonymous_id_for_user', Mock(return_value='42'))
     @patch('lms.djangoapps.instructor.views.api.unique_id_for_user', Mock(return_value='41'))
@@ -3358,11 +3358,11 @@ class TestInstructorAPILevelsDataDump(SharedModuleStoreTestCase, LoginEnrollment
 
             if report_type == 'problem responses':
                 response = self.client.post(url, {'problem_location': ''})
-                self.assertIn(success_status, response.content.decode('utf-8'))
+                self.assertContains(response, success_status)
             else:
                 CourseFinanceAdminRole(self.course.id).add_users(self.instructor)
                 response = self.client.post(url, {})
-                self.assertIn(success_status, response.content.decode('utf-8'))
+                self.assertContains(response, success_status)
 
     @ddt.data(*EXECUTIVE_SUMMARY_DATA)
     @ddt.unpack
@@ -3384,7 +3384,7 @@ class TestInstructorAPILevelsDataDump(SharedModuleStoreTestCase, LoginEnrollment
         success_status = u"The {report_type} report is being created." \
                          " To view the status of the report, see Pending" \
                          " Tasks below".format(report_type=report_type)
-        self.assertIn(success_status, response.content.decode('utf-8'))
+        self.assertContains(response, success_status)
 
     @ddt.data(*EXECUTIVE_SUMMARY_DATA)
     @ddt.unpack
@@ -3415,7 +3415,7 @@ class TestInstructorAPILevelsDataDump(SharedModuleStoreTestCase, LoginEnrollment
             mock_submit_ora2_task.return_value = True
             response = self.client.post(url, {})
         success_status = "The ORA data report is being created."
-        self.assertIn(success_status, response.content.decode('utf-8'))
+        self.assertContains(response, success_status)
 
     def test_get_ora2_responses_already_running(self):
         url = reverse('export_ora2_data', kwargs={'course_id': text_type(self.course.id)})
diff --git a/lms/djangoapps/instructor_task/tests/test_tasks_helper.py b/lms/djangoapps/instructor_task/tests/test_tasks_helper.py
index 449625a3d3..3c05f59766 100644
--- a/lms/djangoapps/instructor_task/tests/test_tasks_helper.py
+++ b/lms/djangoapps/instructor_task/tests/test_tasks_helper.py
@@ -768,7 +768,7 @@ class TestInstructorDetailedEnrollmentReport(TestReportMixin, InstructorTaskCour
         response = self.client.get(redeem_url)
         self.assertEquals(response.status_code, 200)
         # check button text
-        self.assertIn('Activate Course Enrollment', response.content.decode('utf-8'))
+        self.assertContains(response, 'Activate Course Enrollment')
 
         response = self.client.post(redeem_url)
         self.assertEquals(response.status_code, 200)
@@ -802,7 +802,7 @@ class TestInstructorDetailedEnrollmentReport(TestReportMixin, InstructorTaskCour
         response = self.client.get(redeem_url)
         self.assertEquals(response.status_code, 200)
         # check button text
-        self.assertIn('Activate Course Enrollment', response.content.decode('utf-8'))
+        self.assertContains(response, 'Activate Course Enrollment')
 
         response = self.client.post(redeem_url)
         self.assertEquals(response.status_code, 200)
@@ -843,7 +843,7 @@ class TestInstructorDetailedEnrollmentReport(TestReportMixin, InstructorTaskCour
         response = self.client.get(redeem_url)
         self.assertEquals(response.status_code, 200)
         # check button text
-        self.assertIn('Activate Course Enrollment', response.content.decode('utf-8'))
+        self.assertContains(response, 'Activate Course Enrollment')
 
         response = self.client.post(redeem_url)
         self.assertEquals(response.status_code, 200)
@@ -1328,7 +1328,7 @@ class TestExecutiveSummaryReport(TestReportMixin, InstructorTaskCourseTestCase):
         response = self.client.get(redeem_url)
         self.assertEquals(response.status_code, 200)
         # check button text
-        self.assertIn('Activate Course Enrollment', response.content.decode('utf-8'))
+        self.assertContains(response, 'Activate Course Enrollment')
 
         response = self.client.post(redeem_url)
         self.assertEquals(response.status_code, 200)
diff --git a/lms/djangoapps/shoppingcart/tests/test_views.py b/lms/djangoapps/shoppingcart/tests/test_views.py
index 7d8e246a7c..97c2e75464 100644
--- a/lms/djangoapps/shoppingcart/tests/test_views.py
+++ b/lms/djangoapps/shoppingcart/tests/test_views.py
@@ -631,7 +631,7 @@ class ShoppingCartViewsTests(SharedModuleStoreTestCase, XssTestMixin):
         response = self.client.get(redeem_url)
         self.assertEquals(response.status_code, 200)
         # check button text
-        self.assertIn('Activate Course Enrollment', response.content.decode('utf-8'))
+        self.assertContains(response, 'Activate Course Enrollment')
 
         #now activate the user by enrolling him/her to the course
         response = self.client.post(redeem_url)
@@ -662,7 +662,7 @@ class ShoppingCartViewsTests(SharedModuleStoreTestCase, XssTestMixin):
         response = self.client.get(redeem_url)
         self.assertEquals(response.status_code, 200)
         # check button text
-        self.assertIn('Activate Course Enrollment', response.content.decode('utf-8'))
+        self.assertContains(response, 'Activate Course Enrollment')
 
         #now activate the user by enrolling him/her to the course
         response = self.client.post(redeem_url)
@@ -1134,7 +1134,7 @@ class ShoppingCartViewsTests(SharedModuleStoreTestCase, XssTestMixin):
         response = self.client.get(redeem_url)
         self.assertEquals(response.status_code, 200)
         # check button text
-        self.assertIn('Activate Course Enrollment', response.content.decode('utf-8'))
+        self.assertContains(response, 'Activate Course Enrollment')
 
         #now activate the user by enrolling him/her to the course
         response = self.client.post(redeem_url)
@@ -1324,7 +1324,7 @@ class ShoppingCartViewsTests(SharedModuleStoreTestCase, XssTestMixin):
         #now activate the user by enrolling him/her to the course
         response = self.client.post(redeem_url)
         self.assertEquals(response.status_code, 200)
-        self.assertIn('View Dashboard', response.content.decode('utf-8'))
+        self.assertContains(response, 'View Dashboard')
 
         # now view the receipt page again to see if any registration codes
         # has been expired or not
@@ -2146,7 +2146,7 @@ class CSVReportViewsTest(SharedModuleStoreTestCase):
         self.assertEqual(template, 'shoppingcart/download_report.html')
         self.assertFalse(context['total_count_error'])
         self.assertFalse(context['date_fmt_error'])
-        self.assertIn("Download CSV Reports", response.content.decode('UTF-8'))
+        self.assertContains(response, "Download CSV Reports")
 
     @patch('shoppingcart.views.render_to_response', render_mock)
     def test_report_csv_bad_date(self):