1
Download as
Browse Code »

Commit 59c15564ebca100f9019d942fcab3c1441a0bc93

Authored by Brenddon Gontijo
Committed by Gabriela Navarro
1 parent f6dc326c
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Fix user email validation 

Signed-off-by: Andre Bernardes <andrebsguedes@gmail.com>
Signed-off-by: Brenddon Gontijo <brenddongontijo@msn.com>
Signed-off-by: Filipe Ribeiro <firibeiro77@live.com>
Showing 3 changed files with 24 additions and 2 deletions   Show diff stats
app/views/account/_signup_form.html.erb
  Diff comments   View file @59c1556
... ... @@ -135,6 +135,10 @@
135 135  
136 136 <script type="text/javascript">
137 137 jQuery(function($) {
  138 + $.validator.addMethod('validEmail', function(value, element) {
  139 + var regex = /^([^\W_])([\w._-]+)@((?:[-_a-z0-9]+\.)+[a-z]{2,})$/i;
  140 + return this.optional(element) || regex.test(value);
  141 + }, 'Please enter a valid e-mail');
138 142  
139 143 $('#signup-form input[type=text], #signup-form textarea').each(function() {
140 144 $(this).bind('blur', function() {
... ... @@ -170,7 +174,7 @@ jQuery(function($) {
170 174 $('#signup-balloon').fadeIn('slow');
171 175 });
172 176 $('#user_login').blur(function() { $('#signup-balloon').fadeOut('slow'); });
173   - $('#signup-form').validate({ rules: { 'user[email]': { email: true } }, messages: { 'user[email]' : '' } });
  177 + $('#signup-form').validate({ rules: { 'user[email]': { email: true, validEmail: true } }, messages: { 'user[email]' : '' } });
174 178 $('#user_email').focus(function() {
175 179 $('#email-balloon').fadeIn('slow');
176 180 });
... ...
lib/noosfero/constants.rb
  Diff comments   View file @59c1556
1 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 3 INTEGER_FORMAT = /\A\d*\Z/i
4 4 PROFILE_PER_PAGE = 10
5 5 end
... ...
test/unit/user_test.rb
  Diff comments   View file @59c1556
... ... @@ -14,6 +14,24 @@ class UserTest &lt; ActiveSupport::TestCase
14 14 end
15 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 35 def test_should_require_login
18 36 assert_no_difference 'User.count' do
19 37 u = new_user(:login => nil)
... ...