Fields validation

carol15022 · Sergio Oliveira
1 parent 364ecdc0
Showing 3 changed files with 58 additions and 36 deletions Show diff stats
colab/accounts/forms.py
colab/accounts/tests/test_user.py
colab/accounts/tests/test_view_signup.py
@@ -2,6 +2,7 @@
 from collections import OrderedDict
+from django.http import HttpRequest
 from django import forms
 from django.contrib.auth import authenticate, get_user_model
 from django.contrib.auth.forms import ReadOnlyPasswordHashField
@@ -60,8 +61,51 @@ class UserForm(forms.ModelForm):
         if not username:
             raise forms.ValidationError(_('This field cannot be blank.'))
         return username
-
-
+ 
+    def clean_first_name(self):
+        first_name = self.cleaned_data["first_name"].strip() 
+        if not first_name:
+            raise forms.ValidationError(_('This field cannot be blank.'))
+        return first_name
+ 
+    def clean_last_name(self):
+        last_name = self.cleaned_data["last_name"].strip()
+        if not last_name:
+            raise forms.ValidationError(_('This field cannot be blank.'))
+        return last_name
+   
+    def clean_twitter(self):
+        twitter = self.cleaned_data["twitter"]
+        if twitter is not None and twitter.isspace():
+                return self.initial.get("twitter")
+        return twitter
+
+    def clean_facebook(self):
+        facebook = self.cleaned_data["facebook"]
+        if facebook is not None and facebook.isspace():
+                return self.initial.get("facebook")
+        return facebook
+
+    def clean_webpage(self):
+        webpage = self.cleaned_data["webpage"].strip()
+        return webpage
+   
+    def clean_role(self):
+        role = self.cleaned_data["role"].strip()
+        return role 
+    
+    def clean_institution(self):
+        institution = self.cleaned_data["institution"].strip()
+        return institution
+
+    def clean_bio(self):
+        bio = self.cleaned_data["bio"].strip()
+        return bio
+    
+    def clean_github(self):
+        github = self.cleaned_data["github"].strip()
+        return github    
+    
 class UserUpdateForm(UserForm):
     bio = forms.CharField(
         widget=forms.Textarea(attrs={'rows': '6', 'maxlength': '200'}),
@@ -116,11 +116,6 @@ class UserTest(TestCase):
         self.validate_mandatory_fields('USERtestCoLaB', 'COLAB', ' ', ' ')
         self.user.delete()
-    def test_update_user_mandatory_invalid_using_number(self):
-        self.authenticate_user()
-        self.validate_mandatory_fields('USERtestCoLaB', 'COLAB', '123', '456')
-        self.user.delete()
-
     def test_update_user_institution(self):
         self.authenticate_user()
         self.validate_non_mandatory_fields('institution', 'fga', 'fga')
@@ -148,11 +143,7 @@ class UserTest(TestCase):
     def test_update_user_institution_invalid_whitespace(self):
         self.authenticate_user()
-        self.validate_non_mandatory_fields('institution', None, ' ')
-
-    def test_update_user_institution_invalid_using_number(self):
-        self.authenticate_user()
-        self.validate_non_mandatory_fields('institution', None, '123')
+        self.validate_non_mandatory_fields('institution', '', ' ')
         self.user.delete()
     def test_update_user_role(self):
@@ -182,12 +173,7 @@ class UserTest(TestCase):
     def test_update_user_role_invalid_whitespace(self):
         self.authenticate_user()
-        self.validate_non_mandatory_fields('role', None, ' ')
-        self.user.delete()
-
-    def test_update_user_role_invalid_using_number(self):
-        self.authenticate_user()
-        self.validate_non_mandatory_fields('role', None, '123')
+        self.validate_non_mandatory_fields('role', '', ' ')
         self.user.delete()
     def test_update_user_twitter(self):
@@ -226,11 +212,6 @@ class UserTest(TestCase):
         self.validate_non_mandatory_fields('twitter', 'usertestcolab', ' ')
         self.user.delete()
-    def test_update_user_twitter_invalid_using_number(self):
-        self.authenticate_user()
-        self.validate_non_mandatory_fields('twitter', 'usertestcolab', '123')
-        self.user.delete()
-
     '''
     Max_lenght is the maximmum size accept by Faceebook.
     Tests related with twitter should have internet connection,
@@ -267,11 +248,6 @@ class UserTest(TestCase):
         self.validate_non_mandatory_fields('facebook', 'usertestcolab', ' ')
         self.user.delete()
-    def test_update_user_facebook_invalid_using_number(self):
-        self.authenticate_user()
-        self.validate_non_mandatory_fields('facebook', 'usertestcolab', '123')
-        self.user.delete()
-
     def test_update_user_gtalk(self):
         self.authenticate_user()
         self.validate_non_mandatory_fields('google_talk', 'gtalk@colab.com.br',
@@ -332,7 +308,7 @@ class UserTest(TestCase):
     def test_update_user_github_invalid_whitespace(self):
         self.authenticate_user()
-        self.validate_non_mandatory_fields('github', None, ' ')
+        self.validate_non_mandatory_fields('github', '', ' ')
         self.user.delete()
     def test_update_user_webpage(self):
@@ -362,7 +338,7 @@ class UserTest(TestCase):
     def test_update_user_webpage_invalid_whitespace(self):
         self.authenticate_user()
-        self.validate_non_mandatory_fields('webpage', None, ' ')
+        self.validate_non_mandatory_fields('webpage', '', ' ')
         self.user.delete()
     def test_update_user_bio(self):
@@ -392,5 +368,5 @@ class UserTest(TestCase):
     def test_update_user_bio_invalid_whitespace(self):
         self.authenticate_user()
-        self.validate_non_mandatory_fields('bio', None, ' ')
+        self.validate_non_mandatory_fields('bio', '', ' ')
         self.user.delete()
@@ -5,7 +5,7 @@ This test related with accounts/views.py
 from django.test import TestCase, Client
 from colab.accounts.models import User
-
+from django.core.cache import cache
 class TestSignUpView(TestCase):
@@ -38,7 +38,9 @@ class TestSignUpView(TestCase):
         self.client.logout()
     def test_user_not_authenticated(self):
-        response = self.client.get("/account/register/")
-        self.assertEquals(302, response.status_code)
-        url = "http://testserver/account/login"
-        self.assertEquals(url, response.url)
+        with self.settings(BROWSERID_ENABLE=True):
+            cache.clear()
+            response = self.client.get("/account/register/")
+            self.assertEquals(302, response.status_code)
+            url = "http://testserver/account/login"
+            self.assertEquals(url, response.url)
	@@ -2,6 +2,7 @@		@@ -2,6 +2,7 @@
2		2
3	from collections import OrderedDict	3	from collections import OrderedDict
4		4
		5	+from django.http import HttpRequest
5	from django import forms	6	from django import forms
6	from django.contrib.auth import authenticate, get_user_model	7	from django.contrib.auth import authenticate, get_user_model
7	from django.contrib.auth.forms import ReadOnlyPasswordHashField	8	from django.contrib.auth.forms import ReadOnlyPasswordHashField
	@@ -60,8 +61,51 @@ class UserForm(forms.ModelForm):		@@ -60,8 +61,51 @@ class UserForm(forms.ModelForm):
60	if not username:	61	if not username:
61	raise forms.ValidationError(_('This field cannot be blank.'))	62	raise forms.ValidationError(_('This field cannot be blank.'))
62	return username	63	return username
63	-
64	-	64	+
		65	+ def clean_first_name(self):
		66	+ first_name = self.cleaned_data["first_name"].strip()
		67	+ if not first_name:
		68	+ raise forms.ValidationError(_('This field cannot be blank.'))
		69	+ return first_name
		70	+
		71	+ def clean_last_name(self):
		72	+ last_name = self.cleaned_data["last_name"].strip()
		73	+ if not last_name:
		74	+ raise forms.ValidationError(_('This field cannot be blank.'))
		75	+ return last_name
		76	+
		77	+ def clean_twitter(self):
		78	+ twitter = self.cleaned_data["twitter"]
		79	+ if twitter is not None and twitter.isspace():
		80	+ return self.initial.get("twitter")
		81	+ return twitter
		82	+
		83	+ def clean_facebook(self):
		84	+ facebook = self.cleaned_data["facebook"]
		85	+ if facebook is not None and facebook.isspace():
		86	+ return self.initial.get("facebook")
		87	+ return facebook
		88	+
		89	+ def clean_webpage(self):
		90	+ webpage = self.cleaned_data["webpage"].strip()
		91	+ return webpage
		92	+
		93	+ def clean_role(self):
		94	+ role = self.cleaned_data["role"].strip()
		95	+ return role
		96	+
		97	+ def clean_institution(self):
		98	+ institution = self.cleaned_data["institution"].strip()
		99	+ return institution
		100	+
		101	+ def clean_bio(self):
		102	+ bio = self.cleaned_data["bio"].strip()
		103	+ return bio
		104	+
		105	+ def clean_github(self):
		106	+ github = self.cleaned_data["github"].strip()
		107	+ return github
		108	+
65	class UserUpdateForm(UserForm):	109	class UserUpdateForm(UserForm):
66	bio = forms.CharField(	110	bio = forms.CharField(
67	widget=forms.Textarea(attrs={'rows': '6', 'maxlength': '200'}),	111	widget=forms.Textarea(attrs={'rows': '6', 'maxlength': '200'}),