Merge branch 'fix_user_email_validation' into 'master'

Fix user email validation Add regex to test the email validation. Fixes #82 See merge request !644

Merge branch 'fix_user_email_validation' into 'master'
Fix user email validation Add regex to test the email validation. Fixes #82 See merge request !644
Antonio Terceiro
2 parents a7f039c7 59c15564
Showing 3 changed files with 24 additions and 2 deletions Show diff stats
app/views/account/_signup_form.html.erb
lib/noosfero/constants.rb
test/unit/user_test.rb
@@ -135,6 +135,10 @@
 <script type="text/javascript">
 jQuery(function($) {
+  $.validator.addMethod('validEmail', function(value, element) {
+      var regex = /^([^\W_])([\w._-]+)@((?:[-_a-z0-9]+\.)+[a-z]{2,})$/i;
+      return this.optional(element) || regex.test(value);
+  }, 'Please enter a valid e-mail');
   $('#signup-form input[type=text], #signup-form textarea').each(function() {
     $(this).bind('blur', function() {
@@ -170,7 +174,7 @@ jQuery(function($) {
     $('#signup-balloon').fadeIn('slow');
   });
   $('#user_login').blur(function() { $('#signup-balloon').fadeOut('slow'); });
-  $('#signup-form').validate({ rules: { 'user[email]': { email: true } }, messages: { 'user[email]' : '' } });
+  $('#signup-form').validate({ rules: { 'user[email]': { email: true, validEmail: true } }, messages: { 'user[email]' : '' } });
   $('#user_email').focus(function() {
     $('#email-balloon').fadeIn('slow');
   });
 module Noosfero::Constants
-  EMAIL_FORMAT = /\A([^@\s]+)@((?:[-_a-z0-9]+\.)+[a-z]{2,})\Z/i
+  EMAIL_FORMAT = /\A([^\W_])([\w._-]+)@((?:[-_a-z0-9]+\.)+[a-z]{2,})\Z/i
   INTEGER_FORMAT = /\A\d*\Z/i
   PROFILE_PER_PAGE = 10
 end
@@ -14,6 +14,24 @@ class UserTest &lt; ActiveSupport::TestCase
     end
   end
+  should 'not create user with wrong email' do
+    user = User.new(login: 'test_user', email: 'tes*te@hotmail.com',
+                    password: '123456', password_confirmation: '123456')
+    user.save
+    assert_equal user.valid?, false
+    assert !user.errors[:email].nil?
+
+    user.email = '_teste@hotmail.com'
+    user.save
+    assert_equal user.valid?, false
+    assert !user.errors[:email].nil?
+
+    user.email = 'teste$@hotmail.com'
+    user.save
+    assert_equal user.valid?, false
+    assert !user.errors[:email].nil?
+  end
+
   def test_should_require_login
     assert_no_difference 'User.count' do
       u = new_user(:login => nil)
1	module Noosfero::Constants	1	module Noosfero::Constants
2	- EMAIL_FORMAT = /\A([^@\s]+)@((?:[-_a-z0-9]+\.)+[a-z]{2,})\Z/i	2	+ EMAIL_FORMAT = /\A([^\W_])([\w._-]+)@((?:[-_a-z0-9]+\.)+[a-z]{2,})\Z/i
3	INTEGER_FORMAT = /\A\d*\Z/i	3	INTEGER_FORMAT = /\A\d*\Z/i
4	PROFILE_PER_PAGE = 10	4	PROFILE_PER_PAGE = 10
5	end	5	end
	@@ -14,6 +14,24 @@ class UserTest < ActiveSupport::TestCase		@@ -14,6 +14,24 @@ class UserTest < ActiveSupport::TestCase
14	end	14	end
15	end	15	end
16		16
		17	+ should 'not create user with wrong email' do
		18	+ user = User.new(login: 'test_user', email: 'tes*te@hotmail.com',
		19	+ password: '123456', password_confirmation: '123456')
		20	+ user.save
		21	+ assert_equal user.valid?, false
		22	+ assert !user.errors[:email].nil?
		23	+
		24	+ user.email = '_teste@hotmail.com'
		25	+ user.save
		26	+ assert_equal user.valid?, false
		27	+ assert !user.errors[:email].nil?
		28	+
		29	+ user.email = 'teste$@hotmail.com'
		30	+ user.save
		31	+ assert_equal user.valid?, false
		32	+ assert !user.errors[:email].nil?
		33	+ end
		34	+
17	def test_should_require_login	35	def test_should_require_login
18	assert_no_difference 'User.count' do	36	assert_no_difference 'User.count' do
19	u = new_user(:login => nil)	37	u = new_user(:login => nil)