Marking some lines as noqa, and some tidy-up.

jkeyes · jkeyes · commit 8c3140f01a93 · 2015-03-18T09:43:58.000Z
diff --git a/tests/unit/new/user_spec.py b/tests/unit/new/user_spec.py
@@ -0,0 +1,40 @@
+import httpretty
+import json
+import re
+import mock
+import time
+
+from describe import expect
+from datetime import datetime
+from intercom.collection_proxy import CollectionProxy
+from intercom.lib.flat_store import FlatStore
+from intercom.user import User
+from intercom.utils import create_class_instance
+from tests.unit import test_user
+
+
+get = httpretty.GET
+post = httpretty.POST
+delete = httpretty.DELETE
+
+r = re.compile
+
+
+class DescribeIntercomUser:
+
+    @httpretty.activate
+    def it_raises_multiplematchingusers_error_when_receiving_a_conflict(self):
+        multiple_matching_error = {
+            'type': 'error.list',
+            'errors': [
+                {
+                    'code': 'conflict',
+                    'message': 'Multiple existing users match this email address - must be more specific using user_id'
+                }
+            ]
+        }
+        httpretty.register_uri(
+            get, r("/users"),
+            body=json.dumps(multiple_matching_error),
+            status=400)
+        print User.find(email='jo@example.com')
diff --git a/tests/unit/notification_spec.py b/tests/unit/notification_spec.py
@@ -1,8 +1,10 @@
+# -*- coding: utf-8 -*-
+
 from describe import expect
 from intercom.notification import Notification
 from intercom.utils import create_class_instance
-from tests.unit import test_user_notification
 from tests.unit import test_conversation_notification
+from tests.unit import test_user_notification
 
 
 class DescribeIntercomNotification:
@@ -13,7 +15,7 @@ def it_converts_notification_hash_to_object(self):
 
     def it_returns_correct_model_type_for_user(self):
         payload = Notification(**test_user_notification)
-        User = create_class_instance('User')
+        User = create_class_instance('User')  # noqa
 
         expect(payload.model).to.be_instance_of(User.__class__)
         expect(payload.model_type) == User.__class__
@@ -28,12 +30,12 @@ def it_returns_instance_of_user(self):
         expect(payload.model).to.be_instance_of(User.__class__)
 
     def it_returns_instance_of_conversation(self):
-        Conversation = create_class_instance('Conversation')
+        Conversation = create_class_instance('Conversation')  # noqa
         payload = Notification(**test_conversation_notification)
         expect(payload.model).to.be_instance_of(Conversation.__class__)
 
     def it_returns_correct_model_type_for_conversation(self):
-        Conversation = create_class_instance('Conversation')
+        Conversation = create_class_instance('Conversation')  # noqa
         payload = Notification(**test_conversation_notification)
         expect(payload.model_type) == Conversation.__class__
 
@@ -42,7 +44,7 @@ def it_returns_correct_conversation_notification_topic(self):
         expect(payload.topic) == "conversation.user.created"
 
     def it_returns_inner_user_object_for_conversation(self):
-        User = create_class_instance('User')
+        User = create_class_instance('User')  # noqa
         payload = Notification(**test_conversation_notification)
         expect(payload.model.user).to.be_instance_of(User.__class__)
 
