Changeset 7330

Timestamp:

03/20/08 01:50:54 (4 months ago)

Author:

mtredinnick

Message:

Fixed #5982 -- Changed test client's URL processing to match core's (everything
gets run through urllib.unquote()). Patch from Leo Shklovskii and Russell
Keith-Magee.

Files:

• django/trunk/AUTHORS (modified) (1 diff)
• django/trunk/django/test/client.py (modified) (3 diffs)
• django/trunk/tests/regressiontests/test_client_regress/models.py (modified) (2 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/AUTHORS

@@ -312 +312 @@
-    John Shaffer <jshaffer2112@gmail.com>
-    Pete Shinners <pete@shinners.org>
+    Leo Shklovskii
-    jason.sidabras@gmail.com
-    Jozko Skrablin <jozko.skrablin@gmail.com>

django/trunk/django/test/client.py

@@ +1 @@
+import urllib
-import sys
-from cStringIO import StringIO
@@ -209 +210 @@
-            'CONTENT_LENGTH':  None,
-            'CONTENT_TYPE':    'text/html; charset=utf-8',
-path
+urllib.unquote(path)
-            'QUERY_STRING':    urlencode(data, doseq=True),
-            'REQUEST_METHOD': 'GET',
@@ -228 +229 @@
-            'CONTENT_LENGTH': len(post_data),
-            'CONTENT_TYPE':   content_type,
-path
+urllib.unquote(path)
-            'REQUEST_METHOD': 'POST',
-            'wsgi.input':     StringIO(post_data),

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

@@ -4 +4 @@
-"""
-from django.test import Client, TestCase
- import mail
+.urlresolvers import reverse
-import os
-
@@ -262 +262 @@
-        # default client.
-        self.assertRedirects(response, "http://testserver/test_client_regress/get_view/")
+
+
+class URLEscapingTests(TestCase):
+    def test_simple_argument_get(self):
+        "Get a view that has a simple string argument"
+        response = self.client.get(reverse('arg_view', args=['Slartibartfast']))
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.content, 'Howdy, Slartibartfast')
+
+    def test_argument_with_space_get(self):
+        "Get a view that has a string argument that requires escaping"
+        response = self.client.get(reverse('arg_view', args=['Arthur Dent']))
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.content, 'Hi, Arthur')
+
+    def test_simple_argument_post(self):
+        "Post for a view that has a simple string argument"
+        response = self.client.post(reverse('arg_view', args=['Slartibartfast']))
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.content, 'Howdy, Slartibartfast')
+
+    def test_argument_with_space_post(self):
+        "Post for a view that has a string argument that requires escaping"
+        response = self.client.post(reverse('arg_view', args=['Arthur Dent']))
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.content, 'Hi, Arthur')
+
+

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

@@ -6 +6 @@
-    (r'^file_upload/$', views.file_upload_view),
-    (r'^get_view/$', views.get_view),
+    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

@@ -1 +1 @@
-from django.contrib.auth.decorators import login_required
-from django.core.mail import EmailMessage, SMTPConnection
-from django.http import HttpResponse, HttpResponseRedirect, HttpResponseServerError
-from django.shortcuts import render_to_response
-
-def no_template_view(request):
@@ -21 +19 @@
-
-def get_view(request):
-    
+
-    return HttpResponse("Hello world")
-get_view = login_required(get_view)
+
+def view_with_argument(request, name):
+    """A view that takes a string argument
+
+    The purpose of this view is to check that if a space is provided in
+    the argument, the test framework unescapes the %20 before passing
+    the value to the view.
+    """
+    if name == 'Arthur Dent':
+        return HttpResponse('Hi, Arthur')
+    else:
+        return HttpResponse('Howdy, %s' % name)
-
-def login_protected_redirect_view(request):