deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #1163 from tomykaira/bug_1009

Browse source 
Fix #1009 Replace all special characters in user's identity
This commit is contained in:
Dmitriy Zaporozhets 2012-07-28 07:46:40 -07:00
parent 354d243878 03a2995e15
commit e1344a08f0
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/roles/account.rb
View file

@ -1,6 +1,6 @@
module Account module Account
def identifier def identifier
email.gsub /[@.]/, "_" email.gsub /[^[:alnum:]]/, "_"
end end
def is_admin? def is_admin?

5
spec/models/user_spec.rb
View file

@ -22,6 +22,11 @@ describe User do
user.identifier.should == "test_mail_com" user.identifier.should == "test_mail_com"
end end
it "should return identifier without + sign" do
user = User.new(:email => "test+foo@mail.com")
user.identifier.should == "test_foo_mail_com"
end
it "should execute callback when force_random_password specified" do it "should execute callback when force_random_password specified" do
user = User.new(:email => "test@mail.com", :force_random_password => true) user = User.new(:email => "test@mail.com", :force_random_password => true)
user.should_receive(:generate_password) user.should_receive(:generate_password)