X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/17e9bcd2d46ab699772dcf9136d8627347ad09e8..7fc83c880ab8ac6e3f6a8778ee7bc65a066670e3:/test/factories/node.rb?ds=sidebyside diff --git a/test/factories/node.rb b/test/factories/node.rb index 1d8e244d7..bfb8b16fe 100644 --- a/test/factories/node.rb +++ b/test/factories/node.rb @@ -1,22 +1,29 @@ -FactoryGirl.define do +FactoryBot.define do factory :node do - latitude 1 * GeoRecord::SCALE - longitude 1 * GeoRecord::SCALE + latitude { 1 * GeoRecord::SCALE } + longitude { 1 * GeoRecord::SCALE } changeset - visible true - timestamp Time.now - version 1 + visible { true } + timestamp { Time.now.utc } + version { 1 } trait :deleted do - visible false + visible { false } end trait :with_history do after(:create) do |node, _evaluator| (1..node.version).each do |n| - create(:old_node, :node_id => node.id, :version => n) + create(:old_node, :node_id => node.id, :version => n, :latitude => node.latitude, :longitude => node.longitude, :changeset => node.changeset) + end + + # For deleted nodes, make sure the most recent old_node is also deleted. + if node.visible == false + latest = node.old_nodes.find_by(:version => node.version) + latest.visible = false + latest.save end end end