Avoid use of deprecated methods on error objects

diff --git a/app/models/node.rb b/app/models/node.rb
index 3de6e154c15841d8c2b94c75a9a4f9206a7bcbcc..70c6fb880ed9c46c2047150780d816342be022c8 100644 (file)
--- 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 5e3638347a642a55ec8e33ca180012532709233b..397e836184f1f7d36c906852dcc732a9c4fbec5e 100644 (file)
--- 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 8c7ae390b00b22e02e3800017a33881647c0825a..f8c05c92ca9e9b5b52e509336201f79142e8fc34 100644 (file)
--- 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 46194b505ff7dc3a92a5005fc55d2b79aba44063..4854432c48f7f9f1bdfae24dfdd1f7a01a8282bf 100644 (file)
--- 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 d40d85f30b15f4350b457ea1b88baf0a31ef36ac..58523ca885ec1e67b2d002b315892fd0bbbbec6b 100644 (file)
--- 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 cfe0b57f22b26ae8a5d90402c2fd4d9deecbec5f..c4ebd2c6e8253edeef14f785eb99c5e4c21ecb59 100644 (file)
--- 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 9acf32bf70837bb132b615b39bcaf79e8570c6ba..f934ffde136f6e0129f584e0403247202042607d 100644 (file)
--- 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 ece55d8d5da69891f7b876be86d2f46ea3176e23..f6ac38428874b229e5245b8c9a60ae9973753653 100644 (file)
--- 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 4945c14979392cf43092cac2983f4640f5f201e8..3282fc47381a20fd8448c569ef4188d57ad81873 100644 (file)
--- 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 81bcd60acf549f452d5cad3265add0e1df48b0fc..7c703cf27e27e6858883a8b8cb38c97629b58dc7 100644 (file)
--- 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 7d5f8dced28c50bc9f37560cfeac4abf59edfd32..e537a8433aa97038c984dc7e189c385943980394 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
@@ -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 f5a931f6a322389744c93ff0e22254ba8ab36616..5ce08815924728f0779ced24be9397d6b8c7c70d 100644 (file)
--- 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