Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

[1.1.X] Fixed #11371: Made `django.test.Client.put()` work for non-fo…

…rm-data PUT (i.e. JSON, etc.). Thanks, phyfus. Backport of [11656] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11657 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit bf33627c63a475d1a1e0ee1400f4dc0e6cb2f076 1 parent 0ed09c8
@jacobian jacobian authored
View
8 django/test/client.py
@@ -362,12 +362,18 @@ def put(self, path, data={}, content_type=MULTIPART_CONTENT,
else:
post_data = data
+ # Make `data` into a querystring only if it's not already a string. If
+ # it is a string, we'll assume that the caller has already encoded it.
+ query_string = None
+ if not isinstance(data, basestring):
+ query_string = urlencode(data, doseq=True)
+
parsed = urlparse(path)
r = {
'CONTENT_LENGTH': len(post_data),
'CONTENT_TYPE': content_type,
'PATH_INFO': urllib.unquote(parsed[2]),
- 'QUERY_STRING': urlencode(data, doseq=True) or parsed[4],
+ 'QUERY_STRING': query_string or parsed[4],
'REQUEST_METHOD': 'PUT',
'wsgi.input': FakePayload(post_data),
}
View
17 tests/regressiontests/test_client_regress/models.py
@@ -574,6 +574,23 @@ def test_delete(self):
self.assertEqual(response.status_code, 200)
self.assertEqual(response.content, 'request method: DELETE')
+class RequestMethodStringDataTests(TestCase):
+ def test_post(self):
+ "Request a view with string data via request method POST"
+ # Regression test for #11371
+ data = u'{"test": "json"}'
+ response = self.client.post('/test_client_regress/request_methods/', data=data, content_type='application/json')
+ self.assertEqual(response.status_code, 200)
+ self.assertEqual(response.content, 'request method: POST')
+
+ def test_put(self):
+ "Request a view with string data via request method PUT"
+ # Regression test for #11371
+ data = u'{"test": "json"}'
+ response = self.client.put('/test_client_regress/request_methods/', data=data, content_type='application/json')
+ self.assertEqual(response.status_code, 200)
+ self.assertEqual(response.content, 'request method: PUT')
+
class QueryStringTests(TestCase):
def test_get_like_requests(self):
for method_name in ('get','head','options','put','delete'):
Please sign in to comment.
Something went wrong with that request. Please try again.