dashboard: fix and test search_profile

circle/dashboard/tests/test_models.py

@@ -3,6 +3,7 @@ from django.contrib.auth.models import User
 from django.test import TestCase
 from django.test import TestCase
 
 
 from ..models import Profile
 from ..models import Profile
+from ..views import search_user
 
 
 
 
 class NotificationTestCase(TestCase):
 class NotificationTestCase(TestCase):
@@ -25,3 +26,27 @@ class NotificationTestCase(TestCase):
         assert 'user1' in msg.message
         assert 'user1' in msg.message
         assert 'testme' in msg.message
         assert 'testme' in msg.message
         assert msg in self.u1.notification_set.all()
         assert msg in self.u1.notification_set.all()
+
+
+class ProfileTestCase(TestCase):
+
+    def setUp(self):
+        self.u1 = User.objects.create(username='user1')
+        Profile.objects.get_or_create(user=self.u1)
+        self.u2 = User.objects.create(username='user2',
+                                      email='john@example.org')
+        Profile.objects.get_or_create(user=self.u2, org_id='apple')
+
+    def test_search_user_by_name(self):
+        self.assertEqual(search_user('user1'), self.u1)
+        self.assertEqual(search_user('user2'), self.u2)
+
+    def test_search_user_by_mail(self):
+        self.assertEqual(search_user('john@example.org'), self.u2)
+
+    def test_search_user_by_orgid(self):
+        self.assertEqual(search_user('apple'), self.u2)
+
+    def test_search_user_nonexist(self):
+        with self.assertRaises(User.DoesNotExist):
+            search_user('no-such-user')

circle/dashboard/views.py

@@ -50,9 +50,10 @@ def search_user(keyword):
     try:
     try:
         return User.objects.get(username=keyword)
         return User.objects.get(username=keyword)
     except User.DoesNotExist:
     except User.DoesNotExist:
-        return User.objects.get(email=keyword)
-    except User.DoesNotExist:
-        return User.objects.get(profile__org_id=keyword)
+        try:
+            return User.objects.get(profile__org_id=keyword)
+        except User.DoesNotExist:
+            return User.objects.get(email=keyword)
 
 
 
 
 # github.com/django/django/blob/stable/1.6.x/django/contrib/messages/views.py
 # github.com/django/django/blob/stable/1.6.x/django/contrib/messages/views.py