Download as
Browse Code »

Commit f176f5652c60bde2939053910b972ec77842b905

Authored by Antonio Terceiro
1 parent 6193f05c
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

Revert "Fix user email validation" 

This reverts commit 59c15564ebca100f9019d942fcab3c1441a0bc93.

This made a lot of tests fail
Showing 3 changed files with 2 additions and 24 deletions   Show diff stats
app/views/account/_signup_form.html.erb
  Diff comments   View file @f176f56
... ... @@ -135,10 +135,6 @@
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');
142 138  
143 139 $('#signup-form input[type=text], #signup-form textarea').each(function() {
144 140 $(this).bind('blur', function() {
... ... @@ -174,7 +170,7 @@ jQuery(function($) {
174 170 $('#signup-balloon').fadeIn('slow');
175 171 });
176 172 $('#user_login').blur(function() { $('#signup-balloon').fadeOut('slow'); });
177   - $('#signup-form').validate({ rules: { 'user[email]': { email: true, validEmail: true } }, messages: { 'user[email]' : '' } });
  173 + $('#signup-form').validate({ rules: { 'user[email]': { email: true } }, messages: { 'user[email]' : '' } });
178 174 $('#user_email').focus(function() {
179 175 $('#email-balloon').fadeIn('slow');
180 176 });
... ...
lib/noosfero/constants.rb
  Diff comments   View file @f176f56
1 1 module Noosfero::Constants
2   - EMAIL_FORMAT = /\A([^\W_])([\w._-]+)@((?:[-_a-z0-9]+\.)+[a-z]{2,})\Z/i
  2 + EMAIL_FORMAT = /\A([^@\s]+)@((?:[-_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 @f176f56
... ... @@ -14,24 +14,6 @@ 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   -
35 17 def test_should_require_login
36 18 assert_no_difference 'User.count' do
37 19 u = new_user(:login => nil)
... ...