Merge pull request #27 from mocketize/old-issues

Fix for #13.

Author: mindflayer

mocket/mockhttp.py

@@ -93,7 +93,8 @@ def can_handle(self, data):
             return True
         uri = urlsplit(path)
         kw = dict(keep_blank_values=True)
-        return uri.path == self.path and parse_qs(uri.query, **kw) == parse_qs(self.query, **kw)
+        ch = uri.path == self.path and parse_qs(uri.query, **kw) == parse_qs(self.query, **kw) and method == self.method
+        return ch
 
     @staticmethod
     def _parse_requestline(line):

tests/test_http.py

@@ -1,6 +1,7 @@
 # coding=utf-8
 from __future__ import unicode_literals
 import time
+import json
 import mock
 from . import urlopen, HTTPError
 import pytest
@@ -154,6 +155,25 @@ def test_file_object(self):
         self.assertEqual(int(r.headers['Content-Length']), len(local_content))
         self.assertEqual(r.headers['Content-Type'], 'image/png')
 
+    @mocketize
+    def test_same_url_different_methods(self):
+        url = 'http://bit.ly/fakeurl'
+        response_to_mock = {
+            'body': 'this is my body value',
+            'method': None,
+        }
+        responses = []
+        methods = [Entry.PUT, Entry.GET, Entry.POST]
+
+        for m in methods:
+            response_to_mock['method'] = m
+            Entry.single_register(m, url, body=json.dumps(response_to_mock))
+        for m in methods:
+            responses.append(requests.request(m, url).json())
+
+        methods_from_responses = [r['method'] for r in responses]
+        self.assertEquals(methods, methods_from_responses)
+
     def assertEqualHeaders(self, first, second, msg=None):
         first = dict((k.lower(), v) for k, v in first.items())
         second = dict((k.lower(), v) for k, v in second.items())