Merge remote-tracking branch 'upstream/pull/2709'

[rails.git] / test / models / old_node_test.rb

diff --git a/test/models/old_node_test.rb b/test/models/old_node_test.rb
index 4aadd5e47ef4da536de4fda35f910bd029960de0..eade6130a11873a0768e1034909ad61713172ad0 100644 (file)
--- a/test/models/old_node_test.rb
+++ b/test/models/old_node_test.rb
@@ -3,47 +3,56 @@ require "test_helper"
 class OldNodeTest < ActiveSupport::TestCase
   def test_node_too_far_north
     node = build(:old_node, :latitude => 90.01 * OldNode::SCALE)
 class OldNodeTest < ActiveSupport::TestCase
   def test_node_too_far_north
     node = build(:old_node, :latitude => 90.01 * OldNode::SCALE)

-    assert_equal false, node.valid?
+    node.validate
+    assert_includes node.errors.full_messages, "Node is not in the world"

   end
 
   def test_node_north_limit
     node = build(:old_node, :latitude => 90 * OldNode::SCALE)
   end
 
   def test_node_north_limit
     node = build(:old_node, :latitude => 90 * OldNode::SCALE)

-    assert node.valid?
+    node.validate
+    assert_not_includes node.errors.full_messages, "Node is not in the world"

   end
 
   def test_node_too_far_south
     node = build(:old_node, :latitude => -90.01 * OldNode::SCALE)
   end
 
   def test_node_too_far_south
     node = build(:old_node, :latitude => -90.01 * OldNode::SCALE)

-    assert_equal false, node.valid?
+    node.validate
+    assert_includes node.errors.full_messages, "Node is not in the world"

   end
 
   def test_node_south_limit
     node = build(:old_node, :latitude => -90 * OldNode::SCALE)
   end
 
   def test_node_south_limit
     node = build(:old_node, :latitude => -90 * OldNode::SCALE)

-    assert node.valid?
+    node.validate
+    assert_not_includes node.errors.full_messages, "Node is not in the world"

   end
 
   def test_node_too_far_west
     node = build(:old_node, :longitude => -180.01 * OldNode::SCALE)
   end
 
   def test_node_too_far_west
     node = build(:old_node, :longitude => -180.01 * OldNode::SCALE)

-    assert_equal false, node.valid?
+    node.validate
+    assert_includes node.errors.full_messages, "Node is not in the world"

   end
 
   def test_node_west_limit
     node = build(:old_node, :longitude => -180 * OldNode::SCALE)
   end
 
   def test_node_west_limit
     node = build(:old_node, :longitude => -180 * OldNode::SCALE)

-    assert node.valid?
+    node.validate
+    assert_not_includes node.errors.full_messages, "Node is not in the world"

   end
 
   def test_node_too_far_east
     node = build(:old_node, :longitude => 180.01 * OldNode::SCALE)
   end
 
   def test_node_too_far_east
     node = build(:old_node, :longitude => 180.01 * OldNode::SCALE)

-    assert_equal false, node.valid?
+    node.validate
+    assert_includes node.errors.full_messages, "Node is not in the world"

   end
 
   def test_node_east_limit
     node = build(:old_node, :longitude => 180 * OldNode::SCALE)
   end
 
   def test_node_east_limit
     node = build(:old_node, :longitude => 180 * OldNode::SCALE)

-    assert node.valid?
+    node.validate
+    assert_not_includes node.errors.full_messages, "Node is not in the world"

   end
 
   def test_totally_wrong
     node = build(:old_node, :latitude => 200 * OldNode::SCALE, :longitude => 200 * OldNode::SCALE)
   end
 
   def test_totally_wrong
     node = build(:old_node, :latitude => 200 * OldNode::SCALE, :longitude => 200 * OldNode::SCALE)

-    assert_equal false, node.valid?
+    node.validate
+    assert_includes node.errors.full_messages, "Node is not in the world"

   end
 
   def test_lat_lon
   end
 
   def test_lat_lon