diff options
| author | Tom Christie | 2013-02-27 13:15:47 -0800 |
|---|---|---|
| committer | Tom Christie | 2013-02-27 13:15:47 -0800 |
| commit | a2dafd96439afc958b0e3dafdf543ca9843fd0d2 (patch) | |
| tree | 68ea6caa6c0a84bd93fe70a10b003fd7109bf1c0 /rest_framework/tests/views.py | |
| parent | 35331f5820cff9a5cd97ccff2c1cbbb8a5a62790 (diff) | |
| parent | a1dbd93f5467a8a25e18516f57f34c15b3b31b36 (diff) | |
| download | django-rest-framework-a2dafd96439afc958b0e3dafdf543ca9843fd0d2.tar.bz2 | |
Merge pull request #692 from tomchristie/django1.5
Django 1.5
Diffstat (limited to 'rest_framework/tests/views.py')
| -rw-r--r-- | rest_framework/tests/views.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/rest_framework/tests/views.py b/rest_framework/tests/views.py index 7063c3fb..994cf6dc 100644 --- a/rest_framework/tests/views.py +++ b/rest_framework/tests/views.py @@ -52,8 +52,8 @@ class ClassBasedViewIntegrationTests(TestCase): expected = { 'detail': 'JSON parse error - No JSON object could be decoded' } - self.assertEquals(response.status_code, status.HTTP_400_BAD_REQUEST) - self.assertEquals(sanitise_json_error(response.data), expected) + self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST) + self.assertEqual(sanitise_json_error(response.data), expected) def test_400_parse_error_tunneled_content(self): content = 'f00bar' @@ -67,8 +67,8 @@ class ClassBasedViewIntegrationTests(TestCase): expected = { 'detail': 'JSON parse error - No JSON object could be decoded' } - self.assertEquals(response.status_code, status.HTTP_400_BAD_REQUEST) - self.assertEquals(sanitise_json_error(response.data), expected) + self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST) + self.assertEqual(sanitise_json_error(response.data), expected) class FunctionBasedViewIntegrationTests(TestCase): @@ -81,8 +81,8 @@ class FunctionBasedViewIntegrationTests(TestCase): expected = { 'detail': 'JSON parse error - No JSON object could be decoded' } - self.assertEquals(response.status_code, status.HTTP_400_BAD_REQUEST) - self.assertEquals(sanitise_json_error(response.data), expected) + self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST) + self.assertEqual(sanitise_json_error(response.data), expected) def test_400_parse_error_tunneled_content(self): content = 'f00bar' @@ -96,5 +96,5 @@ class FunctionBasedViewIntegrationTests(TestCase): expected = { 'detail': 'JSON parse error - No JSON object could be decoded' } - self.assertEquals(response.status_code, status.HTTP_400_BAD_REQUEST) - self.assertEquals(sanitise_json_error(response.data), expected) + self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST) + self.assertEqual(sanitise_json_error(response.data), expected) |