From 932d04a4beb79afa7a52bfec7f66bb6ccfe53814 Mon Sep 17 00:00:00 2001
From: Asif Saifuddin Auvi <auvipy@users.noreply.github.com>
Date: Thu, 1 Dec 2016 22:17:36 +0600
Subject: [PATCH] Browsable API tests asserts to pytest (#4725)

---
 tests/browsable_api/test_browsable_api.py      | 18 ++++++++++++------
 .../browsable_api/test_browsable_nested_api.py |  8 ++++----
 tests/browsable_api/test_form_rendering.py     |  4 ++--
 3 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/tests/browsable_api/test_browsable_api.py b/tests/browsable_api/test_browsable_api.py
index 3d49c353b..684d7ae14 100644
--- a/tests/browsable_api/test_browsable_api.py
+++ b/tests/browsable_api/test_browsable_api.py
@@ -26,16 +26,19 @@ class DropdownWithAuthTests(TestCase):
     def test_name_shown_when_logged_in(self):
         self.client.login(username=self.username, password=self.password)
         response = self.client.get('/')
-        self.assertContains(response, 'john')
+        content = response.content.decode('utf8')
+        assert 'john' in content
 
     def test_logout_shown_when_logged_in(self):
         self.client.login(username=self.username, password=self.password)
         response = self.client.get('/')
-        self.assertContains(response, '>Log out<')
+        content = response.content.decode('utf8')
+        assert '>Log out<' in content
 
     def test_login_shown_when_logged_out(self):
         response = self.client.get('/')
-        self.assertContains(response, '>Log in<')
+        content = response.content.decode('utf8')
+        assert '>Log in<' in content
 
 
 @override_settings(ROOT_URLCONF='tests.browsable_api.no_auth_urls')
@@ -58,13 +61,16 @@ class NoDropdownWithoutAuthTests(TestCase):
     def test_name_shown_when_logged_in(self):
         self.client.login(username=self.username, password=self.password)
         response = self.client.get('/')
-        self.assertContains(response, 'john')
+        content = response.content.decode('utf8')
+        assert 'john' in content
 
     def test_dropdown_not_shown_when_logged_in(self):
         self.client.login(username=self.username, password=self.password)
         response = self.client.get('/')
-        self.assertNotContains(response, '<li class="dropdown">')
+        content = response.content.decode('utf8')
+        assert '<li class="dropdown">' not in content
 
     def test_dropdown_not_shown_when_logged_out(self):
         response = self.client.get('/')
-        self.assertNotContains(response, '<li class="dropdown">')
+        content = response.content.decode('utf8')
+        assert '<li class="dropdown">' not in content
diff --git a/tests/browsable_api/test_browsable_nested_api.py b/tests/browsable_api/test_browsable_nested_api.py
index 9e5538efc..8f38b3c4e 100644
--- a/tests/browsable_api/test_browsable_nested_api.py
+++ b/tests/browsable_api/test_browsable_nested_api.py
@@ -35,8 +35,8 @@ class DropdownWithAuthTests(TestCase):
     @override_settings(ROOT_URLCONF='tests.browsable_api.test_browsable_nested_api')
     def test_login(self):
         response = self.client.get('/api/')
-        self.assertEqual(200, response.status_code)
+        assert 200 == response.status_code
         content = response.content.decode('utf-8')
-        self.assertIn('form action="/api/"', content)
-        self.assertIn('input name="nested.one"', content)
-        self.assertIn('input name="nested.two"', content)
+        assert 'form action="/api/"' in content
+        assert 'input name="nested.one"' in content
+        assert 'input name="nested.two"' in content
diff --git a/tests/browsable_api/test_form_rendering.py b/tests/browsable_api/test_form_rendering.py
index 8b79ab6ff..30e113db7 100644
--- a/tests/browsable_api/test_form_rendering.py
+++ b/tests/browsable_api/test_form_rendering.py
@@ -50,5 +50,5 @@ class TestManyPostView(TestCase):
         request = factory.post('/', data, format='json')
         with self.assertNumQueries(1):
             response = self.view(request).render()
-        self.assertEqual(response.status_code, status.HTTP_200_OK)
-        self.assertEqual(len(response.data), 3)
+        assert response.status_code == status.HTTP_200_OK
+        assert len(response.data) == 3