Merge branch 'develop' of https://github.com/rabad/requests into develop
authorKenneth Reitz <me@kennethreitz.com>
Sun, 24 Jul 2011 02:11:59 +0000 (22:11 -0400)
committerKenneth Reitz <me@kennethreitz.com>
Sun, 24 Jul 2011 02:11:59 +0000 (22:11 -0400)
1  2 
requests/models.py
test_requests.py

Simple merge
index f23aa0711579be4ee77419a9bdd64685251aebee,d4e50a6fc233c4ee2085c6ffb6584178501cdc99..0c33457772f32c4bf03a45c2227a91c7559395e2
@@@ -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()