X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/bf29550db840c97cafffbe1e836750bef6c7942d..62b6d159672ad29344c7b7074a37d23b16dbb5d9:/test/unit/node_test.rb diff --git a/test/unit/node_test.rb b/test/unit/node_test.rb index 2c6515cb7..13dea88da 100644 --- a/test/unit/node_test.rb +++ b/test/unit/node_test.rb @@ -79,10 +79,10 @@ class NodeTest < Test::Unit::TestCase def test_create node_template = Node.new(:latitude => 12.3456, :longitude => 65.4321, - :changeset_id => changesets(:normal_user_first_change), + :changeset_id => changesets(:normal_user_first_change).id, :visible => 1, :version => 1) - assert node_template.save_with_history! + assert node_template.create_with_history(users(:normal_user)) node = Node.find(node_template.id) assert_not_nil node @@ -114,7 +114,7 @@ class NodeTest < Test::Unit::TestCase node_template.latitude = 12.3456 node_template.longitude = 65.4321 #node_template.tags = "updated=yes" - assert node_template.save_with_history! + assert node_template.update_from(old_node_template, users(:normal_user)) node = Node.find(node_template.id) assert_not_nil node @@ -145,8 +145,7 @@ class NodeTest < Test::Unit::TestCase old_node_template = OldNode.find(:first, :conditions => [ "id = ?", node_template.id ]) assert_not_nil old_node_template - node_template.visible = 0 - assert node_template.save_with_history! + assert node_template.delete_with_history!(old_node_template, users(:normal_user)) node = Node.find(node_template.id) assert_not_nil node