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

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

diff --git a/test/models/node_test.rb b/test/models/node_test.rb
index 664bfb2607a4a3aede197141ca73423ea191bfcc..9efe9a9c99b12b14ad6c18b6c1f9fb652309b72d 100644 (file)
--- a/test/models/node_test.rb
+++ b/test/models/node_test.rb
@@ -98,8 +98,9 @@ class NodeTest < ActiveSupport::TestCase
   end
 
   def test_update
-    node = create(:node)
-    create(:old_node, :node_id => node.id, :version => 1)
+    node = create(:node, :lat => 12.6543, :lon => 65.1234)
+    create(:old_node, :node_id => node.id, :version => 1, :lat => node.lat, :lon => node.lon)
+
     node_template = Node.find(node.id)
 
     assert_not_nil node_template
@@ -435,4 +436,13 @@ class NodeTest < ActiveSupport::TestCase
       node.update_from(new_node, user)
     end
   end
+
+  test "raises id precondition exception when deleting" do
+    user = create(:user)
+    node = Node.new(:id => 23, :visible => true)
+    new_node = Node.new(:id => 42, :visible => false)
+    assert_raises OSM::APIPreconditionFailedError do
+      node.delete_with_history!(new_node, user)
+    end
+  end
 end