user email duplication tests

spirit/views/user.py

@@ -197,13 +197,12 @@ def email_change_confirm(request, token):
         form = EmailCheckForm(data={'email': email, })
 
         if form.is_valid():
-            # TODO: test!
             user.email = form.get_email()
             user.save()
             messages.info(request, _("Your email has been changed!"))
-        else:
-            messages.error(request, _("Sorry, we were not able to change your email."))
+            return redirect(reverse('spirit:profile-update'))
 
+    messages.error(request, _("Sorry, we were not able to change your email."))
     return redirect(reverse('spirit:profile-update'))
 
 

tests/tests_user.py

@@ -521,6 +521,30 @@ def test_email_change_confirm_invalid(self):
         self.assertRedirects(response, expected_url, status_code=302)
         self.assertEqual(User.objects.get(pk=self.user.pk).email, new_email)
 
+    def test_email_change_duplicated(self):
+        """
+        email should be unique
+        """
+        utils.login(self)
+        utils.create_user(email="duplicated@bar.com")
+        new_email = "duplicated@bar.com"
+        old_email = self.user.email
+        token = UserEmailChangeTokenGenerator().generate(self.user, new_email)
+        self.client.get(reverse('spirit:email-change-confirm', kwargs={'token': token}))
+        self.assertEqual(User.objects.get(pk=self.user.pk).email, old_email)
+
+    @override_settings(ST_UNIQUE_EMAILS=False)
+    def test_email_change_duplicated_allowed(self):
+        """
+        Duplicated email allowed
+        """
+        utils.login(self)
+        utils.create_user(email="duplicated@bar.com")
+        new_email = "duplicated@bar.com"
+        token = UserEmailChangeTokenGenerator().generate(self.user, new_email)
+        self.client.get(reverse('spirit:email-change-confirm', kwargs={'token': token}))
+        self.assertEqual(User.objects.get(pk=self.user.pk).email, new_email)
+
     def test_profile_email_change(self):
         """
         email change