Merge lp:~canonical-isd-hackers/canonical-identity-provider/fix-api-email-error into lp:canonical-identity-provider/release

[Łukasz Czyżykowski]

Fixed inconsistency for API error returned when email is already registered.

This branch fixes inconsistency for "email already registered" error not being returned in the list (as all other are).

With fix there's test case to check that behaviour.

Because that particular error is not showed in doctest there's no need to update them.

[Stuart Metcalfe (stuartmetcalfe)]

Looks good to me

review: Approve

=== modified file 'identityprovider/tests/test_models_api.py'
--- identityprovider/tests/test_models_api.py	2010-05-19 20:52:44 +0000
+++ identityprovider/tests/test_models_api.py	2010-09-22 14:39:48 +0000
@@ -1,7 +1,12 @@
 # Copyright 2010 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
+from django.test import TestCase
 
+from identityprovider.models.emailaddress import EmailAddress
+from identityprovider.models.const import EmailStatus
 from identityprovider.models.api import APIUser
+from identityprovider.webservice.models import RegistrationSet
+from identityprovider.webservice import forms
 from identityprovider.tests.utils import SQLCachedTestCase
 from identityprovider.utils import encrypt_launchpad_password, generate_salt
 
@@ -39,3 +44,23 @@
 
     def test_unicode(self):
         self.assertEqual(unicode(self.user), u'username')
+
+
+class RegistrationSetTestCase(TestCase):
+
+    def test_register_email_error_is_in_list(self):
+        old_gcbr = forms.get_current_browser_request
+        forms.get_current_browser_request = lambda: self
+        self.environment = {}
+        EmailAddress.objects.create(email="[e-mail]",
+                                    status=EmailStatus.NEW)
+
+        registration = RegistrationSet()
+        r = registration.register(email="[e-mail]",
+                                  password="blogdf3Daa",
+                                  captcha_solution="solution",
+                                  captcha_id="id")
+
+        self.assertEquals(r['errors'], {'email': ["Email already registered"]})
+
+        forms.get_current_browser_request = old_gcbr

=== modified file 'identityprovider/webservice/models.py'
--- identityprovider/webservice/models.py	2010-08-27 11:26:30 +0000
+++ identityprovider/webservice/models.py	2010-09-22 14:39:48 +0000
@@ -231,7 +231,7 @@
         emails = EmailAddress.objects.filter(email__iexact=requested_email)
         if len(emails) > 0:
             return {'status': 'error', 'errors':
-                    {'email': 'Email already registered'}}
+                    {'email': ['Email already registered']}}
 
         account = Account.objects.create(
             creation_rationale=AccountCreationRationale.OWNER_CREATED_LAUNCHPAD,