Merge pull request #185 from colab/add_message_registration_resend_email

Adding registration message resend email

colab/accounts/tests/test_user.py

@@ -416,7 +416,7 @@ def test_password_changed_message(self):
                           "/account/change-password-done")
 
     def test_password_reset_done_custom_message(self):
-        self.message_test("We've emailed you instructions for setting " +
+        self.message_test("We've emailed you instructions for setting " +
                           "your password. You should be receiving them " +
                           "shortly.", "/account/password-reset-done/")
 

colab/accounts/tests/test_view_resend_email_verification.py

@@ -45,7 +45,7 @@ def test_resend_email_verification_sending_email(self, verify_email_mock):
 
         self.assertEquals(302, response.status_code)
 
-        msg = 'A email was sent by us. Verify your message box.'
+        msg = 'An email was sent to you. Verify your message box.'
         response = self.client.get("/account/resend-email-verification/")
         self.assertEquals(200, response.status_code)
         self.assertIn(msg, response.content)

colab/accounts/tests/test_view_signup.py

@@ -36,3 +36,15 @@ def test_user_authenticated_and_registered(self):
         url = "http://testserver/account/usertestcolab"
         self.assertEquals(url, response.url)
         self.client.logout()
+
+    def test_signup_with_valid_email_and_inactive_user(self):
+        message = ("This user already exists, but is not active. \
+Please check your spam or <a href='/account/resend-email-verification/'> \
+resend an email</a>")
+        options = {'username': 'another_user',
+                   'email': 'usertest@colab.com.br'}
+        self.user.is_active = False
+        self.user.save()
+        response = self.client.post("/account/register/", options)
+        self.assertTrue(200, response.status_code)
+        self.assertIn(message, response.content)

colab/accounts/views.py

@@ -105,6 +105,16 @@ def signup(request):
     user_form = ColabSetUsernameForm(request.POST)
     lists_form = ListsForm(request.POST)
 
+    user_email = user_form.data.get('email', '')
+    existent_user = User.objects.filter(email=user_email).first()
+
+    if existent_user and existent_user.is_active is False:
+        message = _("This user already exists, but is not active. \
+Please check your spam or <a href='/account/resend-email-verification/'> \
+resend an email</a>")
+
+        messages.info(request, message)
+
     if not user_form.is_valid() or not lists_form.is_valid():
         return render(request, 'accounts/user_create_form.html',
                       {'user_form': user_form, 'lists_form': lists_form})
@@ -212,7 +222,7 @@ def resend_email_verification(request):
                        kwargs={'key': email.validation_key})
     verification_url = request.build_absolute_uri(location)
     if EmailAddressValidation.verify_email(email, verification_url):
-        msg = _('A email was sent by us. Verify your message box.')
+        msg = _('An email was sent to you. Verify your message box.')
         messages.success(request, msg)
     else:
         msg = _('An error occurred while sending mail.')