Fixed #4402 -- Modified test client to allow multi-valued inputs on GET requests. Thanks for the suggestion, eddymul@gmail.com.

freakboy3742 · freakboy3742 · commit f2303b6f7aa7 · 2007-07-21T05:17:20.000Z
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5741 bcc190cf-cafb-0310-a4f2-bffc1f526a37
diff --git a/django/test/client.py b/django/test/client.py
@@ -195,7 +195,7 @@ def get(self, path, data={}, **extra):
             'CONTENT_LENGTH':  None,
             'CONTENT_TYPE':    'text/html; charset=utf-8',
             'PATH_INFO':       path,
-            'QUERY_STRING':    urlencode(data),
+            'QUERY_STRING':    urlencode(data, doseq=True),
             'REQUEST_METHOD': 'GET',
         }
         r.update(extra)
diff --git a/django/utils/http.py b/django/utils/http.py
@@ -30,6 +30,9 @@ def urlencode(query, doseq=0):
     """
     if hasattr(query, 'items'):
         query = query.items()
-    return urllib.urlencode([(smart_str(k), smart_str(v)) for k,
-        v in query], doseq)
+    return urllib.urlencode(
+        [(smart_str(k),
+         isinstance(v, (list,tuple)) and [smart_str(i) for i in v] or smart_str(v))
+            for k, v in query],
+        doseq)
 
diff --git a/tests/modeltests/test_client/models.py b/tests/modeltests/test_client/models.py
@@ -122,6 +122,18 @@ def test_valid_form(self):
         self.assertEqual(response.status_code, 200)
         self.assertTemplateUsed(response, "Valid POST Template")
 
+    def test_valid_form_with_hints(self):
+        "GET a form, providing hints in the GET data"
+        hints = {
+            'text': 'Hello World',
+            'multi': ('b','c','e')
+        }
+        response = self.client.get('/test_client/form_view/', data=hints)
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, "Form GET Template")
+        # Check that the multi-value data has been rolled out ok
+        self.assertContains(response, 'Select a valid choice.', 0)
+        
     def test_incomplete_data_form(self):
         "POST incomplete data to a form"
         post_data = {
diff --git a/tests/modeltests/test_client/views.py b/tests/modeltests/test_client/views.py
@@ -84,7 +84,7 @@ def form_view(request):
             t = Template('Invalid POST data. {{ form.errors }}', name='Invalid POST Template')
             c = Context({'form': form})
     else:
-        form = TestForm()
+        form = TestForm(request.GET)
         t = Template('Viewing base form. {{ form }}.', name='Form GET Template')
         c = Context({'form': form})
     
@@ -107,7 +107,6 @@ def form_view_with_template(request):
             'message': message
         }
     )
-
         
 def login_protected_view(request):
     "A simple view that is login protected."

Original file line number	Diff line number	Diff line change
`@@ -195,7 +195,7 @@ def get(self, path, data={}, **extra):`
`195`	`195`	`'CONTENT_LENGTH': None,`
`196`	`196`	`'CONTENT_TYPE': 'text/html; charset=utf-8',`
`197`	`197`	`'PATH_INFO': path,`
`198`		`- 'QUERY_STRING': urlencode(data),`
	`198`	`+ 'QUERY_STRING': urlencode(data, doseq=True),`
`199`	`199`	`'REQUEST_METHOD': 'GET',`
`200`	`200`	`}`
`201`	`201`	`r.update(extra)`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ def form_view(request):`
`84`	`84`	`t = Template('Invalid POST data. {{ form.errors }}', name='Invalid POST Template')`
`85`	`85`	`c = Context({'form': form})`
`86`	`86`	`else:`
`87`		`- form = TestForm()`
	`87`	`+ form = TestForm(request.GET)`
`88`	`88`	`t = Template('Viewing base form. {{ form }}.', name='Form GET Template')`
`89`	`89`	`c = Context({'form': form})`
`90`	`90`
`@@ -107,7 +107,6 @@ def form_view_with_template(request):`
`107`	`107`	`'message': message`
`108`	`108`	`}`
`109`	`109`	`)`
`110`		`-`
`111`	`110`
`112`	`111`	`def login_protected_view(request):`
`113`	`112`	`"A simple view that is login protected."`