diff options
| author | Marko Tibold | 2012-01-04 11:58:22 +0100 |
|---|---|---|
| committer | Marko Tibold | 2012-01-04 11:58:22 +0100 |
| commit | 47e4f0d37deb0f420e403cee6b4b4790e875d250 (patch) | |
| tree | 16a5424b8176d06ca6ab01a055e6572ecd7c7ed4 /djangorestframework/tests | |
| parent | 591bb630d74e8bbad42d533dc175b414ec7566a4 (diff) | |
| download | django-rest-framework-47e4f0d37deb0f420e403cee6b4b4790e875d250.tar.bz2 | |
We can now use @unittests.skip
Diffstat (limited to 'djangorestframework/tests')
| -rw-r--r-- | djangorestframework/tests/content.py | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/djangorestframework/tests/content.py b/djangorestframework/tests/content.py index 048586c8..47dfce80 100644 --- a/djangorestframework/tests/content.py +++ b/djangorestframework/tests/content.py @@ -6,7 +6,7 @@ from django.contrib.auth.models import User from django.test import TestCase, Client from djangorestframework import status from djangorestframework.authentication import UserLoggedInAuthentication -from djangorestframework.compat import RequestFactory +from djangorestframework.compat import RequestFactory, unittest from djangorestframework.mixins import RequestMixin from djangorestframework.parsers import FormParser, MultiPartParser, \ PlainTextParser, JSONParser @@ -114,21 +114,22 @@ class TestContentParsing(TestCase): self.assertEqual(view.DATA.items(), form_data.items()) self.assertEqual(view.request.POST.items(), form_data.items()) - # def test_accessing_post_after_data_for_json(self): - # """Ensures request.POST can be accessed after request.DATA in json request""" - # from django.utils import simplejson as json + @unittest.skip('This test was disabled some time ago for some reason') + def test_accessing_post_after_data_for_json(self): + """Ensures request.POST can be accessed after request.DATA in json request""" + from django.utils import simplejson as json - # data = {'qwerty': 'uiop'} - # content = json.dumps(data) - # content_type = 'application/json' + data = {'qwerty': 'uiop'} + content = json.dumps(data) + content_type = 'application/json' - # view = RequestMixin() - # view.parsers = (JSONParser,) + view = RequestMixin() + view.parsers = (JSONParser,) - # view.request = self.req.post('/', content, content_type=content_type) + view.request = self.req.post('/', content, content_type=content_type) - # self.assertEqual(view.DATA.items(), data.items()) - # self.assertEqual(view.request.POST.items(), []) + self.assertEqual(view.DATA.items(), data.items()) + self.assertEqual(view.request.POST.items(), []) def test_accessing_post_after_data_for_overloaded_json(self): """Ensures request.POST can be accessed after request.DATA in overloaded json request""" |
