Adding new company test to check for empty responses.

jkeyes · jkeyes · commit 4293857aaee7 · 2015-03-17T00:23:09.000Z
diff --git a/intercom/__init__.py b/intercom/__init__.py
@@ -3,6 +3,7 @@
 from datetime import datetime
 from json import JSONEncoder
 from .errors import ArgumentError
+from .errors import HttpError
 from .lib.setter_property import SetterProperty
 
 import copy
diff --git a/intercom/api_operations/find.py b/intercom/api_operations/find.py
@@ -1,3 +1,4 @@
+from intercom import HttpError
 from intercom import Intercom
 from intercom import utils
 
@@ -11,4 +12,8 @@ def find(cls, **params):
             response = Intercom.get("/%s/%s" % (collection, params['id']))
         else:
             response = Intercom.get("/%s" % (collection), **params)
+
+        if response is None:
+            raise HttpError('Http Error - No response entity returned')
+
         return cls(**response)
diff --git a/intercom/api_operations/load.py b/intercom/api_operations/load.py
@@ -1,3 +1,4 @@
+from intercom import HttpError
 from intercom import Intercom
 from intercom import utils
 
@@ -12,4 +13,8 @@ def load(self):
         else:
             raise Exception(
                 "Cannot load %s as it does not have a valid id." % (cls))
+
+        if response is None:
+            raise HttpError('Http Error - No response entity returned')
+
         return cls(**response)
diff --git a/intercom/collection_proxy.py b/intercom/collection_proxy.py
@@ -1,3 +1,4 @@
+from intercom import HttpError
 from intercom import Intercom
 
 
@@ -63,6 +64,9 @@ def get_page(self, url, params={}):
             raise StopIteration
 
         response = Intercom.get(url, **params)
+        if response is None:
+            raise HttpError('Http Error - No response entity returned')
+
         collection = response[self.collection]
         # if there are no resources in the response stop iterating
         if collection is None:
diff --git a/intercom/errors.py b/intercom/errors.py
@@ -1,2 +1,6 @@
 class ArgumentError(ValueError):
     pass
+
+
+class HttpError(Exception):
+    pass
diff --git a/tests/unit/company_spec.py b/tests/unit/company_spec.py
@@ -0,0 +1,42 @@
+import httpretty
+import json
+import re
+from describe import expect
+import intercom
+from intercom.company import Company
+
+get = httpretty.GET
+r = re.compile
+
+
+class DescribeIntercomCompany2:
+
+    @httpretty.activate
+    def it_raises_error_if_no_response_on_find(self):
+        httpretty.register_uri(
+            get, r(r'/companies$'), body=None, status=200)
+        with expect.to_raise_error(intercom.HttpError):
+            Company.find(company_id='4')
+
+    @httpretty.activate
+    def it_raises_error_if_no_response_on_find_all(self):
+        httpretty.register_uri(
+            get, r(r'/companies$'), body=None, status=200)
+        with expect.to_raise_error(intercom.HttpError):
+            [x for x in Company.all()]
+
+    @httpretty.activate
+    def it_raises_error_on_load(self):
+        data = {
+            'type': 'user',
+            'id': 'aaaaaaaaaaaaaaaaaaaaaaaa',
+            'company_id': '4',
+            'name': 'MyCo'
+        }
+        httpretty.register_uri(
+            get, r(r'/companies$'), body=json.dumps(data), status=200)
+        company = Company.find(company_id='4')
+        httpretty.register_uri(
+            get, r(r'/companies/aaaaaaaaaaaaaaaaaaaaaaaa$'), body=None, status=200)  # noqa
+        with expect.to_raise_error(intercom.HttpError):
+            company.load()

-Original file line number
+Diff line change
@@ @@ -1,2 +1,6 @@ @@
 class ArgumentError(ValueError):
     pass
++
++
 +class HttpError(Exception):
 +    pass