Removing sure dependency. Going back to simple nose for readability.

jkeyes · jkeyes · commit cf05d1ec4973 · 2014-01-05T14:47:32.000Z
diff --git a/dev-requirements.txt b/dev-requirements.txt
@@ -11,5 +11,4 @@ Pygments==1.5
 Jinja2==2.6
 docutils==0.8.1
 Sphinx==1.1.3
-sure==1.2.3
 httpretty==0.7.0
diff --git a/tests/integration/test.py b/tests/integration/test.py
@@ -19,7 +19,9 @@
 from intercom import Impression
 from intercom import Note
 from nose.tools import nottest
-from sure import expect
+from nose.tools import eq_
+from nose.tools import ok_
+from nose.tools import raises
 
 Intercom.app_id = 'dummy-app-id'
 Intercom.api_key = 'dummy-secret-key'
@@ -37,47 +39,56 @@ def fixture(fixture):
 @httpretty.activate
 def test_users():
     httpretty.register_uri(get, r(r"/v1/users"), body=fixture('v1-users'))
-    expect(len(User.all())).should.be.greater_than(0)
+    ok_(len(User.all()) > 0)
 
 @httpretty.activate
 def test_user():
     httpretty.register_uri(get, r(r"/v1/users\?email="), body=fixture('v1-user'), match_querystring=True)
     user = User.find(email='somebody@example.com')
-    expect(user.name).to.equal('Somebody')
+    eq_(user.name, 'Somebody')
 
     httpretty.register_uri(get, r(r"/v1/users\?user_id="), body=fixture('v1-user'), match_querystring=True)
     user = User.find_by_user_id('123')
-    expect(user.name).to.equal('Somebody')
+    eq_(user.name, 'Somebody')
 
 @httpretty.activate
+@raises(ResourceNotFound)
 def test_not_found():
     httpretty.register_uri(get, r(r"/v1/users\?email=not-found"), status=404, match_querystring=True)
-    User.find.when.called_with(email='not-found@example.com').should.throw(ResourceNotFound)
+    User.find(email='not-found@example.com')
 
+@httpretty.activate
+@raises(ResourceNotFound)
+def test_not_found_qs():
     httpretty.register_uri(get, r(r"/v1/users\?email=not-found"), body=fixture('v1-user_not_found'), status=404, match_querystring=True)
-    User.find.when.called_with(email='not-found@example.com').should.throw(ResourceNotFound)
+    User.find(email='not-found@example.com')
 
 @httpretty.activate
+@raises(ServerError)
 def test_server_error():
     httpretty.register_uri(get, r(r"/v1/users\?email=server-error"), status=500, match_querystring=True)
-    User.find.when.called_with(email='server-error@example.com').should.throw(ServerError)
+    User.find(email='server-error@example.com')
 
+@httpretty.activate
+@raises(ServerError)
+def test_server_error_qs():
     httpretty.register_uri(get, r(r"/v1/users\?email=server-error"), body=fixture('v1-user_server_error'),  status=500, match_querystring=True)
-    User.find.when.called_with(email='server-error@example.com').should.throw(ServerError)
+    User.find(email='server-error@example.com')
 
 @httpretty.activate
+@raises(AuthenticationError)
 def test_bad_api_key():
     httpretty.register_uri(get, r(r"/v1/users\?email=authentication-error"), status=401, match_querystring=True)
     Intercom.app_id = 'bad-app-id'
     Intercom.api_key = 'bad-secret-key'
-    User.find.when.called_with(email='authentication-error@example.com').should.throw(AuthenticationError)
+    User.find(email='authentication-error@example.com')
 
 @httpretty.activate
 def test_message_threads():
     httpretty.register_uri(get, r(r"/v1/users/message_threads\?email=somebody"), body=fixture('v1-users-message_threads'), match_querystring=True)
     thread = MessageThread.find_all(email='somebody@example.com')[0]
     for attr in ['thread_id', 'read', 'messages', 'created_at', 'updated_at']:
-        expect(getattr(thread, attr)).should.be.ok
+        ok_(getattr(thread, attr))
 
 @nottest
 @httpretty.activate
@@ -91,15 +102,15 @@ def test_message_thread():
 def test_impression():
     httpretty.register_uri(post, r(r"/v1/users/impressions"), body=fixture('v1-users-impressions'))
     impression = Impression.create(email='somebody@example.com')
-    expect(impression.unread_messages).should.be.greater_than(0)
-    # expect(impression.email).to.equal('somebody@example.com')
+    ok_(impression.unread_messages > 0)
+    # eq_(impression.email, 'somebody@example.com')
 
 @httpretty.activate
 def test_note():
     httpretty.register_uri(post, r(r"/v1/users/notes"), body=fixture('v1-users-note'))
     note = Note.create(body="This is a note", email='somebody@example.com')
-    expect(note.html).to.equal("<p>This is a note</p>")
-    expect(note.user.email).to.equal("somebody@example.com")
+    eq_(note.html, "<p>This is a note</p>")
+    eq_(note.user.email, "somebody@example.com")
 
 @nottest
 @httpretty.activate
@@ -108,7 +119,7 @@ def test_endpoints():
     httpretty.register_uri(get, r(r"/v1/users\?email="), body=fixture('v1-user'), match_querystring=True)
     Intercom.endpoints = ("http://127.0.0.7", "https://api.intercom.io")
     user = User.find(email='somebody@example.com')
-    expect(user.name).to.equal('Somebody')
+    eq_(user.name, 'Somebody')
 
 @nottest
 @httpretty.activate
@@ -170,19 +181,19 @@ def request_callback(method, uri, headers):
     httpretty.register_uri(post, r(r"/v1/users/impressions"), body=fixture('v1-users-impressions'))
 
     (failure_count, test_count) = doctest.testfile("../../intercom/user.py")
-    expect(failure_count).to.equal(0)
+    eq_(failure_count, 0)
 
     (failure_count, test_count) = doctest.testfile("../../intercom/tag.py")
-    expect(failure_count).to.equal(0)
+    eq_(failure_count, 0)
 
     (failure_count, test_count) = doctest.testfile("../../intercom/note.py")
-    expect(failure_count).to.equal(0)
+    eq_(failure_count, 0)
 
     (failure_count, test_count) = doctest.testfile("../../intercom/message_thread.py")
-    expect(failure_count).to.equal(0)
+    eq_(failure_count, 0)
 
     (failure_count, test_count) = doctest.testfile("../../intercom/impression.py")
-    expect(failure_count).to.equal(0)
+    eq_(failure_count, 0)
 
     (failure_count, test_count) = doctest.testfile("../../intercom/intercom.py")
-    expect(failure_count).to.equal(0)
+    eq_(failure_count, 0)
diff --git a/tests/unit/test_impression.py b/tests/unit/test_impression.py
@@ -6,7 +6,7 @@
 #
 
 from intercom import Impression
-from sure import expect
+from nose.tools import eq_
 
 
 def test_properties():
@@ -15,6 +15,6 @@ def test_properties():
     impression.location = 'http://example.com/profile/'
     impression.user_agent = 'Mozilla/5.0'
 
-    expect(impression.user_ip).to.equal('192.168.1.100')
-    expect(impression.location).to.equal('http://example.com/profile/')
-    expect(impression.user_agent).to.equal('Mozilla/5.0')
+    eq_(impression.user_ip, '192.168.1.100')
+    eq_(impression.location, 'http://example.com/profile/')
+    eq_(impression.user_agent, 'Mozilla/5.0')
diff --git a/tests/unit/test_message_thread.py b/tests/unit/test_message_thread.py
@@ -6,12 +6,13 @@
 #
 
 from intercom.message_thread import MessageThread
-from sure import expect
+from nose.tools import eq_
+from nose.tools import raises
 
 
+@raises(ValueError)
 def test_find_no_thread_id():
-    MessageThread.find.when.called_with(email='xxx@example.com')\
-        .should.throw(ValueError)
+    MessageThread.find(email='xxx@example.com')
 
 
 def test_properties():
@@ -20,8 +21,8 @@ def test_properties():
     message_thread.read = False
     message_thread.body = 'ABCDE'
 
-    expect(message_thread.thread_id).to.equal(12345)
-    expect(message_thread.read).to.equal(False)
+    eq_(message_thread.thread_id, 12345)
+    eq_(message_thread.read, False)
 
     try:
         message_thread.body
diff --git a/tests/unit/test_note.py b/tests/unit/test_note.py
@@ -6,7 +6,7 @@
 
 from datetime import datetime
 from intercom import Note
-from sure import expect
+from nose.tools import eq_
 
 
 def test_properties():
@@ -16,6 +16,6 @@ def test_properties():
     note.user_id = '123'
     note.created_at = datetime.fromtimestamp(1331764344)
 
-    expect(note.body).to.equal('xxx')
-    expect(note.email).to.equal('xxx@example.com')
-    expect(note.user_id).to.equal('123')
+    eq_(note.body, 'xxx')
+    eq_(note.email, 'xxx@example.com')
+    eq_(note.user_id, '123')
diff --git a/tests/unit/test_tag.py b/tests/unit/test_tag.py
@@ -6,7 +6,7 @@
 #
 
 from intercom.tag import Tag
-from sure import expect
+from nose.tools import eq_
 from nose.tools import raises
 
 
@@ -19,7 +19,7 @@ def test_writeonly_emails():
 def test_write_emails():
     tag = Tag()
     tag.emails = ["joe@example.com"]
-    expect(tag['emails']).to.equal(["joe@example.com"])
+    eq_(tag['emails'], ["joe@example.com"])
 
 
 @raises(AttributeError)
@@ -31,7 +31,7 @@ def test_writeonly_user_ids():
 def test_write_user_ids():
     tag = Tag()
     tag.user_ids = ["abc123"]
-    expect(tag['user_ids']).to.equal(["abc123"])
+    eq_(tag['user_ids'], ["abc123"])
 
 
 @raises(AttributeError)
@@ -43,7 +43,7 @@ def test_writeonly_tag_or_untag():
 def test_write_tag_or_untag():
     tag = Tag()
     tag.tag_or_untag = "tag"
-    expect(tag['tag_or_untag']).to.equal("tag")
+    eq_(tag['tag_or_untag'], "tag")
 
 
 @raises(AttributeError)
@@ -72,4 +72,4 @@ def test_readonly_id():
 def test_accessor():
     tag = Tag()
     tag.name = "xyz"
-    expect(tag.name).to.equal("xyz")
+    eq_(tag.name, "xyz")
diff --git a/tests/unit/test_user.py b/tests/unit/test_user.py
@@ -11,20 +11,20 @@
 from intercom.user import SocialProfile
 from intercom.user import User
 from intercom.user import Company
+from nose.tools import eq_
 from nose.tools import raises
-from sure import expect
 
 
 def test_init_no_arg():
     # no arg __init__
     custom_data = CustomData()
-    expect(len(custom_data)).to.equal(0)
+    eq_(0, len(custom_data))
 
 
 def test_init_dict_arg():
     # dict arg __init__
     custom_data = CustomData({'color': 'red'})
-    expect(len(custom_data)).to.equal(1)
+    eq_(1, len(custom_data))
 
 
 def test_string_key():
@@ -86,10 +86,10 @@ def test_attr():
     }
 
     social_profile = SocialProfile(sc_dict)
-    expect(social_profile.type).to.equal('twitter')
-    expect(social_profile.url).to.equal('http://twitter.com/myname')
-    expect(social_profile.username).to.equal('myname')
-    expect(social_profile.id).to.equal('123456789')
+    eq_('twitter', social_profile.type)
+    eq_('http://twitter.com/myname', social_profile.url)
+    eq_('myname', social_profile.username)
+    eq_('123456789', social_profile.id)
 
 
 @raises(NotImplementedError)
@@ -125,18 +125,18 @@ def test_user_properties():
     except AttributeError:
         pass
 
-    expect(user.email).to.equal('somebody@example.com')
-    expect(user.user_id).to.equal(1234)
-    expect(user.name).to.equal('Somebody')
-    expect(user.last_seen_ip).to.equal('192.168.1.100')
-    expect(user.last_seen_user_agent).to.equal('Mozilla/5.0')
-    expect(user.last_request_at).to.equal(last_request_at)
-    expect(user.last_impression_at).to.equal(last_impression_at)
-    expect(user.relationship_score).to.equal(None)
-    expect(user.created_at).to.equal(created_at)
-    expect(user.unsubscribed_from_emails).to.equal(True)
-    expect(user.custom_data['name']).to.equal('Ace')
-    expect(user.session_count).to.equal(0)
+    eq_(user.email, 'somebody@example.com')
+    eq_(user.user_id, 1234)
+    eq_(user.name, 'Somebody')
+    eq_(user.last_seen_ip, '192.168.1.100')
+    eq_(user.last_seen_user_agent, 'Mozilla/5.0')
+    eq_(user.last_request_at, last_request_at)
+    eq_(user.last_impression_at, last_impression_at)
+    eq_(user.relationship_score, None)
+    eq_(user.created_at, created_at)
+    eq_(user.unsubscribed_from_emails, True)
+    eq_(user.custom_data['name'], 'Ace')
+    eq_(user.session_count, 0)
     raises(AttributeError, lambda: user.companies)
 
 
@@ -147,16 +147,16 @@ def test_company_properties():
         'created_at': 1331764344
     }
     company = Company(c_dict)
-    expect(company.id).to.equal(1)
-    expect(company.name).to.equal('Intercom')
-    expect(company.created_at).to.equal(datetime.fromtimestamp(1331764344))
+    eq_(company.id, 1)
+    eq_(company.name, 'Intercom')
+    eq_(company.created_at, datetime.fromtimestamp(1331764344))
 
     company.id = 100
     company.name = 'ACME Inc.'
     company.created_at = datetime.fromtimestamp(1331764300)
-    expect(company.id).to.equal(100)
-    expect(company.name).to.equal('ACME Inc.')
-    expect(company.created_at).to.equal(datetime.fromtimestamp(1331764300))
+    eq_(company.id, 100)
+    eq_(company.name, 'ACME Inc.')
+    eq_(company.created_at, datetime.fromtimestamp(1331764300))
 
 
 @raises(ValueError)
@@ -215,12 +215,12 @@ def test_location_properties():
         "country_code": "CHL"
     })
 
-    expect(location_data.city_name).to.equal('Santiago')
-    expect(location_data.continent_code).to.equal('SA')
-    expect(location_data.country_name).to.equal('Chile')
-    expect(location_data.latitude).to.equal(-33.44999999999999)
-    expect(location_data.longitude).to.equal(-70.6667)
-    expect(location_data.postal_code).to.equal('')
-    expect(location_data.region_name).to.equal('12')
-    expect(location_data.timezone).to.equal('Chile/Continental')
-    expect(location_data.country_code).to.equal('CHL')
+    eq_(location_data.city_name, 'Santiago')
+    eq_(location_data.continent_code, 'SA')
+    eq_(location_data.country_name, 'Chile')
+    eq_(location_data.latitude, -33.44999999999999)
+    eq_(location_data.longitude, -70.6667)
+    eq_(location_data.postal_code, '')
+    eq_(location_data.region_name, '12')
+    eq_(location_data.timezone, 'Chile/Continental')
+    eq_(location_data.country_code, 'CHL')
