Navigation

Changeset 357

Timestamp:

04/10/06 04:12:42 (3 years ago)

Author:

snowblink

Message:

Added simple email validation to the User model.
This should also take care of the unit test failures detailed in Ticket #114

Files:

r340	r357
18	18	validates_uniqueness_of :login
19	19	validates_uniqueness_of :email
	20	validates_format_of :email, :with => /^[^@]+@.+$/
20	21
21	22	validates_presence_of :password, :if => :validate_password?

r282	r357
33	33	u = User.new
34	34	u.login = "nonbob"
	35	u.email = "bobs@email.com"
35	36
36	37	u.change_password("tiny")
…	…
56	57	u = User.new
57	58	u.change_password("bobs_secure_password")
	59	u.email = "bobs@email.com"
58	60
59	61	u.login = "x"
…	…
88	90	u.login = "nonexistingbob"
89	91	u.change_password("bobs_secure_password")
	92	u.email = "bobs@email.com"
90	93
91	94	assert u.save
92	95
93	96	end
94
	97
	98	def test_email_should_be_nominally_valid
	99	u = User.new
	100	u.login = "email_test"
	101	u.change_password("email_test_password")
	102
	103	assert !u.save
	104	assert u.errors.invalid?('email')
	105
	106	u.email = "invalid_email"
	107	assert !u.save
	108	assert u.errors.invalid?('email')
	109
	110	u.email = "valid@email.com"
	111	assert u.save
	112	end
	113
95	114	end