Remove httpbin.org testing dependency

kyleconroy · kyleconroy · commit 259abd7e7684 · 2011-11-02T23:59:58.000-07:00
diff --git a/tests/test_make_request.py b/tests/test_make_request.py
@@ -21,26 +21,39 @@
 post_headers = get_headers.copy()
 post_headers["Content-Type"] = "application/x-www-form-urlencoded"
 
-def test_get_params():
-    tests = [
-        ("http://httpbin.org/get", {"hey":"you", "foo":"bar"}),
-        ("http://httpbin.org/get?hey=you", {"foo":"bar"}),
-        ("http://httpbin.org/get?hey=you&foo=bar", {}),
-        ]
-
-    for test in tests:
-        yield check_get_params, test[0], test[1]
-
-def check_get_params(url, params):
-    resp = make_request("GET", url, params=params)
-    body = json.loads(resp.content)
-
-    assert_equals(body["args"]["hey"], "you")
-    assert_equals(body["args"]["foo"], "bar")
-
-def test_resp_uri():
-    resp = make_request("GET", "http://httpbin.org/get")
-    assert_equals(resp.url, "http://httpbin.org/get")
+
+@patch('twilio.rest.resources.Response')
+@patch('httplib2.Http')
+def test_get_params(http_mock, response_mock):
+    http = Mock()
+    http.request.return_value = (Mock(), Mock())
+    http_mock.return_value = http
+    make_request("GET", "http://httpbin.org/get", params={"hey": "you"})
+    http.request.assert_called_with("http://httpbin.org/get?hey=you", "GET",
+            body=None, headers=None)
+
+
+@patch('twilio.rest.resources.Response')
+@patch('httplib2.Http')
+def test_get_extra_paranms(http_mock, response_mock):
+    http = Mock()
+    http.request.return_value = (Mock(), Mock())
+    http_mock.return_value = http
+    make_request("GET", "http://httpbin.org/get?foo=bar", params={"hey": "you"})
+    http.request.assert_called_with("http://httpbin.org/get?foo=bar&hey=you", "GET",
+            body=None, headers=None)
+
+
+@patch('twilio.rest.resources.Response')
+@patch('httplib2.Http')
+def test_resp_uri(http_mock, response_mock):
+    http = Mock()
+    http.request.return_value = (Mock(), Mock())
+    http_mock.return_value = http
+    make_request("GET", "http://httpbin.org/get")
+    http.request.assert_called_with("http://httpbin.org/get", "GET",
+            body=None, headers=None)
+
 
 @patch('twilio.rest.resources.make_request')
 def test_make_twilio_request_headers(mock):
