Author: russellm Date: 2010-08-27 08:54:13 -0500 (Fri, 27 Aug 2010) New Revision: 13640
Modified: django/trunk/django/test/client.py django/trunk/docs/ref/contrib/csrf.txt django/trunk/docs/topics/testing.txt django/trunk/tests/modeltests/test_client/models.py Log: Fixed #14116 -- Added a flag to enable CSRF checks in the test client. Thanks to [email protected] for the suggestion. Modified: django/trunk/django/test/client.py =================================================================== --- django/trunk/django/test/client.py 2010-08-26 11:10:45 UTC (rev 13639) +++ django/trunk/django/test/client.py 2010-08-27 13:54:13 UTC (rev 13640) @@ -55,6 +55,10 @@ Uses the WSGI interface to compose requests, but returns the raw HttpResponse object """ + def __init__(self, enforce_csrf_checks=True, *args, **kwargs): + self.enforce_csrf_checks = enforce_csrf_checks + super(ClientHandler, self).__init__(*args, **kwargs) + def __call__(self, environ): from django.conf import settings from django.core import signals @@ -71,7 +75,7 @@ # CsrfViewMiddleware. This makes life easier, and is probably # required for backwards compatibility with external tests against # admin views. - request._dont_enforce_csrf_checks = True + request._dont_enforce_csrf_checks = not self.enforce_csrf_checks response = self.get_response(request) # Apply response middleware. @@ -169,8 +173,8 @@ contexts and templates produced by a view, rather than the HTML rendered to the end-user. """ - def __init__(self, **defaults): - self.handler = ClientHandler() + def __init__(self, enforce_csrf_checks=False, **defaults): + self.handler = ClientHandler(enforce_csrf_checks) self.defaults = defaults self.cookies = SimpleCookie() self.exc_info = None Modified: django/trunk/docs/ref/contrib/csrf.txt =================================================================== --- django/trunk/docs/ref/contrib/csrf.txt 2010-08-26 11:10:45 UTC (rev 13639) +++ django/trunk/docs/ref/contrib/csrf.txt 2010-08-27 13:54:13 UTC (rev 13640) @@ -398,6 +398,13 @@ decorator so that they no longer rejects requests. In every other respect (e.g. sending cookies etc.), they behave the same. +If, for some reason, you *want* the test client to perform CSRF +checks, you can create an instance of the test client that enforces +CSRF checks:: + + >>> from django.test import Client + >>> csrf_client = Client(enforce_csrf_checks=True) + Limitations =========== Modified: django/trunk/docs/topics/testing.txt =================================================================== --- django/trunk/docs/topics/testing.txt 2010-08-26 11:10:45 UTC (rev 13639) +++ django/trunk/docs/topics/testing.txt 2010-08-27 13:54:13 UTC (rev 13640) @@ -572,6 +572,19 @@ This black magic (essentially a patching of Django's template system in memory) only happens during test running. + * By default, the test client will disable any CSRF checks + performed by your site. + + If, for some reason, you *want* the test client to perform CSRF + checks, you can create an instance of the test client that + enforces CSRF checks. To do this, pass in the + ``enforce_csrf_checks`` argument when you construct your + client:: + + >>> from django.test import Client + >>> csrf_client = Client(enforce_csrf_checks=True) + + .. _urllib: http://docs.python.org/library/urllib.html .. _urllib2: http://docs.python.org/library/urllib2.html Modified: django/trunk/tests/modeltests/test_client/models.py =================================================================== --- django/trunk/tests/modeltests/test_client/models.py 2010-08-26 11:10:45 UTC (rev 13639) +++ django/trunk/tests/modeltests/test_client/models.py 2010-08-27 13:54:13 UTC (rev 13640) @@ -21,6 +21,7 @@ """ from django.test import Client, TestCase +from django.conf import settings from django.core import mail class ClientTest(TestCase): @@ -433,3 +434,26 @@ self.assertEqual(mail.outbox[1].from_email, '[email protected]') self.assertEqual(mail.outbox[1].to[0], '[email protected]') self.assertEqual(mail.outbox[1].to[1], '[email protected]') + +class CSRFEnabledClientTests(TestCase): + def setUp(self): + # Enable the CSRF middleware for this test + self.old_MIDDLEWARE_CLASSES = settings.MIDDLEWARE_CLASSES + csrf_middleware_class = 'django.middleware.csrf.CsrfViewMiddleware' + if csrf_middleware_class not in settings.MIDDLEWARE_CLASSES: + settings.MIDDLEWARE_CLASSES += (csrf_middleware_class,) + + def tearDown(self): + settings.MIDDLEWARE_CLASSES = self.old_MIDDLEWARE_CLASSES + + def test_csrf_enabled_client(self): + "A client can be instantiated with CSRF checks enabled" + csrf_client = Client(enforce_csrf_checks=True) + + # The normal client allows the post + response = self.client.post('/test_client/post_view/', {}) + self.assertEqual(response.status_code, 200) + + # The CSRF-enabled client rejects it + response = csrf_client.post('/test_client/post_view/', {}) + self.assertEqual(response.status_code, 403) -- You received this message because you are subscribed to the Google Groups "Django updates" group. To post to this group, send email to [email protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/django-updates?hl=en.
