Added expected_data parameter to register_uri

httpretty/core.py

@@ -25,6 +25,7 @@
 # OTHER DEALINGS IN THE SOFTWARE.
 from __future__ import unicode_literals
 
+from urlparse import parse_qsl
 import re
 import inspect
 import socket
@@ -277,6 +278,13 @@ def sendall(self, data, *args, **kw):
 
             for matcher, value in httpretty._entries.items():
                 if matcher.matches(info):
+                    if matcher.expected_data is not None:
+                        body_dict = dict(parse_qsl(request.body))
+                        if body_dict != matcher.expected_data:
+                            raise ValueError("Body Post didn't match, expected %s, got %s" % (
+                                matcher.expected_data,
+                                body_dict
+                            ))
                     entries = value
                     break
 
@@ -601,12 +609,13 @@ class URIMatcher(object):
     regex = None
     info = None
 
-    def __init__(self, uri, entries):
+    def __init__(self, uri, expected_data, entries):
         if type(uri).__name__ == 'SRE_Pattern':
             self.regex = uri
         else:
             self.info = URIInfo.from_uri(uri, entries)
 
+        self.expected_data = expected_data
         self.entries = entries
 
         #hash of current_entry pointers, per method.
@@ -683,6 +692,7 @@ def register_uri(cls, method, uri, body='HTTPretty :)',
                      adding_headers=None,
                      forcing_headers=None,
                      status=200,
+                     expected_data=None,
                      responses=None, **headers):
 
         uri_is_string = isinstance(uri, basestring)
@@ -705,7 +715,7 @@ def register_uri(cls, method, uri, body='HTTPretty :)',
                 cls.Response(method=method, uri=uri, **headers),
             ]
 
-        matcher = URIMatcher(uri, entries_for_this_uri)
+        matcher = URIMatcher(uri, expected_data, entries_for_this_uri)
         if matcher in cls._entries:
             matcher.entries.extend(cls._entries[matcher])
             del cls._entries[matcher]

tests/functional/test_requests.py

@@ -626,3 +626,34 @@ def test_lack_of_trailing_slash():
     HTTPretty.register_uri(HTTPretty.GET, url, body='')
     response = requests.get(url)
     response.status_code.should.equal(200)
+
+
+@httprettified
+def test_httpretty_should_check_post_payload():
+    "HTTPretty should allow checking POST data payload"
+
+    HTTPretty.register_uri(
+        HTTPretty.POST,
+        "https://api.imaginary.com/v1/sweet/",
+        expected_data={'name': "Lollipop"},
+        body='{"id": 12, "status": "Created"}',
+    )
+
+    response = requests.post(
+        "https://api.imaginary.com/v1/sweet/",
+        {"name": "Lollipop"}
+    )
+
+    expect(HTTPretty.last_request.method).to.equal('POST')
+    expect(HTTPretty.last_request.method).to.equal('POST')
+    expect(HTTPretty.last_request.body).to.equal(b'name=Lollipop')
+    expect(response.json()).to.equal({"id": 12, "status": "Created"})
+
+    try:
+        response = requests.post(
+            "https://api.imaginary.com/v1/sweet/",
+            {"wrong": "data"}
+        )
+        raise Exception("Payload checked didn't work")
+    except ValueError:
+        pass

tests/functional/test_urllib2.py

@@ -27,6 +27,7 @@
 from __future__ import unicode_literals
 
 try:
+    from urllib import urlencode
     from urllib.request import urlopen
     import urllib.request as urllib2
 except ImportError:
@@ -335,3 +336,47 @@ def test_httpretty_should_allow_registering_regexes():
     fd.close()
 
     expect(got).to.equal(b"Found brand")
+
+
+@httprettified
+def test_httpretty_should_check_post_payload():
+    "HTTPretty should allow checking POST data payload"
+
+    HTTPretty.register_uri(
+        HTTPretty.POST,
+        "https://api.imaginary.com/v1/sweet/",
+        expected_data={'name': "Lollipop"},
+        body='{"id": 12, "status": "Created"}',
+    )
+
+    request = urllib2.Request(
+        "https://api.imaginary.com/v1/sweet/",
+        urlencode({"name": "Lollipop"}),
+        {
+            'content-type': 'text/json',
+        },
+    )
+    fd = urllib2.urlopen(request)
+    got = fd.read()
+    fd.close()
+
+    expect(HTTPretty.last_request.method).to.equal('POST')
+    expect(HTTPretty.last_request.method).to.equal('POST')
+    expect(HTTPretty.last_request.body).to.equal(b'name=Lollipop')
+    expect(got).to.equal(b'{"id": 12, "status": "Created"}')
+
+    request = urllib2.Request(
+        "https://api.imaginary.com/v1/sweet/",
+        urlencode({"wrong": "data"}),
+        {
+            'content-type': 'text/json',
+        },
+    )
+
+    try:
+        fd = urllib2.urlopen(request)
+        got = fd.read()
+        fd.close()
+        raise Exception("Payload checked didn't work")
+    except ValueError:
+        pass