Python 3: multi-lined assertIn, assertNotIn -> assertContains, assertNotContains

openedx/features/course_experience/tests/views/test_course_home.py

@@ -970,9 +970,9 @@ class CourseHomeFragmentViewTests(ModuleStoreTestCase):
         url = EcommerceService().get_checkout_page_url(self.verified_mode.sku)
         self.assertContains(response, '<a class="btn-brand btn-upgrade"')
         self.assertContains(response, url)
-        self.assertIn(
+        self.assertContains(
+            response,
             u"Upgrade (<span class='price'>${price}</span>)".format(price=self.verified_mode.min_price),
-            response.content.decode(response.charset)
         )
 
     def test_no_upgrade_message_if_logged_out(self):
@@ -1012,5 +1012,4 @@ class CourseHomeFragmentViewTests(ModuleStoreTestCase):
         with SHOW_UPGRADE_MSG_ON_COURSE_HOME.override(True):
             response = self.client.get(self.url)
 
-        content = response.content.decode(response.charset)
-        assert "<span>DISCOUNT_PRICE</span>" in content
+        self.assertContains(response, "<span>DISCOUNT_PRICE</span>")

openedx/features/course_experience/tests/views/test_course_outline.py

@@ -121,9 +121,6 @@ class TestCourseOutlinePage(SharedModuleStoreTestCase):
 
             url = course_home_url(course)
             response = self.client.get(url)
-            self.assertEqual(response.status_code, 200)
-            response_content = response.content.decode("utf-8")
-
             self.assertTrue(course.children)
             for chapter in course.children:
                 self.assertContains(response, chapter.display_name)

openedx/features/course_experience/tests/views/test_course_sock.py

@@ -103,8 +103,7 @@ class TestCourseSockView(SharedModuleStoreTestCase):
     )
     def test_upgrade_message_discount(self):
         response = self.client.get(course_home_url(self.verified_course))
-        content = response.content.decode(response.charset)
-        assert "<span>DISCOUNT_PRICE</span>" in content
+        self.assertContains(response, "<span>DISCOUNT_PRICE</span>")
 
     def assert_verified_sock_is_visible(self, course, response):
         return self.assertContains(response, TEST_VERIFICATION_SOCK_LOCATOR, html=False)