X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/4347d9d3b00a8fffe78daa93eac5b490905f9ac8..f816482778fad28424a4b2a151e0ba8ede2dcd97:/test/models/node_test.rb?ds=inline diff --git a/test/models/node_test.rb b/test/models/node_test.rb index 214ff595d..ee0a77649 100644 --- a/test/models/node_test.rb +++ b/test/models/node_test.rb @@ -71,13 +71,11 @@ class NodeTest < ActiveSupport::TestCase # Check that you can create a node and store it def test_create changeset = create(:changeset) - node_template = Node.new( - :lat => 12.3456, - :lon => 65.4321, - :changeset_id => changeset.id, - :visible => 1, - :version => 1 - ) + node_template = build(:node, :lat => 12.3456, + :lon => 65.4321, + :changeset_id => changeset.id, + :visible => true, + :version => 1) assert node_template.create_with_history(changeset.user) node = Node.find(node_template.id) @@ -89,7 +87,7 @@ class NodeTest < ActiveSupport::TestCase assert_equal node_template.timestamp.to_i, node.timestamp.to_i assert_equal(1, OldNode.where(:node_id => node_template.id).count) - old_node = OldNode.where(:node_id => node_template.id).first + old_node = OldNode.find_by(:node_id => node_template.id, :version => 1) assert_not_nil old_node assert_equal node_template.latitude, old_node.latitude assert_equal node_template.longitude, old_node.longitude @@ -122,7 +120,7 @@ class NodeTest < ActiveSupport::TestCase # assert_equal node_template.tags, node.tags assert_equal(2, OldNode.where(:node_id => node_template.id).count) - old_node = OldNode.where(:node_id => node_template.id, :version => 2).first + old_node = OldNode.find_by(:node_id => node_template.id, :version => 2) assert_not_nil old_node assert_equal node_template.latitude, old_node.latitude assert_equal node_template.longitude, old_node.longitude @@ -151,7 +149,7 @@ class NodeTest < ActiveSupport::TestCase # assert_equal node_template.tags, node.tags assert_equal(2, OldNode.where(:node_id => node_template.id).count) - old_node = OldNode.where(:node_id => node_template.id, :version => 2).first + old_node = OldNode.find_by(:node_id => node_template.id, :version => 2) assert_not_nil old_node assert_equal node_template.latitude, old_node.latitude assert_equal node_template.longitude, old_node.longitude