Changeset 9398

Timestamp:

11/12/08 05:22:05 (2 months ago)

Author:

russellm

Message:

Fixed #9351 -- Modified the test client to pass on URL encoded parameters to the underlying views. Thanks to sime for the suggestion.

Files:

• django/trunk/django/test/client.py (modified) (7 diffs)
• django/trunk/docs/topics/testing.txt (modified) (2 diffs)
• django/trunk/tests/regressiontests/test_client_regress/models.py (modified) (3 diffs)
• django/trunk/tests/regressiontests/test_client_regress/urls.py (modified) (1 diff)
• django/trunk/tests/regressiontests/test_client_regress/views.py (modified) (2 diffs)

django/trunk/django/test/client.py

@@ -1 +1 @@
-import urllib
+from urlparse import urlparse, urlunparse
-import sys
-import os
@@ -261 +262 @@
-        Requests a response from the server using GET.
-        """
+        parsed = urlparse(path)
-        r = {
-            'CONTENT_TYPE':    'text/html; charset=utf-8',
-
-
+rsed.pa
+ or parsed.query
-            'REQUEST_METHOD': 'GET',
-            'wsgi.input':      FakePayload('')
@@ -281 +283 @@
-            post_data = data
-
+        parsed = urlparse(path)
-        r = {
-            'CONTENT_LENGTH': len(post_data),
-            'CONTENT_TYPE':   content_type,
-
+
+
-            'REQUEST_METHOD': 'POST',
-            'wsgi.input':     FakePayload(post_data),
@@ -296 +300 @@
-        Request a response from the server using HEAD.
-        """
+        parsed = urlparse(path)
-        r = {
-            'CONTENT_TYPE':    'text/html; charset=utf-8',
-
-
+rsed.pa
+ or parsed.query
-            'REQUEST_METHOD': 'HEAD',
-            'wsgi.input':      FakePayload('')
@@ -311 +316 @@
-        Request a response from the server using OPTIONS.
-        """
-
-
-
+
+
+
+
-            'REQUEST_METHOD': 'OPTIONS',
-            'wsgi.input':      FakePayload('')
@@ -329 +335 @@
-        else:
-            post_data = data
+
+        parsed = urlparse(path)
-        r = {
-            'CONTENT_LENGTH': len(post_data),
-            'CONTENT_TYPE':   content_type,
-
-
+rsed.pa
+ or parsed.query
-            'REQUEST_METHOD': 'PUT',
-            'wsgi.input':     FakePayload(post_data),
@@ -345 +353 @@
-        Send a DELETE request to the server.
-        """
-
-
-
+
+
+
+
-            'REQUEST_METHOD': 'DELETE',
-            'wsgi.input':      FakePayload('')

django/trunk/docs/topics/testing.txt

@@ -494 +494 @@
-            /customers/details/?name=fred&age=7
-
+        .. versionadded:: development
+
+        If you already have the GET arguments in URL-encoded form, you can
+        use that encoding instead of using the data argument. For example,
+        the previous GET request could also be posed as::
+
+        >>> c = Client()
+        >>> c.get('/customers/details/?name=fred&age=7')
+
+        If you provide URL both an encoded GET data and a data argument,
+        the data argument will take precedence.
+
-    .. method:: Client.post(path, data={}, content_type=MULTIPART_CONTENT)
-
@@ -544 +556 @@
-        Note that you should manually close the file after it has been provided
-        to ``post()``.
+
+        .. versionadded:: development
+
+        If the URL you request with a POST contains encoded parameters, these
+        parameters will be made available in the request.GET data. For example,
+        if you were to make the request::
+
+        >>> c.post('/login/?vistor=true', {'name': 'fred', 'passwd': 'secret'})
+
+        ... the view handling this request could interrogate request.POST
+        to retrieve the username and password, and could interrogate request.GET
+        to determine if the user was a visitor.
-
-    .. method:: Client.head(path, data={})

django/trunk/tests/regressiontests/test_client_regress/models.py

@@ -310 +310 @@
-        except SuspiciousOperation:
-            self.fail("Staff should be able to visit this page")
-
+
-class TemplateExceptionTests(TestCase):
-    def setUp(self):
-        self.old_templates = settings.TEMPLATE_DIRS
-        settings.TEMPLATE_DIRS = ()
-
+
-    def tearDown(self):
-        settings.TEMPLATE_DIRS = self.old_templates
-
+
-    def test_no_404_template(self):
-    
+
-        try:
-            response = self.client.get("/no_such_view/")
@@ -335 +335 @@
-        except TemplateSyntaxError:
-            pass
-
+
-# We need two different tests to check URLconf substitution -  one to check
-# it was changed, and another one (without self.urls) to check it was reverted on
@@ -422 +422 @@
-        self.assertEqual(response.status_code, 200)
-        self.assertEqual(response.content, 'request method: DELETE')
+
+class QueryStringTests(TestCase):
+    def test_get_like_requests(self):
+        for method_name in ('get','head','options','put','delete'):
+            # A GET-like request can pass a query string as data
+            method = getattr(self.client, method_name)
+            response = method("/test_client_regress/request_data/", data={'foo':'whiz'})
+            self.assertEqual(response.context['get-foo'], 'whiz')
+            self.assertEqual(response.context['request-foo'], 'whiz')
+
+            # A GET-like request can pass a query string as part of the URL
+            response = method("/test_client_regress/request_data/?foo=whiz")
+            self.assertEqual(response.context['get-foo'], 'whiz')
+            self.assertEqual(response.context['request-foo'], 'whiz')
+
+            # Data provided in the URL to a GET-like request is overridden by actual form data
+            response = method("/test_client_regress/request_data/?foo=whiz", data={'foo':'bang'})
+            self.assertEqual(response.context['get-foo'], 'bang')
+            self.assertEqual(response.context['request-foo'], 'bang')
+
+            response = method("/test_client_regress/request_data/?foo=whiz", data={'bar':'bang'})
+            self.assertEqual(response.context['get-foo'], None)
+            self.assertEqual(response.context['get-bar'], 'bang')
+            self.assertEqual(response.context['request-foo'], None)
+            self.assertEqual(response.context['request-bar'], 'bang')
+
+    def test_post_like_requests(self):
+        # A POST-like request can pass a query string as data
+        response = self.client.post("/test_client_regress/request_data/", data={'foo':'whiz'})
+        self.assertEqual(response.context['get-foo'], None)
+        self.assertEqual(response.context['post-foo'], 'whiz')
+
+        # A POST-like request can pass a query string as part of the URL
+        response = self.client.post("/test_client_regress/request_data/?foo=whiz")
+        self.assertEqual(response.context['get-foo'], 'whiz')
+        self.assertEqual(response.context['post-foo'], None)
+        self.assertEqual(response.context['request-foo'], 'whiz')
+
+        # POST data provided in the URL augments actual form data
+        response = self.client.post("/test_client_regress/request_data/?foo=whiz", data={'foo':'bang'})
+        self.assertEqual(response.context['get-foo'], 'whiz')
+        self.assertEqual(response.context['post-foo'], 'bang')
+        self.assertEqual(response.context['request-foo'], 'bang')
+
+        response = self.client.post("/test_client_regress/request_data/?foo=whiz", data={'bar':'bang'})
+        self.assertEqual(response.context['get-foo'], 'whiz')
+        self.assertEqual(response.context['get-bar'], None)
+        self.assertEqual(response.context['post-foo'], None)
+        self.assertEqual(response.context['post-bar'], 'bang')
+        self.assertEqual(response.context['request-foo'], 'whiz')
+        self.assertEqual(response.context['request-bar'], 'bang')

django/trunk/tests/regressiontests/test_client_regress/urls.py

@@ -6 +6 @@
-    (r'^staff_only/$', views.staff_only_view),
-    (r'^get_view/$', views.get_view),
+    (r'^request_data/$', views.request_data),
-    url(r'^arg_view/(?P<name>.+)/$', views.view_with_argument, name='arg_view'),
-    (r'^login_protected_redirect_view/$', views.login_protected_redirect_view),

django/trunk/tests/regressiontests/test_client_regress/views.py

@@ -2 +2 @@
-from django.http import HttpResponse, HttpResponseRedirect
-from django.core.exceptions import SuspiciousOperation
+from django.shortcuts import render_to_response
-
-def no_template_view(request):
@@ -18 +19 @@
-    return HttpResponse("Hello world")
-get_view = login_required(get_view)
+
+def request_data(request):
+    "A simple view that returns the request data in the context"
+    return render_to_response('base.html', {
+        'get-foo':request.GET.get('foo',None),
+        'get-bar':request.GET.get('bar',None),
+        'post-foo':request.POST.get('foo',None),
+        'post-bar':request.POST.get('bar',None),
+        'request-foo':request.REQUEST.get('foo',None),
+        'request-bar':request.REQUEST.get('bar',None),
+    })
-
-def view_with_argument(request, name):