IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-16 18:24:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: strip whitespaces from user email

Browse Source
This commit is contained in:
Arpit Jalan 2015-01-30 01:11:41 +05:30
parent 22adb682d8
commit 6c410ed093
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/models/user.rb
View File

@ -62,7 +62,7 @@ class User < ActiveRecord::Base
delegate :last_sent_email_address, :to => :email_logs delegate :last_sent_email_address, :to => :email_logs
before_validation :downcase_email before_validation :strip_downcase_email
validates_presence_of :username validates_presence_of :username
validate :username_validator validate :username_validator
@ -764,8 +764,11 @@ class User < ActiveRecord::Base
self.username_lower = username.downcase self.username_lower = username.downcase
end end
def downcase_email def strip_downcase_email
self.email = self.email.downcase if self.email if self.email
self.email = self.email.strip
self.email = self.email.downcase
end
end end
def username_validator def username_validator

10
spec/models/user_spec.rb
View File

@ -261,8 +261,14 @@ describe User do
it "downcases email addresses" do it "downcases email addresses" do
user = Fabricate.build(:user, email: 'Fancy.Caps.4.U@gmail.com') user = Fabricate.build(:user, email: 'Fancy.Caps.4.U@gmail.com')
user.save user.valid?
expect(user.reload.email).to eq('fancy.caps.4.u@gmail.com') expect(user.email).to eq('fancy.caps.4.u@gmail.com')
end
it "strips whitespace from email addresses" do
user = Fabricate.build(:user, email: ' example@gmail.com ')
user.valid?
expect(user.email).to eq('example@gmail.com')
end end
end end