From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 25 Jul 2010 09:52:07 +0000 (+0000)
Subject: Merged r3873 from trunk.
X-Git-Tag: 1.0.1~79
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ec526c1261ac4a15ad08f00491f2cb176e5f9884;p=redmine.git

Merged r3873 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3874 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/app/models/user.rb b/app/models/user.rb
index 8148ae3a9..db18db49e 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -79,6 +79,10 @@ class User < Principal
     super
   end
   
+  def mail=(arg)
+    write_attribute(:mail, arg.to_s.strip)
+  end
+  
   def identity_url=(url)
     if url.blank?
       write_attribute(:identity_url, '')
diff --git a/test/unit/user_test.rb b/test/unit/user_test.rb
index 5a0c9f87e..ea40ccff6 100644
--- a/test/unit/user_test.rb
+++ b/test/unit/user_test.rb
@@ -35,6 +35,12 @@ class UserTest < ActiveSupport::TestCase
   def test_truth
     assert_kind_of User, @jsmith
   end
+  
+  def test_mail_should_be_stripped
+    u = User.new
+    u.mail = " foo@bar.com  "
+    assert_equal "foo@bar.com", u.mail
+  end
 
   def test_create
     user = User.new(:firstname => "new", :lastname => "user", :mail => "newuser@somenet.foo")