From 6bbfbf77e29c05c3aa382fe9100ef6dc755d43d6 Mon Sep 17 00:00:00 2001 From: Tom Drummond Date: Fri, 15 Jul 2011 16:14:35 +0100 Subject: [PATCH 1/3] Added tests to ensure you can access request.POST with UserLoggedInAuthentication --- djangorestframework/tests/content.py | 53 +++++++++++++++++++++++++++- 1 file changed, 52 insertions(+), 1 deletion(-) diff --git a/djangorestframework/tests/content.py b/djangorestframework/tests/content.py index 83ad72d01..8f1de3fd3 100644 --- a/djangorestframework/tests/content.py +++ b/djangorestframework/tests/content.py @@ -1,10 +1,28 @@ """ Tests for content parsing, and form-overloaded content parsing. """ -from django.test import TestCase +from django.conf.urls.defaults import patterns +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.mixins import RequestMixin from djangorestframework.parsers import FormParser, MultiPartParser, PlainTextParser +from djangorestframework.response import Response +from djangorestframework.views import View + +class MockView(View): + authentication = (UserLoggedInAuthentication,) + def post(self, request): + if request.POST.get('example') is not None: + return Response(status.OK) + + return Response(status.INTERNAL_SERVER_ERROR) + +urlpatterns = patterns('', + (r'^$', MockView.as_view()), +) class TestContentParsing(TestCase): def setUp(self): @@ -84,3 +102,36 @@ class TestContentParsing(TestCase): view.request = self.req.post('/', form_data) view.parsers = (PlainTextParser,) self.assertEqual(view.DATA, content) + +class TestContentParsingWithAuthentication(TestCase): + urls = 'djangorestframework.tests.content' + + def setUp(self): + self.csrf_client = Client(enforce_csrf_checks=True) + self.username = 'john' + self.email = 'lennon@thebeatles.com' + self.password = 'password' + self.user = User.objects.create_user(self.username, self.email, self.password) + self.req = RequestFactory() + + def test_user_logged_in_authentication_has_post_when_not_logged_in(self): + """Ensures request.POST exists after UserLoggedInAuthentication when user doesn't log in""" + content = {'example': 'example'} + + response = self.client.post('/', content) + self.assertEqual(status.OK, response.status_code) + + response = self.csrf_client.post('/', content) + self.assertEqual(status.OK, response.status_code) + + def test_user_logged_in_authentication_has_post_when_logged_in(self): + """Ensures request.POST exists after UserLoggedInAuthentication when user does log in""" + self.client.login(username='john', password='password') + self.csrf_client.login(username='john', password='password') + content = {'example': 'example'} + + response = self.client.post('/', content) + self.assertEqual(status.OK, response.status_code, "POST data") + + response = self.csrf_client.post('/', content) + self.assertEqual(status.OK, response.status_code) From 7e2e3cbf6e4b13979ddc7e827f8b25b6aaae93c3 Mon Sep 17 00:00:00 2001 From: Tom Drummond Date: Fri, 15 Jul 2011 16:59:50 +0100 Subject: [PATCH 2/3] Added more tests related to request.POST and request.DATA --- djangorestframework/tests/content.py | 69 ++++++++++++++++++++++++++-- 1 file changed, 64 insertions(+), 5 deletions(-) diff --git a/djangorestframework/tests/content.py b/djangorestframework/tests/content.py index 8f1de3fd3..029820046 100644 --- a/djangorestframework/tests/content.py +++ b/djangorestframework/tests/content.py @@ -8,7 +8,8 @@ from djangorestframework import status from djangorestframework.authentication import UserLoggedInAuthentication from djangorestframework.compat import RequestFactory from djangorestframework.mixins import RequestMixin -from djangorestframework.parsers import FormParser, MultiPartParser, PlainTextParser +from djangorestframework.parsers import FormParser, MultiPartParser, \ + PlainTextParser, JSONParser from djangorestframework.response import Response from djangorestframework.views import View @@ -102,6 +103,64 @@ class TestContentParsing(TestCase): view.request = self.req.post('/', form_data) view.parsers = (PlainTextParser,) self.assertEqual(view.DATA, content) + + def test_accessing_post_after_data_form(self): + """Ensures request.POST can be accessed after request.DATA in form request""" + form_data = {'qwerty': 'uiop'} + view = RequestMixin() + view.parsers = (FormParser, MultiPartParser) + view.request = self.req.post('/', data=form_data) + + self.assertEqual(view.DATA.items(), form_data.items()) + self.assertEqual(view.request.POST.items(), form_data.items()) + + def test_empty_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' + + view = RequestMixin() + view.parsers = (JSONParser,) + + form_data = {view._CONTENT_PARAM: content, + view._CONTENTTYPE_PARAM: content_type} + + view.request = self.req.post('/', data=form_data) + + self.assertEqual(view.DATA.items(), data.items()) + self.assertEqual(view.request.POST.items(), form_data.items()) + + def test_accessing_data_after_post_form(self): + """Ensures request.DATA can be accessed after request.POST in form request""" + form_data = {'qwerty': 'uiop'} + view = RequestMixin() + view.parsers = (FormParser, MultiPartParser) + view.request = self.req.post('/', data=form_data) + + self.assertEqual(view.request.POST.items(), form_data.items()) + self.assertEqual(view.DATA.items(), form_data.items()) + + def test_accessing_data_after_post_json(self): + """Ensures request.DATA can be accessed after request.POST in json request""" + from django.utils import simplejson as json + + data = {'qwerty': 'uiop'} + content = json.dumps(data) + content_type = 'application/json' + + view = RequestMixin() + view.parsers = (JSONParser,) + + form_data = {view._CONTENT_PARAM: content, + view._CONTENTTYPE_PARAM: content_type} + + view.request = self.req.post('/', data=form_data) + + self.assertEqual(view.request.POST.items(), form_data.items()) + self.assertEqual(view.DATA.items(), data.items()) class TestContentParsingWithAuthentication(TestCase): urls = 'djangorestframework.tests.content' @@ -119,10 +178,10 @@ class TestContentParsingWithAuthentication(TestCase): content = {'example': 'example'} response = self.client.post('/', content) - self.assertEqual(status.OK, response.status_code) + self.assertEqual(status.OK, response.status_code, "POST data is malformed") response = self.csrf_client.post('/', content) - self.assertEqual(status.OK, response.status_code) + self.assertEqual(status.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""" @@ -131,7 +190,7 @@ class TestContentParsingWithAuthentication(TestCase): content = {'example': 'example'} response = self.client.post('/', content) - self.assertEqual(status.OK, response.status_code, "POST data") + self.assertEqual(status.OK, response.status_code, "POST data is malformed") response = self.csrf_client.post('/', content) - self.assertEqual(status.OK, response.status_code) + self.assertEqual(status.OK, response.status_code, "POST data is malformed") From a53101bea9f6fbf7d7528a7c4aba3d83e3dbc241 Mon Sep 17 00:00:00 2001 From: Tom Drummond Date: Fri, 15 Jul 2011 17:19:12 +0100 Subject: [PATCH 3/3] More tests for overloaded json requests and normal json requests --- djangorestframework/tests/content.py | 40 ++++++++++++++++++++++++++-- 1 file changed, 38 insertions(+), 2 deletions(-) diff --git a/djangorestframework/tests/content.py b/djangorestframework/tests/content.py index 029820046..0764d12b8 100644 --- a/djangorestframework/tests/content.py +++ b/djangorestframework/tests/content.py @@ -114,7 +114,7 @@ class TestContentParsing(TestCase): self.assertEqual(view.DATA.items(), form_data.items()) self.assertEqual(view.request.POST.items(), form_data.items()) - def test_empty_post_after_data_for_json(self): + 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 @@ -125,6 +125,22 @@ class TestContentParsing(TestCase): view = RequestMixin() view.parsers = (JSONParser,) + view.request = self.req.post('/', content, content_type=content_type) + + 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""" + from django.utils import simplejson as json + + data = {'qwerty': 'uiop'} + content = json.dumps(data) + content_type = 'application/json' + + view = RequestMixin() + view.parsers = (JSONParser,) + form_data = {view._CONTENT_PARAM: content, view._CONTENTTYPE_PARAM: content_type} @@ -143,7 +159,7 @@ class TestContentParsing(TestCase): self.assertEqual(view.request.POST.items(), form_data.items()) self.assertEqual(view.DATA.items(), form_data.items()) - def test_accessing_data_after_post_json(self): + def test_accessing_data_after_post_for_json(self): """Ensures request.DATA can be accessed after request.POST in json request""" from django.utils import simplejson as json @@ -154,6 +170,26 @@ class TestContentParsing(TestCase): view = RequestMixin() view.parsers = (JSONParser,) + view.request = self.req.post('/', content, content_type=content_type) + + post_items = view.request.POST.items() + + self.assertEqual(len(post_items), 1) + self.assertEqual(len(post_items[0]), 2) + self.assertEqual(post_items[0][0], content) + self.assertEqual(view.DATA.items(), data.items()) + + def test_accessing_data_after_post_for_overloaded_json(self): + """Ensures request.DATA can be accessed after request.POST in overloaded json request""" + from django.utils import simplejson as json + + data = {'qwerty': 'uiop'} + content = json.dumps(data) + content_type = 'application/json' + + view = RequestMixin() + view.parsers = (JSONParser,) + form_data = {view._CONTENT_PARAM: content, view._CONTENTTYPE_PARAM: content_type}