Merge remote-tracking branch 'upstream/pull/3398'

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

diff --git a/test/factories/old_node.rb b/test/factories/old_node.rb
index ecf096ecad11035fc848c5ea33975552968e9f17..e129b62f7b7a5b6118f6cf9f136964c193aecb65 100644 (file)
--- a/test/factories/old_node.rb
+++ b/test/factories/old_node.rb
@@ -1,16 +1,13 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :old_node do
-    latitude 1 * GeoRecord::SCALE
-    longitude 1 * GeoRecord::SCALE
+    latitude { 1 * GeoRecord::SCALE }
+    longitude { 1 * GeoRecord::SCALE }
 
-    # FIXME: needs changeset factory
-    changeset_id 1
+    changeset
+    association :current_node, :factory => :node
 
-    # FIXME: needs node factory
-    node_id 1000
-
-    visible true
-    timestamp Time.now
-    version 1
+    visible { true }
+    timestamp { Time.now }
+    version { 1 }
   end
 end