Fixing the build on Travis.

jkeyes · jkeyes · commit d8f1f794ea70 · 2015-03-26T19:23:47.000Z
Renaming test_user function so it's not treated as a test.
Matching the querystring for collection proxy next page test.
diff --git a/tests/unit/__init__.py b/tests/unit/__init__.py
@@ -34,7 +34,7 @@ def _call(*args, **kwargs):
     return _call
 
 
-def a_test_user(email="bob@example.com"):
+def get_user(email="bob@example.com"):
     return {
         "type": "user",
         "id": "aaaaaaaaaaaaaaaaaaaaaaaa",
@@ -137,9 +137,9 @@ def page_of_users(include_next_link=False):
             "total_pages": 7
         },
         "users": [
-            a_test_user("user1@example.com"),
-            a_test_user("user2@example.com"),
-            a_test_user("user3@example.com")],
+            get_user("user1@example.com"),
+            get_user("user2@example.com"),
+            get_user("user3@example.com")],
         "total_count": 314
     }
     if include_next_link:
diff --git a/tests/unit/test_collection_proxy.py b/tests/unit/test_collection_proxy.py
@@ -29,9 +29,11 @@ def it_stops_iterating_if_no_next_link(self):
     def it_keeps_iterating_if_next_link(self):
         page1 = json.dumps(page_of_users(include_next_link=True))
         page2 = json.dumps(page_of_users(include_next_link=False))
-        httpretty.register_uri(get, r(r"/users$"), body=page1)
         httpretty.register_uri(
-            get, r(r'/users\?per_page=50&page=2$'),
+            get, r(r"https://api.intercom.io/users$"), body=page1,
+            match_querystring=True)
+        httpretty.register_uri(
+            get, r(r"https://api.intercom.io/users\?per_page=50&page=2"),
             body=page2, match_querystring=True)
         emails = [user.email for user in User.all()]
         eq_(emails, ['user1@example.com', 'user2@example.com', 'user3@example.com'] * 2)  # noqa
diff --git a/tests/unit/test_user.py b/tests/unit/test_user.py
@@ -18,7 +18,7 @@
 from nose.tools import eq_
 from nose.tools import ok_
 from nose.tools import istest
-from tests.unit import a_test_user
+from tests.unit import get_user
 
 
 get = httpretty.GET
@@ -61,7 +61,7 @@ def it_throws_an_attribute_error_on_trying_to_access_an_attribute_that_has_not_b
 
     @istest
     def it_presents_a_complete_user_record_correctly(self):
-        user = User.from_api(a_test_user())
+        user = User.from_api(get_user())
         eq_('id-from-customers-app', user.user_id)
         eq_('bob@example.com', user.email)
         eq_('Joe Schmoe', user.name)
@@ -165,14 +165,14 @@ def it_rejects_nested_data_structures_in_custom_attributes(self):
         with assert_raises(ValueError):
             user.custom_attributes = {1: {2: 3}}
 
-        user = User.from_api(a_test_user())
+        user = User.from_api(get_user())
         with assert_raises(ValueError):
             user.custom_attributes["thing"] = [1]
 
     @istest
     @httpretty.activate
     def it_fetches_a_user(self):
-        body = json.dumps(a_test_user())
+        body = json.dumps(get_user())
 
         httpretty.register_uri(
             get, r(r"https://api.intercom.io/users\?email="),
