Merge changes from trunk 7673:8632.

[rails.git] / test / unit / user_test.rb

diff --git a/test/unit/user_test.rb b/test/unit/user_test.rb
index 5f4c9525fec14cd7b19d8681a296f6bad46a6aa1..76c32a88d87da26e80cdaf5666d2676e521cd505 100644 (file)
--- a/test/unit/user_test.rb
+++ b/test/unit/user_test.rb
@@ -2,11 +2,6 @@ require File.dirname(__FILE__) + '/../test_helper'
 
 class UserTest < Test::Unit::TestCase
   fixtures :users
-
-  # Replace this with your real tests.
-  def test_truth
-    assert true
-  end
   
   def test_invalid_with_empty_attributes
     user = User.new
@@ -20,5 +15,14 @@ class UserTest < Test::Unit::TestCase
     assert !user.errors.invalid?(:home_zoom)
   end
   
-  
+  def test_unique_email
+    new_user = User.new(:email => users(:normal_user).email,
+      :active => 1, 
+      :pass_crypt => Digest::MD5.hexdigest('test'),
+      :display_name => "new user",
+      :data_public => 1,
+      :description => "desc")
+    assert !new_user.save
+    assert_equal ActiveRecord::Errors.default_error_messages[:taken], new_user.errors.on(:email)
+  end
 end