X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/3026af170a18d04d624144251d7b3acdeee03fea..2d3ca85751e4bf582f953369c6a25b5bbe88116e:/test/models/node_test.rb diff --git a/test/models/node_test.rb b/test/models/node_test.rb index 68c45782d..85bdfc995 100644 --- a/test/models/node_test.rb +++ b/test/models/node_test.rb @@ -84,7 +84,7 @@ class NodeTest < ActiveSupport::TestCase :visible => 1, :version => 1 ) - assert node_template.create_with_history(users(:normal_user)) + assert node_template.create_with_history(changesets(:normal_user_first_change).user) node = Node.find(node_template.id) assert_not_nil node @@ -116,7 +116,7 @@ class NodeTest < ActiveSupport::TestCase node_template.latitude = 12.3456 node_template.longitude = 65.4321 # node_template.tags = "updated=yes" - assert node.update_from(node_template, users(:normal_user)) + assert node.update_from(node_template, current_nodes(:visible_node).changeset.user) node = Node.find(node_template.id) assert_not_nil node @@ -144,7 +144,7 @@ class NodeTest < ActiveSupport::TestCase node = Node.find(node_template.id) assert_not_nil node - assert node.delete_with_history!(node_template, users(:normal_user)) + assert node.delete_with_history!(node_template, current_nodes(:visible_node).changeset.user) node = Node.find(node_template.id) assert_not_nil node @@ -318,7 +318,7 @@ class NodeTest < ActiveSupport::TestCase node = current_nodes(:node_with_versions) taglist = create_list(:node_tag, 2, :node => node) tags = Node.find(node.id).node_tags.order(:k) - assert_equal 2, tags.count + assert_equal taglist.count, tags.count taglist.sort_by!(&:k).each_index do |i| assert_equal taglist[i].k, tags[i].k assert_equal taglist[i].v, tags[i].v @@ -329,7 +329,7 @@ class NodeTest < ActiveSupport::TestCase node = current_nodes(:node_with_versions) taglist = create_list(:node_tag, 2, :node => node) tags = Node.find(node.id).tags - assert_equal 2, tags.size + assert_equal taglist.count, tags.count taglist.each do |tag| assert_equal tag.v, tags[tag.k] end