Revert "Fix user email validation"

This reverts commit 59c15564ebca100f9019d942fcab3c1441a0bc93. This made a lot of tests fail

Revert "Fix user email validation"
This reverts commit 59c15564ebca100f9019d942fcab3c1441a0bc93. This made a lot of tests fail
Antonio Terceiro
1 parent 6193f05c
Showing 3 changed files with 2 additions and 24 deletions Show diff stats
app/views/account/_signup_form.html.erb
lib/noosfero/constants.rb
test/unit/user_test.rb
@@ -135,10 +135,6 @@
 <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() {
@@ -174,7 +170,7 @@ jQuery(function($) {
     $('#signup-balloon').fadeIn('slow');
   });
   $('#user_login').blur(function() { $('#signup-balloon').fadeOut('slow'); });
-  $('#signup-form').validate({ rules: { 'user[email]': { email: true, validEmail: true } }, messages: { 'user[email]' : '' } });
+  $('#signup-form').validate({ rules: { 'user[email]': { email: true } }, messages: { 'user[email]' : '' } });
   $('#user_email').focus(function() {
     $('#email-balloon').fadeIn('slow');
   });
 module Noosfero::Constants
-  EMAIL_FORMAT = /\A([^\W_])([\w._-]+)@((?:[-_a-z0-9]+\.)+[a-z]{2,})\Z/i
+  EMAIL_FORMAT = /\A([^@\s]+)@((?:[-_a-z0-9]+\.)+[a-z]{2,})\Z/i
   INTEGER_FORMAT = /\A\d*\Z/i
   PROFILE_PER_PAGE = 10
 end
@@ -14,24 +14,6 @@ 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([^\W_])([\w._-]+)@((?:[-_a-z0-9]+\.)+[a-z]{2,})\Z/i	2	+ EMAIL_FORMAT = /\A([^@\s]+)@((?:[-_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,24 +14,6 @@ class UserTest < ActiveSupport::TestCase		@@ -14,24 +14,6 @@ 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	-
35	def test_should_require_login	17	def test_should_require_login
36	assert_no_difference 'User.count' do	18	assert_no_difference 'User.count' do
37	u = new_user(:login => nil)	19	u = new_user(:login => nil)