Add the get_users parameters to User.all.

jkeyes · jkeyes · commit 58f5ed302d21 · 2013-08-10T02:31:58.000+01:00
diff --git a/intercom/user.py b/intercom/user.py
@@ -131,7 +131,7 @@ def delete(cls, user_id=None, email=None):
         return cls(resp)
 
     @classmethod
-    def all(cls):
+    def all(cls, page=None, per_page=None, tag_id=None, tag_name=None):
         """ Return all of the Users.
 
         >>> users = User.all()
@@ -141,7 +141,8 @@ def all(cls):
         u'first.user@example.com'
 
         """
-        resp = Intercom.get_users()
+        resp = Intercom.get_users(
+            page=page, per_page=per_page, tag_id=tag_id, tag_name=tag_name)
         return [cls(u) for u in resp['users']]
 
     def save(self):
diff --git a/tests/unit/__init__.py b/tests/unit/__init__.py
@@ -25,12 +25,15 @@ def request(*args, **kwargs):
     return request
 
 
-def local_response():
+def local_response(**params):
     def _call(*args, **kwargs):
         response = Mock()
         reply = {}
         for name, value in kwargs.items():
             reply[name] = value
+        for name, value in params.items():
+            reply[name] = value
+
         response.content = json.dumps(reply)
         response.status_code = 200
         return response
diff --git a/tests/unit/test_user.py b/tests/unit/test_user.py
@@ -13,6 +13,7 @@
 from unittest import TestCase
 
 from . import create_response
+from . import local_response
 
 from intercom import AuthenticationError
 from intercom.user import CustomData
@@ -171,6 +172,18 @@ def test_get_users_valid(self):
         self.assertEqual('foobloggs@example.com', users[1].email)
         self.assertEqual('barbloggs@example.com', users[2].email)
 
+    @patch('requests.request', local_response(users=[]))
+    def test_get_users_params(self):
+        resp = User.all()
+        resp = User.all(page=20)
+        resp = User.all(per_page=10)
+        resp = User.all(tag_id=100)
+        resp = User.all(tag_name="starter")
+        try:
+            resp = User.all(no_such_param="value")
+        except TypeError:
+            pass
+
     def test_properties(self):
         user = User()
         user.email = 'xxx@example.com'
