Fixing doctests to run against latest Dummy API.

jkeyes · jkeyes · commit f0094722835d · 2013-11-18T21:53:16.000Z
diff --git a/intercom/intercom.py b/intercom/intercom.py
@@ -23,7 +23,7 @@
 DEFAULT_TIMEOUT = 10  # seconds
 
 
-class IntercomError(StandardError):
+class IntercomError(Exception):
     """ Base error. """
     def __init__(self, message, result=None):
         super(IntercomError, self).__init__(message)
@@ -337,11 +337,11 @@ def reply_message_thread(
         ... thread_id=5591,
         ... body="If you're not talking to me you must be talking to someone")
         >>> len(message_thread)
-        8
+        9
         >>> message_thread['thread_id']
         5591
         >>> len(message_thread['messages'])
-        2
+        3
 
         """
         params = {
@@ -364,12 +364,12 @@ def create_tag(
 
         >>> tag = Intercom.create_tag("Free Trial", "tag",
         ... user_ids=["abc123", "def456"])
-        >>> tag.get('id', None)
+        >>> tag['id'] != None
+        True
         >>> tag['name']
         u'Free Trial'
-        >>> tag.get('tagged_user_count', None)
-        >>> tag['color']
-        u'green'
+        >>> tag['tagged_user_count']
+        2
 
         """
 
@@ -392,12 +392,12 @@ def update_tag(
 
         >>> tag = Intercom.update_tag("Free Trial", "tag",
         ... user_ids=["abc123", "def456"])
-        >>> tag.get('id', None)
+        >>> tag['id'] != None
+        True
         >>> tag['name']
         u'Free Trial'
-        >>> tag.get('tagged_user_count', None)
-        >>> tag['color']
-        u'green'
+        >>> tag['tagged_user_count']
+        2
 
         """
 
@@ -417,12 +417,12 @@ def get_tag(cls, name=None):
         """ Return a dict for the tag by the specified name.
 
         >>> tag = Intercom.get_tag(name="Free Trial")
-        >>> tag.get('id', None)
+        >>> tag['id'] != None
+        True
         >>> tag['name']
         u'Free Trial'
-        >>> tag.get('tagged_user_count', None)
-        >>> tag['color']
-        u'green'
+        >>> tag['tagged_user_count']
+        2
 
         """
 
diff --git a/intercom/message_thread.py b/intercom/message_thread.py
@@ -85,11 +85,13 @@ def reply(
         >>> message_thread = MessageThread.reply(email=email,
         ... thread_id=thread_id, body=body)
         >>> len(message_thread.messages)
-        2
+        3
         >>> message_thread.messages[0].html
         u'<p>Hey Intercom, What is up?</p>\n\n<p></p>'
         >>> message_thread.messages[1].html
-        u'<p>Are you talking to me?</p>'
+        u'<p>Not much, you?\n</p>'
+        >>> message_thread.messages[2].html
+        u'<p>Not much either :(</p>\n\n<p></p>'
 
         """
         resp = Intercom.reply_message_thread(
diff --git a/intercom/tag.py b/intercom/tag.py
@@ -24,12 +24,12 @@ def find(cls, **params):
         """ Find a tag using params.
 
         >>> tag = Tag.find(name="Free Trial")
-        >>> tag.id
+        >>> tag.id != None
+        True
         >>> tag.name
         u'Free Trial'
         >>> tag.tagged_user_count
-        >>> tag.color
-        u'green'
+        2
 
         """
         resp = Intercom.get_tag(**params)
@@ -40,12 +40,12 @@ def find_by_name(cls, name):
         """ Find a tag by name.
 
         >>> tag = Tag.find_by_name("Free Trial")
-        >>> tag.id
+        >>> tag.id != None
+        True
         >>> tag.name
         u'Free Trial'
         >>> tag.tagged_user_count
-        >>> tag.color
-        u'green'
+        2
 
         """
         return Tag.find(name=name)
@@ -58,12 +58,12 @@ def create(
 
         >>> tag = Tag.create(user_ids=["abc123", "def456"],
         ...        name="Free Trial", tag_or_untag="tag")
-        >>> tag.id
+        >>> tag.id != None
+        True
         >>> tag.name
         u'Free Trial'
         >>> tag.tagged_user_count
-        >>> tag.color
-        u'green'
+        2
 
         """
         resp = Intercom.create_tag(
@@ -80,8 +80,7 @@ def save(self):
         >>> tag.tag_or_untag = "tag"
         >>> tag.save()
         >>> tag.tagged_user_count
-        >>> tag.color
-        u'green'
+        2
 
         """
         resp = Intercom.update_tag(
