aboutsummaryrefslogtreecommitdiffstats
path: root/djangorestframework/tests/content.py
diff options
context:
space:
mode:
authorTom Christie2011-04-11 11:56:07 +0100
committerTom Christie2011-04-11 11:56:07 +0100
commite29a3f4cf12ea4c7cc616f27441b44639c736334 (patch)
tree9c4a4a0854987b7c88f7072f9a2f2a526e3fec5e /djangorestframework/tests/content.py
parentd4ed17845650d9a548ff0df362f3469878db2f91 (diff)
downloaddjango-rest-framework-e29a3f4cf12ea4c7cc616f27441b44639c736334.tar.bz2
More tests passing
Diffstat (limited to 'djangorestframework/tests/content.py')
-rw-r--r--djangorestframework/tests/content.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/djangorestframework/tests/content.py b/djangorestframework/tests/content.py
index c4f93ef2..2e33fd87 100644
--- a/djangorestframework/tests/content.py
+++ b/djangorestframework/tests/content.py
@@ -2,7 +2,7 @@
from django.test import TestCase
from djangorestframework.compat import RequestFactory
from djangorestframework.request import RequestMixin
-from djangorestframework.parsers import FormParser, MultipartParser
+from djangorestframework.parsers import FormParser, MultipartParser, PlainTextParser
#from djangorestframework.content import ContentMixin, StandardContentMixin, OverloadedContentMixin
#
#
@@ -43,28 +43,28 @@ class TestContentMixins(TestCase):
view.request = self.req.post('/', data=form_data)
self.assertEqual(view.RAW_CONTENT, form_data)
- def ensure_determines_non_form_content_POST(self, mixin):
+ def ensure_determines_non_form_content_POST(self, view):
"""Ensure view.RAW_CONTENT returns content for POST request with non-form content."""
content = 'qwerty'
content_type = 'text/plain'
view.parsers = (PlainTextParser,)
view.request = self.req.post('/', content, content_type=content_type)
- self.assertEqual(view.RAW_CONTENT, form_data)
+ self.assertEqual(view.RAW_CONTENT, content)
- def ensure_determines_form_content_PUT(self, mixin):
+ def ensure_determines_form_content_PUT(self, view):
"""Ensure view.RAW_CONTENT returns content for PUT request with form content."""
form_data = {'qwerty': 'uiop'}
view.parsers = (FormParser, MultipartParser)
view.request = self.req.put('/', data=form_data)
self.assertEqual(view.RAW_CONTENT, form_data)
- def ensure_determines_non_form_content_PUT(self, mixin):
+ def ensure_determines_non_form_content_PUT(self, view):
"""Ensure view.RAW_CONTENT returns content for PUT request with non-form content."""
content = 'qwerty'
content_type = 'text/plain'
view.parsers = (PlainTextParser,)
view.request = self.req.post('/', content, content_type=content_type)
- self.assertEqual(view.RAW_CONTENT, form_data)#
+ self.assertEqual(view.RAW_CONTENT, content)
def test_standard_behaviour_determines_no_content_GET(self):
"""Ensure request.RAW_CONTENT returns None for GET request with no content."""