Completely removed HTTPretty now.

jkeyes · jkeyes · commit 5030836bf253 · 2015-04-02T02:59:08.000+01:00
diff --git a/dev-requirements.txt b/dev-requirements.txt
@@ -2,7 +2,4 @@
 # Development dependencies.
 #
 nose==1.3.4
-httpretty==0.8.6
 mock==1.0.1
-coverage==3.7.1
-Sphinx==1.3.1
diff --git a/intercom/traits/api_resource.py b/intercom/traits/api_resource.py
@@ -78,7 +78,7 @@ def attributes(self):
         return res
 
     def submittable_attribute(self, name, value):
-        return name in self.changed_attributes or (isinstance(value, FlatStore) and name in self.flat_store_attributes)  # noqa
+        return name in self.changed_attributes or (isinstance(value, FlatStore) and name in self.flat_store_attributes)  # noqa
 
     def __getattribute__(self, attribute):
         value = super(Resource, self).__getattribute__(attribute)
diff --git a/tests/integration/issues/test_73.py b/tests/integration/issues/test_73.py
@@ -0,0 +1,38 @@
+# -*- coding: utf-8 -*-
+"""
+How do I record when a User has started a new session?
+"""
+
+import os
+import unittest
+from intercom import Intercom
+from intercom import User
+
+Intercom.app_id = os.environ.get('INTERCOM_APP_ID')
+Intercom.app_api_key = os.environ.get('INTERCOM_APP_API_KEY')
+
+
+class Issue73Test(unittest.TestCase):
+
+    def test(self):
+        user = User.create(email='me@example.com')
+        # store current session count
+        session_count = user.session_count
+
+        import time
+        time.sleep(30)
+        # register a new session
+        user.new_session = True
+        user.save()
+
+        # count has increased by 1
+        self.assertEquals(session_count + 1, user.session_count)
+
+        import time
+        time.sleep(30)
+        # register a new session
+        user.new_session = True
+        user.save()
+
+        # count has increased by 1
+        self.assertEquals(session_count + 2, user.session_count)
diff --git a/tests/unit/test_event.py b/tests/unit/test_event.py
@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
 
-import httpretty
 import time
 import unittest
 
@@ -41,7 +40,6 @@ def it_creates_an_event_with_metadata(self):
             mock_method.assert_called_once_with('/events/', **data)
 
     @istest
-    @httpretty.activate
     def it_creates_an_event_without_metadata(self):
         data = {
             'event_name': 'sale of item',
diff --git a/tests/unit/test_note.py b/tests/unit/test_note.py
@@ -1,8 +1,5 @@
 # -*- coding: utf-8 -*-
 
-import httpretty
-import json
-import re
 import unittest
 
 from intercom import Intercom
@@ -11,30 +8,21 @@
 from nose.tools import eq_
 from nose.tools import istest
 
-post = httpretty.POST
-r = re.compile
-
 
 class NoteTest(unittest.TestCase):
 
     @istest
-    @httpretty.activate
     def it_creates_a_note(self):
         data = {
             'body': '<p>Note to leave on user</p>',
             'created_at': 1234567890
         }
         with patch.object(Intercom, 'post', return_value=data) as mock_method:
-            # message = Message.create(**data)
-            # eq_('halp', message.body)
-            # httpretty.register_uri(
-            #     post, r(r'/notes/$'), body=json.dumps(data))
             note = Note.create(body="Note to leave on user")
-            mock_method.assert_called_once_with('/notes/', body="Note to leave on user")
+            mock_method.assert_called_once_with('/notes/', body="Note to leave on user")  # noqa
             eq_(note.body, "<p>Note to leave on user</p>")
 
     @istest
-    @httpretty.activate
     def it_sets_gets_allowed_keys(self):
         params = {
             'body': 'Note body',
diff --git a/tests/unit/test_request.py b/tests/unit/test_request.py
@@ -40,7 +40,6 @@ def it_raises_authentication_error_unauthorized(self):
                 Request.send_request_to_path('GET', 'notes', ('x', 'y'), resp)
 
     @istest
-    # @httpretty.activate
     def it_raises_authentication_error_forbidden(self):
         resp = Mock(content='{}', status_code=403)
         with patch('requests.request') as mock_method:
@@ -49,7 +48,6 @@ def it_raises_authentication_error_forbidden(self):
                 Request.send_request_to_path('GET', 'notes', ('x', 'y'), resp)
 
     @istest
-    # @httpretty.activate
     def it_raises_server_error(self):
         resp = Mock(content='{}', status_code=500)
         with patch('requests.request') as mock_method:
@@ -58,7 +56,6 @@ def it_raises_server_error(self):
                 Request.send_request_to_path('GET', 'notes', ('x', 'y'), resp)
 
     @istest
-    # @httpretty.activate
     def it_raises_bad_gateway_error(self):
         resp = Mock(content='{}', status_code=502)
         with patch('requests.request') as mock_method:
@@ -67,7 +64,6 @@ def it_raises_bad_gateway_error(self):
                 Request.send_request_to_path('GET', 'notes', ('x', 'y'), resp)
 
     @istest
-    # @httpretty.activate
     def it_raises_service_unavailable_error(self):
         resp = Mock(content='{}', status_code=503)
         with patch('requests.request') as mock_method:
diff --git a/tests/unit/test_subscription.py b/tests/unit/test_subscription.py
@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 
-import httpretty
-import re
 import unittest
 
 from intercom import Intercom
@@ -11,11 +9,6 @@
 from nose.tools import istest
 from tests.unit import test_subscription
 
-get = httpretty.GET
-post = httpretty.POST
-
-r = re.compile
-
 
 class SubscriptionTest(unittest.TestCase):
 
diff --git a/tests/unit/test_user.py b/tests/unit/test_user.py
@@ -1,9 +1,7 @@
 # -*- coding: utf-8 -*-
 
-import httpretty
 import json
 import mock
-import re
 import time
 import unittest
 
@@ -23,13 +21,6 @@
 from tests.unit import get_user
 
 
-get = httpretty.GET
-post = httpretty.POST
-delete = httpretty.DELETE
-
-r = re.compile
-
-
 class UserTest(unittest.TestCase):
 
     @istest
@@ -130,8 +121,10 @@ def it_allows_update_last_request_at(self):
             'update_last_request_at': True,
             'custom_attributes': {}
         }
-        httpretty.register_uri(post, r("/users"), body=json.dumps(payload))
-        User(user_id='1224242', update_last_request_at=True)
+        with patch.object(Intercom, 'post', return_value=payload) as mock_method:
+            User.create(user_id='1224242', update_last_request_at=True)
+            mock_method.assert_called_once_with(
+                '/users/', update_last_request_at=True, user_id='1224242')
 
     @istest
     def it_allows_easy_setting_of_custom_data(self):

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,4 @@`
`2`	`2`	`# Development dependencies.`
`3`	`3`	`#`
`4`	`4`	`nose==1.3.4`
`5`		`-httpretty==0.8.6`
`6`	`5`	`mock==1.0.1`
`7`		`-coverage==3.7.1`
`8`		`-Sphinx==1.3.1`