From: Tom Hughes <tom@compton.nu>
Date: Tue, 21 Sep 2010 20:26:58 +0000 (+0100)
Subject: Avoid use of deprecated methods on error objects
X-Git-Tag: live~6144
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/3d55db46ed24d563d82cf42f91fd064e40447c4d

Avoid use of deprecated methods on error objects
---

diff --git a/app/models/node.rb b/app/models/node.rb
index 3de6e154c..70c6fb880 100644
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -35,7 +35,7 @@ class Node < ActiveRecord::Base
 
   # Sanity check the latitude and longitude and add an error if it's broken
   def validate_position
-    errors.add_to_base("Node is not in the world") unless in_world?
+    errors.add(:base, "Node is not in the world") unless in_world?
   end
 
   #
diff --git a/app/models/old_node.rb b/app/models/old_node.rb
index 5e3638347..397e83618 100644
--- a/app/models/old_node.rb
+++ b/app/models/old_node.rb
@@ -17,7 +17,7 @@ class OldNode < ActiveRecord::Base
   belongs_to :changeset
  
   def validate_position
-    errors.add_to_base("Node is not in the world") unless in_world?
+    errors.add(:base, "Node is not in the world") unless in_world?
   end
 
   def self.from_node(node)
diff --git a/app/models/user_block.rb b/app/models/user_block.rb
index 8c7ae390b..f8c05c92c 100644
--- a/app/models/user_block.rb
+++ b/app/models/user_block.rb
@@ -29,7 +29,7 @@ class UserBlock < ActiveRecord::Base
   # block. this should be caught and dealt with in the controller,
   # but i've also included it here just in case.
   def moderator_permissions
-    errors.add_to_base(I18n.t('user_block.model.non_moderator_update')) if creator_id_changed? and !creator.moderator?
-    errors.add_to_base(I18n.t('user_block.model.non_moderator_revoke')) unless revoker_id.nil? or revoker.moderator?
+    errors.add(:base, I18n.t('user_block.model.non_moderator_update')) if creator_id_changed? and !creator.moderator?
+    errors.add(:base, I18n.t('user_block.model.non_moderator_revoke')) unless revoker_id.nil? or revoker.moderator?
   end
 end
diff --git a/test/unit/changeset_tag_test.rb b/test/unit/changeset_tag_test.rb
index 46194b505..4854432c4 100644
--- a/test/unit/changeset_tag_test.rb
+++ b/test/unit/changeset_tag_test.rb
@@ -36,7 +36,7 @@ class ChangesetTagTest < ActiveSupport::TestCase
       tag.k = k
       tag.v = "v"
       assert !tag.valid?, "Key #{k} should be too long"
-      assert tag.errors.invalid?(:k)
+      assert tag.errors[:k].any?
     end
   end
   
@@ -47,14 +47,14 @@ class ChangesetTagTest < ActiveSupport::TestCase
       tag.k = "k"
       tag.v = v
       assert !tag.valid?, "Value #{v} should be too long"
-      assert tag.errors.invalid?(:v)
+      assert tag.errors[:v].any?
     end
   end
   
   def test_empty_tag_invalid
     tag = ChangesetTag.new
     assert !tag.valid?, "Empty tag should be invalid"
-    assert tag.errors.invalid?(:id)
+    assert tag.errors[:id].any?
   end
   
   def test_uniqueness
diff --git a/test/unit/message_test.rb b/test/unit/message_test.rb
index d40d85f30..58523ca88 100644
--- a/test/unit/message_test.rb
+++ b/test/unit/message_test.rb
@@ -15,9 +15,9 @@ class MessageTest < ActiveSupport::TestCase
   def test_check_empty_message_fails
     message = Message.new
     assert !message.valid?
-    assert message.errors.invalid?(:title)
-    assert message.errors.invalid?(:body)
-    assert message.errors.invalid?(:sent_on)
+    assert message.errors[:title].any?
+    assert message.errors[:body].any?
+    assert message.errors[:sent_on].any?
     assert true, message.message_read
   end
   
diff --git a/test/unit/node_tag_test.rb b/test/unit/node_tag_test.rb
index cfe0b57f2..c4ebd2c6e 100644
--- a/test/unit/node_tag_test.rb
+++ b/test/unit/node_tag_test.rb
@@ -46,7 +46,7 @@ class NodeTagTest < ActiveSupport::TestCase
       tag.k = i
       tag.v = "v"
       assert !tag.valid?, "Key should be too long"
-      assert tag.errors.invalid?(:k)
+      assert tag.errors[:k].any?
     end
   end
   
@@ -57,14 +57,14 @@ class NodeTagTest < ActiveSupport::TestCase
       tag.k = "k"
       tag.v = i
       assert !tag.valid?, "Value should be too long"
-      assert tag.errors.invalid?(:v)
+      assert tag.errors[:v].any?
     end
   end
   
   def test_empty_node_tag_invalid
     tag = NodeTag.new
     assert !tag.valid?, "Empty tag should be invalid"
-    assert tag.errors.invalid?(:id)
+    assert tag.errors[:id].any?
   end
   
   def test_uniqueness
diff --git a/test/unit/old_node_tag_test.rb b/test/unit/old_node_tag_test.rb
index 9acf32bf7..f934ffde1 100644
--- a/test/unit/old_node_tag_test.rb
+++ b/test/unit/old_node_tag_test.rb
@@ -39,7 +39,7 @@ class OldNodeTest < ActiveSupport::TestCase
       tag.k = i
       tag.v = "v", "Key should be too long"
       assert !tag.valid?
-      assert tag.errors.invalid?(:k)
+      assert tag.errors[:k].any?
     end
   end
   
@@ -51,15 +51,15 @@ class OldNodeTest < ActiveSupport::TestCase
       tag.k = "k"
       tag.v = i
       assert !tag.valid?, "Value should be too long"
-      assert tag.errors.invalid?(:v)
+      assert tag.errors[:v].any?
     end
   end
   
   def test_empty_old_node_tag_invalid
     tag = OldNodeTag.new
     assert !tag.valid?, "Empty tag should be invalid"
-    assert tag.errors.invalid?(:id)
-    assert tag.errors.invalid?(:version)
+    assert tag.errors[:id].any?
+    assert tag.errors[:version].any?
   end
   
   def test_uniqueness
diff --git a/test/unit/old_relation_tag_test.rb b/test/unit/old_relation_tag_test.rb
index ece55d8d5..f6ac38428 100644
--- a/test/unit/old_relation_tag_test.rb
+++ b/test/unit/old_relation_tag_test.rb
@@ -39,7 +39,7 @@ class OldRelationTagTest < ActiveSupport::TestCase
       tag.k = i
       tag.v = "v"
       assert !tag.valid?, "Key should be too long"
-      assert tag.errors.invalid?(:k)
+      assert tag.errors[:k].any?
     end
   end
   
@@ -51,14 +51,14 @@ class OldRelationTagTest < ActiveSupport::TestCase
       tag.k = "k"
       tag.v = i
       assert !tag.valid?, "Value should be too long"
-      assert tag.errors.invalid?(:v)
+      assert tag.errors[:v].any?
     end
   end
   
   def test_empty_node_tag_invalid
     tag = OldRelationTag.new
     assert !tag.valid?, "Empty tag should be invalid"
-    assert tag.errors.invalid?(:id)
+    assert tag.errors[:id].any?
   end
   
   def test_uniqueness
diff --git a/test/unit/old_way_tag_test.rb b/test/unit/old_way_tag_test.rb
index 4945c1497..3282fc473 100644
--- a/test/unit/old_way_tag_test.rb
+++ b/test/unit/old_way_tag_test.rb
@@ -39,7 +39,7 @@ class WayTagTest < ActiveSupport::TestCase
       tag.k = i
       tag.v = "v"
       assert !tag.valid?, "Key should be too long"
-      assert tag.errors.invalid?(:k)
+      assert tag.errors[:k].any?
     end
   end
   
@@ -51,14 +51,14 @@ class WayTagTest < ActiveSupport::TestCase
       tag.k = "k"
       tag.v = i
       assert !tag.valid?, "Value should be too long"
-      assert tag.errors.invalid?(:v)
+      assert tag.errors[:v].any?
     end
   end
   
   def test_empty_node_tag_invalid
     tag = OldNodeTag.new
     assert !tag.valid?, "Empty tag should be invalid"
-    assert tag.errors.invalid?(:id)
+    assert tag.errors[:id].any?
   end
   
   def test_uniqueness
diff --git a/test/unit/relation_tag_test.rb b/test/unit/relation_tag_test.rb
index 81bcd60ac..7c703cf27 100644
--- a/test/unit/relation_tag_test.rb
+++ b/test/unit/relation_tag_test.rb
@@ -36,7 +36,7 @@ class RelationTagTest < ActiveSupport::TestCase
       tag.k = i
       tag.v = "v"
       assert !tag.valid?, "Key #{i} should be too long"
-      assert tag.errors.invalid?(:k)
+      assert tag.errors[:k].any?
     end
   end
   
@@ -47,14 +47,14 @@ class RelationTagTest < ActiveSupport::TestCase
       tag.k = "k"
       tag.v = i
       assert !tag.valid?, "Value #{i} should be too long"
-      assert tag.errors.invalid?(:v)
+      assert tag.errors[:v].any?
     end
   end
   
   def test_empty_tag_invalid
     tag = RelationTag.new
     assert !tag.valid?, "Empty relation tag should be invalid"
-    assert tag.errors.invalid?(:id)
+    assert tag.errors[:id].any?
   end
   
   def test_uniquness
diff --git a/test/unit/user_test.rb b/test/unit/user_test.rb
index 7d5f8dced..e537a8433 100644
--- 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
@@ -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
   
diff --git a/test/unit/way_tag_test.rb b/test/unit/way_tag_test.rb
index f5a931f6a..5ce088159 100644
--- a/test/unit/way_tag_test.rb
+++ b/test/unit/way_tag_test.rb
@@ -36,7 +36,7 @@ class WayTagTest < ActiveSupport::TestCase
       tag.k = i
       tag.v = "v"
       assert !tag.valid?, "Key #{i} should be too long"
-      assert tag.errors.invalid?(:k)
+      assert tag.errors[:k].any?
     end
   end
   
@@ -47,14 +47,14 @@ class WayTagTest < ActiveSupport::TestCase
       tag.k = "k"
       tag.v = i
       assert !tag.valid?, "Value #{i} should be too long"
-      assert tag.errors.invalid?(:v)
+      assert tag.errors[:v].any?
     end
   end
   
   def test_empty_tag_invalid
     tag = WayTag.new
     assert !tag.valid?, "Empty way tag should be invalid"
-    assert tag.errors.invalid?(:id)
+    assert tag.errors[:id].any?
   end
   
   def test_uniqueness