Merge 16110:16487 from trunk.

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

diff --git a/test/unit/user_test.rb b/test/unit/user_test.rb
index 02251b0eef865cde105883d110e950130d1d392d..184c2436a6d60914b4208d577ab6f9e7b6d0b9d1 100644 (file)
--- a/test/unit/user_test.rb
+++ b/test/unit/user_test.rb
@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
-class UserTest < Test::Unit::TestCase
+class UserTest < ActiveSupport::TestCase
   api_fixtures
   fixtures :friends
 
@@ -24,7 +24,7 @@ class UserTest < Test::Unit::TestCase
       :data_public => 1,
       :description => "desc")
     assert !new_user.save
-    assert_equal ActiveRecord::Errors.default_error_messages[:taken], new_user.errors.on(:email)
+    assert_equal "has already been taken", new_user.errors.on(:email)
   end
   
   def test_unique_display_name
@@ -35,7 +35,7 @@ class UserTest < Test::Unit::TestCase
       :data_public => 1,
       :description => "desc")
     assert !new_user.save
-    assert_equal ActiveRecord::Errors.default_error_messages[:taken], new_user.errors.on(:display_name)
+    assert_equal "has already been taken", new_user.errors.on(:display_name)
   end
   
   def test_email_valid