Use shortcut imports in the integration tests.

jkeyes · jkeyes · commit c0b55c064f07 · 2015-03-20T10:24:40.000Z
Also provide shortcut imports for Segment and Conversation.
diff --git a/intercom/__init__.py b/intercom/__init__.py
@@ -7,11 +7,13 @@
 from .request import Request
 from .admin import Admin
 from .company import Company
+from .conversation import Conversation
 from .event import Event
 from .message import Message
 from .note import Note
 from .notification import Notification
 from .user import User
+from .segment import Segment
 from .subscription import Subscription
 from .tag import Tag
 
@@ -23,7 +25,8 @@
 __version__ = '2.0.alpha'
 
 __all__ = (
-    Admin, Company, Event, Message, Note, Notification, Subscription, Tag, User
+    Admin, Company, Conversation, Event, Message, Note, Notification,
+    Segment, Subscription, Tag, User
 )
 
 
diff --git a/tests/integration/test_admin.py b/tests/integration/test_admin.py
@@ -3,7 +3,7 @@
 import os
 import unittest
 from intercom import Intercom
-from intercom.admin import Admin
+from intercom import Admin
 
 Intercom.app_id = os.environ.get('INTERCOM_APP_ID')
 Intercom.app_api_key = os.environ.get('INTERCOM_APP_API_KEY')
diff --git a/tests/integration/test_company.py b/tests/integration/test_company.py
@@ -5,8 +5,8 @@
 import time
 import unittest
 from intercom import Intercom
-from intercom.company import Company
-from intercom.user import User
+from intercom import Company
+from intercom import User
 
 Intercom.app_id = os.environ.get('INTERCOM_APP_ID')
 Intercom.app_api_key = os.environ.get('INTERCOM_APP_API_KEY')
diff --git a/tests/integration/test_conversations.py b/tests/integration/test_conversations.py
@@ -3,9 +3,9 @@
 import os
 import unittest
 from intercom import Intercom
-from intercom.admin import Admin
-from intercom.conversation import Conversation
-from intercom.user import User
+from intercom import Admin
+from intercom import Conversation
+from intercom import User
 
 Intercom.app_id = os.environ.get('INTERCOM_APP_ID')
 Intercom.app_api_key = os.environ.get('INTERCOM_APP_API_KEY')
@@ -93,10 +93,11 @@ def test_conversation_parts(self):
         # Getting the subject of a part (only applies to email-based
         # conversations)
         self.assertEqual(conversation.conversation_message.subject, "")
-        # Get the part_type of the first part
-        self.assertIsNotNone(conversation.conversation_parts[0].part_type)
-        # Get the body of the second part
-        self.assertIsNotNone(conversation.conversation_parts[1].body)
+        for part in conversation.conversation_parts:
+            # There is a part_type
+            self.assertIsNotNone(part.part_type)
+            # There is a body
+            self.assertIsNotNone(part.body)
 
     # def test_reply(self):
     #     # REPLYING TO CONVERSATIONS
diff --git a/tests/integration/test_notes.py b/tests/integration/test_notes.py
@@ -3,7 +3,7 @@
 import os
 import unittest
 from intercom import Intercom
-from intercom.note import Note
+from intercom import Note
 
 Intercom.app_id = os.environ.get('INTERCOM_APP_ID')
 Intercom.app_api_key = os.environ.get('INTERCOM_APP_API_KEY')
diff --git a/tests/integration/test_segments.py b/tests/integration/test_segments.py
@@ -5,7 +5,7 @@
 import unittest
 from datetime import datetime
 from intercom import Intercom
-from intercom.segment import Segment
+from intercom import Segment
 
 Intercom.app_id = os.environ.get('INTERCOM_APP_ID')
 Intercom.app_api_key = os.environ.get('INTERCOM_APP_API_KEY')
diff --git a/tests/integration/test_tags.py b/tests/integration/test_tags.py
@@ -3,8 +3,8 @@
 import os
 import unittest
 from intercom import Intercom
-from intercom.tag import Tag
-from intercom.user import User
+from intercom import Tag
+from intercom import User
 
 Intercom.app_id = os.environ.get('INTERCOM_APP_ID')
 Intercom.app_api_key = os.environ.get('INTERCOM_APP_API_KEY')
diff --git a/tests/integration/test_user.py b/tests/integration/test_user.py
@@ -3,7 +3,7 @@
 import os
 import unittest
 from intercom import Intercom
-from intercom.user import User
+from intercom import User
 
 Intercom.app_id = os.environ.get('INTERCOM_APP_ID')
 Intercom.app_api_key = os.environ.get('INTERCOM_APP_API_KEY')
