From: Kenneth Reitz <me@kennethreitz.com>
Date: Sun, 24 Jul 2011 02:11:59 +0000 (-0400)
Subject: Merge branch 'develop' of https://github.com/rabad/requests into develop
X-Git-Tag: v0.5.1^2~7
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9b6a190652354953c6bdb400daac0013b08974e5;p=services%2Fpython-requests.git

Merge branch 'develop' of https://github.com/rabad/requests into develop
---

9b6a190652354953c6bdb400daac0013b08974e5
diff --cc test_requests.py
index f23aa07,d4e50a6..0c33457
--- a/test_requests.py
+++ b/test_requests.py
@@@ -326,8 -323,32 +326,32 @@@ class RequestsTestSuite(unittest.TestCa
  
      def test_idna(self):
          r = requests.get(u'http://➡.ws/httpbin')
 -        self.assertEqual(r.url, HTTPBIN_URL)
 +        assert 'tinyarrows.com' in r.url
  
+     def test_urlencoded_get_query_multivalued_param(self):
+         r = requests.get(httpbin('get'), params=dict(test=['foo','baz']))
+         self.assertEquals(r.status_code, 200)
+         self.assertEquals(r.url, httpbin('get?test=foo&test=baz'))
+ 
+     def test_urlencoded_post_querystring_multivalued(self):
+         r = requests.post(httpbin('post'), params=dict(test=['foo','baz']))
+         self.assertEquals(r.status_code, 200)
+         self.assertEquals(r.headers['content-type'], 'application/json')
+         self.assertEquals(r.url, httpbin('post?test=foo&test=baz'))
+         rbody = json.loads(r.content)
+         self.assertEquals(rbody.get('form'), {}) # No form supplied
+         self.assertEquals(rbody.get('data'), '')
+ 
+     def test_urlencoded_post_query_multivalued_and_data(self):
+         r = requests.post(httpbin('post'), params=dict(test=['foo','baz']),
+                           data=dict(test2="foobar",test3=['foo','baz']))
+         self.assertEquals(r.status_code, 200)
+         self.assertEquals(r.headers['content-type'], 'application/json')
+         self.assertEquals(r.url, httpbin('post?test=foo&test=baz'))
+         rbody = json.loads(r.content)
+         self.assertEquals(rbody.get('form'), dict(test2='foobar',test3='foo'))
+         self.assertEquals(rbody.get('data'), '')
+ 
  
  if __name__ == '__main__':
      unittest.main()