Mirrors/redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2024-09-13 15:45:44 +02:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merged r9449 from trunk.

Browse Source 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9454 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2012-04-20 06:14:32 +00:00
parent 2b2f721ef4
commit da1a3449ce
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/user.rb
View File

@ -68,7 +68,7 @@ class User < Principal
MAIL_LENGTH_LIMIT = 60
validates_presence_of :login, :firstname, :lastname, :mail, :if => Proc.new { |user| !user.is_a?(AnonymousUser) }
validates_uniqueness_of :login, :if => Proc.new { |user| !user.login.blank? }, :case_sensitive => false
validates_uniqueness_of :login, :if => Proc.new { |user| user.login_changed? && user.login.present? }, :case_sensitive => false
validates_uniqueness_of :mail, :if => Proc.new { |user| !user.mail.blank? }, :case_sensitive => false
# Login must contain lettres, numbers, underscores only
validates_format_of :login, :with => /^[a-z0-9_\-@\.]*$/i

14
test/unit/user_test.rb
View File

@ -134,6 +134,20 @@ class UserTest < ActiveSupport::TestCase
assert_equal "john", @admin.login
end
def test_update_should_not_fail_for_legacy_user_with_different_case_logins
u1 = User.new(:firstname => "new", :lastname => "user", :mail => "newuser1@somenet.foo")
u1.login = 'newuser1'
assert u1.save
u2 = User.new(:firstname => "new", :lastname => "user", :mail => "newuser2@somenet.foo")
u2.login = 'newuser1'
assert u2.save(false)
user = User.find(u2.id)
user.firstname = "firstname"
assert user.save, "Save failed"
end
def test_destroy_should_delete_members_and_roles
members = Member.find_all_by_user_id(2)
ms = members.size