diff options
Diffstat (limited to 'djangorestframework/tests')
| -rw-r--r-- | djangorestframework/tests/content.py | 6 | ||||
| -rw-r--r-- | djangorestframework/tests/mixins.py | 24 | ||||
| -rw-r--r-- | djangorestframework/tests/status.py | 4 |
3 files changed, 15 insertions, 19 deletions
diff --git a/djangorestframework/tests/content.py b/djangorestframework/tests/content.py index 47dfce80..6bae8feb 100644 --- a/djangorestframework/tests/content.py +++ b/djangorestframework/tests/content.py @@ -17,7 +17,7 @@ class MockView(View): authentication = (UserLoggedInAuthentication,) def post(self, request): if request.POST.get('example') is not None: - return Response(status.OK) + return Response(status.HTTP_200_OK) return Response(status.INTERNAL_SERVER_ERROR) @@ -215,10 +215,10 @@ class TestContentParsingWithAuthentication(TestCase): content = {'example': 'example'} response = self.client.post('/', content) - self.assertEqual(status.OK, response.status_code, "POST data is malformed") + self.assertEqual(status.HTTP_200_OK, response.status_code, "POST data is malformed") response = self.csrf_client.post('/', content) - self.assertEqual(status.OK, response.status_code, "POST data is malformed") + self.assertEqual(status.HTTP_200_OK, response.status_code, "POST data is malformed") # def test_user_logged_in_authentication_has_post_when_logged_in(self): # """Ensures request.POST exists after UserLoggedInAuthentication when user does log in""" diff --git a/djangorestframework/tests/mixins.py b/djangorestframework/tests/mixins.py index 2913160d..d655841f 100644 --- a/djangorestframework/tests/mixins.py +++ b/djangorestframework/tests/mixins.py @@ -125,7 +125,7 @@ class MockPaginatorView(PaginatorMixin, View): return range(0, self.total) def post(self, request): - return Response(status.CREATED, {'status': 'OK'}) + return Response(status.HTTP_201_CREATED, {'status': 'OK'}) class TestPagination(TestCase): @@ -139,7 +139,7 @@ class TestPagination(TestCase): content = json.loads(response.content) - self.assertEqual(response.status_code, status.OK) + self.assertEqual(response.status_code, status.HTTP_200_OK) self.assertEqual(MockPaginatorView.total, content['total']) self.assertEqual(MockPaginatorView.limit, content['per_page']) @@ -154,7 +154,7 @@ class TestPagination(TestCase): content = json.loads(response.content) - self.assertEqual(response.status_code, status.OK) + self.assertEqual(response.status_code, status.HTTP_200_OK) self.assertEqual(content['per_page'], limit) self.assertEqual(range(0, limit), content['results']) @@ -171,7 +171,7 @@ class TestPagination(TestCase): content = json.loads(response.content) - self.assertEqual(response.status_code, status.OK) + self.assertEqual(response.status_code, status.HTTP_200_OK) self.assertEqual(MockPaginatorView.total, content['total']) self.assertEqual(limit, content['per_page']) self.assertEqual(num_pages, content['pages']) @@ -188,7 +188,7 @@ class TestPagination(TestCase): content = json.loads(response.content) - self.assertEqual(response.status_code, status.OK) + self.assertEqual(response.status_code, status.HTTP_200_OK) self.assertEqual(MockPaginatorView.total, content['total']) self.assertNotEqual(limit, content['per_page']) self.assertNotEqual(num_pages, content['pages']) @@ -201,7 +201,7 @@ class TestPagination(TestCase): content = json.loads(response.content) - self.assertEqual(response.status_code, status.CREATED) + self.assertEqual(response.status_code, status.HTTP_201_CREATED) self.assertEqual(None, content.get('per_page')) self.assertEqual('OK', content['status']) @@ -210,19 +210,19 @@ class TestPagination(TestCase): request = self.req.get('/paginator/?page=spam') response = MockPaginatorView.as_view()(request) - self.assertEqual(response.status_code, status.NOT_FOUND) + self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND) def test_page_range(self): """ Tests that the page range is handle correctly """ request = self.req.get('/paginator/?page=0') response = MockPaginatorView.as_view()(request) content = json.loads(response.content) - self.assertEqual(response.status_code, status.NOT_FOUND) + self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND) request = self.req.get('/paginator/') response = MockPaginatorView.as_view()(request) content = json.loads(response.content) - self.assertEqual(response.status_code, status.OK) + self.assertEqual(response.status_code, status.HTTP_200_OK) self.assertEqual(range(0, MockPaginatorView.limit), content['results']) num_pages = content['pages'] @@ -230,13 +230,13 @@ class TestPagination(TestCase): request = self.req.get('/paginator/?page=%d' % num_pages) response = MockPaginatorView.as_view()(request) content = json.loads(response.content) - self.assertEqual(response.status_code, status.OK) + self.assertEqual(response.status_code, status.HTTP_200_OK) self.assertEqual(range(MockPaginatorView.limit*(num_pages-1), MockPaginatorView.total), content['results']) request = self.req.get('/paginator/?page=%d' % (num_pages + 1,)) response = MockPaginatorView.as_view()(request) content = json.loads(response.content) - self.assertEqual(response.status_code, status.NOT_FOUND) + self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND) def test_existing_query_parameters_are_preserved(self): """ Tests that existing query parameters are preserved when @@ -244,7 +244,7 @@ class TestPagination(TestCase): request = self.req.get('/paginator/?foo=bar&another=something') response = MockPaginatorView.as_view()(request) content = json.loads(response.content) - self.assertEqual(response.status_code, status.OK) + self.assertEqual(response.status_code, status.HTTP_200_OK) self.assertTrue('foo=bar' in content['next']) self.assertTrue('another=something' in content['next']) self.assertTrue('page=2' in content['next']) diff --git a/djangorestframework/tests/status.py b/djangorestframework/tests/status.py index 04aed740..53ecae11 100644 --- a/djangorestframework/tests/status.py +++ b/djangorestframework/tests/status.py @@ -8,9 +8,5 @@ class TestStatus(TestCase): def test_status(self): """Ensure the status module is present and correct.""" - self.assertEquals(200, status.OK) self.assertEquals(200, status.HTTP_200_OK) - - self.assertEquals(404, status.NOT_FOUND) self.assertEquals(404, status.HTTP_404_NOT_FOUND) - |