From 4bfc00106155229e7f444ede009c727491842fbe Mon Sep 17 00:00:00 2001
From: rodrigosiqueira <rodrigosiqueiramelo@gmail.com>
Date: Wed, 8 Apr 2015 12:02:35 -0300
Subject: [PATCH] Loggin upon existing email done.

---
 colab/accounts/forms.py            |  4 ++--
 colab/accounts/tests/test_forms.py | 47 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 49 insertions(+), 2 deletions(-)
 create mode 100644 colab/accounts/tests/test_forms.py

diff --git a/colab/accounts/forms.py b/colab/accounts/forms.py
index e735f30..418a67f 100644
--- a/colab/accounts/forms.py
+++ b/colab/accounts/forms.py
@@ -46,10 +46,10 @@ class UserForm(forms.ModelForm):
         # Forces username to be lowercase always
         widget=forms.TextInput(attrs={'style': 'text-transform: lowercase;'}),
     )
-    required = ('first_name', 'last_name', 'username')
+    required = ('first_name', 'last_name', 'username', 'email')
 
     class Meta:
-        fields = ('first_name', 'last_name', 'username')
+        fields = ('first_name', 'last_name', 'username', 'email')
         model = User
 
     def __init__(self, *args, **kwargs):
diff --git a/colab/accounts/tests/test_forms.py b/colab/accounts/tests/test_forms.py
new file mode 100644
index 0000000..892b7d7
--- /dev/null
+++ b/colab/accounts/tests/test_forms.py
@@ -0,0 +1,47 @@
+"""
+Test Form class.
+Objective: Test parameters, and behavior.
+"""
+from colab.accounts.forms import UserForm
+from colab.accounts.models import User
+from django.test import TestCase, Client
+from django import forms
+from django.core.exceptions import ValidationError
+from re import search
+
+class FormTest(TestCase):
+
+    def setUp(self):
+        user = User()
+        user.username = "USERtestCoLaB"
+        user.set_password("123colab4")
+        user.email = "usertest@colab.com.br"
+        user.id = 1
+        user.twitter = "usertestcolab"
+        user.facebook = "usertestcolab"
+        user.first_name = "USERtestCoLaB"
+        user.last_name = "COLAB"
+        user.save()
+
+    def create_form_data(self):
+        form_data = {'email': 'usertest@colab.com.br', 
+                    'first_name': 'colabName', 
+                    'last_name': 'secondName', 
+                    'username': 'colab',
+                    'password1': '123colab4',
+                    'password2': '123colab4'}
+        form = UserForm(data=form_data)
+        return form
+
+    def test_already_registered_email(self):
+        form = self.create_form_data()
+        self.assertFalse(form.is_valid())
+
+    def test_registered_email_message(self):
+        tryToFind = r"<a href='login'>sign in<a/>"
+        form = self.create_form_data()
+        matched = search(tryToFind, str(form))
+        self.assertIsNotNone(matched)
+
+    def tearDown(self):
+        pass
--
libgit2 0.21.2