Fix asserts bugs in client.

copitux · copitux · commit 680041b09231 · 2012-02-11T21:44:09.000+01:00
Fixing something that is there to check what never happens...
But tests doesn't lie, so funny :P
diff --git a/pygithub3/core/client.py b/pygithub3/core/client.py
@@ -83,17 +83,17 @@ def request(self, verb, request, **kwargs):
 
     def get(self, request, **kwargs):
         response = self.request('get', request, **kwargs)
-        assert response.status_code != '200'
+        assert response.status_code == 200
         return response
 
     def post(self, request, **kwargs):
         response = self.request('post', request, **kwargs)
-        assert response.status_code != '201'
+        assert response.status_code == 201
         return response
 
     def patch(self, request, **kwargs):
         response = self.request('patch', request, **kwargs)
-        assert response.status_code != '200'
+        assert response.status_code == 200
         return response
 
     def put(self, request, **kwargs):
@@ -104,10 +104,8 @@ def put(self, request, **kwargs):
 
     def delete(self, request, **kwargs):
         response = self.request('delete', request, **kwargs)
-        assert response.status_code != '204'
+        assert response.status_code == 204
         return response
 
     def head(self, request, **kwargs):
-        response = self.request('head', request, **kwargs)
-        assert response.status_code != '200'
-        return response
+        return self.request('head', request, **kwargs)
diff --git a/pygithub3/tests/core/test_client.py b/pygithub3/tests/core/test_client.py
@@ -4,9 +4,11 @@
 from unittest import TestCase
 
 import requests
+from mock import patch
+
 from pygithub3.core.client import Client
 from pygithub3.exceptions import NotFound, BadRequest, UnprocessableEntity
-from mock import patch
+from pygithub3.tests.utils.base import mock_response
 
 
 class TestClient(TestCase):
@@ -55,16 +57,25 @@ def test_PARSE_args_in_request_with_params(self, request_method):
 
     @patch.object(Client, 'request')
     def test_DELEGATES_methods(self, request_method):
+        request_method.return_value = mock_response()
         self.c.get('')
         request_method.assert_called_with('get', '')
+
+        request_method.return_value = mock_response(201)
         self.c.post('')
         request_method.assert_called_with('post', '')
+
+        request_method.return_value = mock_response(200)
         self.c.patch('')
         request_method.assert_called_with('patch', '')
+
         self.c.put('')
         request_method.assert_called_with('put', '')
+
+        request_method.return_value = mock_response(204)
         self.c.delete('')
         request_method.assert_called_with('delete', '')
+
         self.c.head('')
         request_method.assert_called_with('head', '')
 
diff --git a/pygithub3/tests/services/test_core.py b/pygithub3/tests/services/test_core.py
@@ -8,7 +8,7 @@
 
 from pygithub3.services.base import Base
 from pygithub3.core.result import Result
-from pygithub3.tests.utils.base import DummyRequest
+from pygithub3.tests.utils.base import DummyRequest, mock_response
 from .utils import _
 
 
@@ -32,16 +32,19 @@ def test_PUT(self, request_method):
                                           data=data, params=self.args)
 
     def test_DELETE(self, request_method):
+        request_method.return_value = mock_response(204)
         self.s._delete(self.r, **self.args)
         request_method.assert_called_with('delete', _('dummyrequest'),
                                           data=None, params=self.args)
 
     def test_POST(self, request_method):
+        request_method.return_value = mock_response(201)
         self.s._post(self.r, **self.args)
         request_method.assert_called_with('post', _('dummyrequest'),
                                           data=None, params=self.args)
 
     def test_GET(self, request_method):
+        request_method.return_value = mock_response()
         self.s._get(self.r, **self.args)
         request_method.assert_called_with('get', _('dummyrequest'),
                                           params=self.args)
diff --git a/pygithub3/tests/services/test_users.py b/pygithub3/tests/services/test_users.py
@@ -8,6 +8,7 @@
 
 from pygithub3.services.users import User
 from pygithub3.resources.base import json
+from pygithub3.tests.utils.base import mock_response
 from pygithub3.tests.utils.services import _, mock_json
 
 json.dumps = Mock(side_effect=mock_json)
@@ -20,8 +21,6 @@ def setUp(self):
         self.us = User()
 
     def test_GET_without_user(self, request_method):
-        response = Mock(name='response')
-        response.content = {'dummy': 'dummy'}
-        request_method.return_value = response
+        request_method.return_value = mock_response()
         self.us.get()
         request_method.assert_called_with('get', _('user'), params={})
diff --git a/pygithub3/tests/utils/base.py b/pygithub3/tests/utils/base.py
@@ -11,6 +11,12 @@ def mock_json(content):
     return content
 
 
+def mock_response(status_code=200, content={}):
+    response = Mock(name='response')
+    response.status_code = status_code
+    response.content = content
+    return response
+
 class DummyResource(Resource):
     pass
 
