Makes User.find_by_mail case-insensitive (password reminder #2322, repo users mapping).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2122 e93f8b46-1217-0410-a6f0-8f06a7374b81

Makes User.find_by_mail case-insensitive (password reminder #2322, repo users mapping).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2122 e93f8b46-1217-0410-a6f0-8f06a7374b81
72d0843c · Jean-Philippe Lang · da98386b · 72d0843c · 72d0843c · 72d0843c
Commit 72d0843c authored Dec 12, 2008 by Jean-Philippe Lang
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 1 deletion

user.rb app/models/user.rb +5 -0

account_test.rb test/integration/account_test.rb +1 -1

user_test.rb test/unit/user_test.rb +6 -0

No files found.
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -178,6 +178,11 @@ class User < ActiveRecord::Base
    token = Token.find_by_action_and_value('autologin', key)
    token && (token.created_on > Setting.autologin.to_i.day.ago) && token.user.active? ? token.user : nil
  end
+  
+  # Makes find_by_mail case-insensitive
+  def self.find_by_mail(mail)
+    find(:first, :conditions => ["LOWER(mail) = ?", mail.to_s.downcase])
+  end

  # Sort users by their display names
  def <=>(user)

--- a/test/integration/account_test.rb
+++ b/test/integration/account_test.rb
@@ -44,7 +44,7 @@ class AccountTest < ActionController::IntegrationTest
    assert_response :success
    assert_template "account/lost_password"
    
-    post "account/lost_password", :mail => 'jsmith@somenet.foo'
+    post "account/lost_password", :mail => 'jSmith@somenet.foo'
    assert_redirected_to "account/login"
    
    token = Token.find(:first)

--- a/test/unit/user_test.rb
+++ b/test/unit/user_test.rb
@@ -158,4 +158,10 @@ class UserTest < Test::Unit::TestCase
    @jsmith.pref.comments_sorting = 'desc'
    assert @jsmith.wants_comments_in_reverse_order?
  end
+  
+  def test_find_by_mail_should_be_case_insensitive
+    u = User.find_by_mail('JSmith@somenet.foo')
+    assert_not_nil u
+    assert_equal 'jsmith@somenet.foo', u.mail
+  end
 end