Merge branch 'pull/5030'

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

diff --git a/test/factories/node.rb b/test/factories/node.rb
index cbebbb00986096245b972bafa98223472199198c..bfb8b16fe79d48abe310f59fad5db06d4c5cf0c7 100644 (file)
--- a/test/factories/node.rb
+++ b/test/factories/node.rb
@@ -1,22 +1,22 @@
-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.