Merge branch 'wheres_this' of https://github.com/pnorman/openstreetmap-website into...

[rails.git] / test / factories / node.rb

diff --git a/test/factories/node.rb b/test/factories/node.rb
index 8daadd35ad074258da98c6c2050cabf7ce2ed0bb..d849755cd18fb14124e6bea753d82dcffdadec96 100644 (file)
--- a/test/factories/node.rb
+++ b/test/factories/node.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :node do
     latitude 1 * GeoRecord::SCALE
     longitude 1 * GeoRecord::SCALE
@@ -9,10 +9,21 @@ FactoryGirl.define do
     timestamp Time.now
     version 1
 
+    trait :deleted do
+      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, :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