Update to rails 3.1.3

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

diff --git a/test/unit/user_test.rb b/test/unit/user_test.rb
index ac2bd5e7145997613879b21d3cf1dbc5439c761c..843c3190556724533757f73af2095e3254b1b89e 100644 (file)
--- a/test/unit/user_test.rb
+++ b/test/unit/user_test.rb
@@ -8,13 +8,13 @@ class UserTest < ActiveSupport::TestCase
   def test_invalid_with_empty_attributes
     user = User.new
     assert !user.valid?
-    assert user.errors.invalid?(:email)
-    assert user.errors.invalid?(:pass_crypt)
-    assert user.errors.invalid?(:display_name)
-    assert user.errors.invalid?(:email)
-    assert !user.errors.invalid?(:home_lat)
-    assert !user.errors.invalid?(:home_lon)
-    assert !user.errors.invalid?(:home_zoom)
+    assert user.errors[:email].any?
+    assert user.errors[:pass_crypt].any?
+    assert user.errors[:display_name].any?
+    assert user.errors[:email].any?
+    assert !user.errors[:home_lat].any?
+    assert !user.errors[:home_lon].any?
+    assert !user.errors[:home_zoom].any?
   end
   
   def test_unique_email
@@ -25,7 +25,7 @@ class UserTest < ActiveSupport::TestCase
       :data_public => 1,
       :description => "desc")
     assert !new_user.save
-    assert_equal "has already been taken", new_user.errors.on(:email)
+    assert new_user.errors[:email].include?("has already been taken")
   end
   
   def test_unique_display_name
@@ -36,7 +36,7 @@ class UserTest < ActiveSupport::TestCase
       :data_public => 1,
       :description => "desc")
     assert !new_user.save
-    assert_equal "has already been taken", new_user.errors.on(:display_name)
+    assert new_user.errors[:display_name].include?("has already been taken")
   end
   
   def test_email_valid
@@ -48,13 +48,13 @@ class UserTest < ActiveSupport::TestCase
     ok.each do |name|
       user = users(:normal_user)
       user.email = name
-      assert user.valid?, user.errors.full_messages
+      assert user.valid?(:save), user.errors.full_messages
     end
     
     bad.each do |name|
       user = users(:normal_user)
       user.email = name
-      assert !user.valid?, "#{name} is valid when it shouldn't be" 
+      assert user.invalid?(:save), "#{name} is valid when it shouldn't be" 
     end
   end
   
@@ -93,7 +93,7 @@ class UserTest < ActiveSupport::TestCase
       user = users(:normal_user)
       user.display_name = display_name
       assert !user.valid?, "#{display_name} is valid when it shouldn't be"
-      assert_equal "is invalid", user.errors.on(:display_name)
+      assert user.errors[:display_name].include?("is invalid")
     end
   end
   
@@ -138,4 +138,15 @@ class UserTest < ActiveSupport::TestCase
     #Friend.delete(friend)
     #assert_equal 0, Friend.count
   end
+
+  def test_user_preferred_editor
+    user = users(:normal_user)
+    assert_equal nil, user.preferred_editor
+    user.preferred_editor = "potlatch"
+    assert_equal "potlatch", user.preferred_editor
+    user.save!
+
+    user.preferred_editor = "invalid_editor"
+    assert_raise(ActiveRecord::RecordInvalid) { user.save! }
+  end
 end