Add "Blocks on Me" nav tab to block list/show pages

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

diff --git a/test/factories/node.rb b/test/factories/node.rb
index cbebbb00986096245b972bafa98223472199198c..392d67a846d0401f6243681cf451294add3859c7 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
   factory :node do

-    latitude 1 * GeoRecord::SCALE
-    longitude 1 * GeoRecord::SCALE
+    latitude { 1 * GeoRecord::SCALE }
+    longitude { 1 * GeoRecord::SCALE }

 
     changeset
 
 
     changeset
 

-    visible true
-    timestamp Time.now
-    version 1
+    visible { true }
+    timestamp { Time.now.utc }
+    version { 1 }

 
     trait :deleted do
 
     trait :deleted do

-      visible false
+      visible { false }

     end
 
     trait :with_history do
       after(:create) do |node, _evaluator|
         (1..node.version).each do |n|
     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.
         end
 
         # For deleted nodes, make sure the most recent old_node is also deleted.