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

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

diff --git a/test/factories/traces.rb b/test/factories/traces.rb
index 66f810468e20a1c81c8113bf1c92fa454c490044..8663ccf2795eb8866b032b6ef85736ca9a5fed1e 100644 (file)
--- a/test/factories/traces.rb
+++ b/test/factories/traces.rb
@@ -1,20 +1,19 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :trace do
     sequence(:name) { |n| "Trace #{n}.gpx" }
     sequence(:description) { |n| "This is trace #{n}" }
 
-    # Fixme requires User Factory
-    user_id 1
+    user
 
-    timestamp Time.now
-    inserted true
+    timestamp { Time.now }
+    inserted { true }
 
     trait :deleted do
-      visible false
+      visible { false }
     end
 
     transient do
-      fixture nil
+      fixture { nil }
     end
 
     after(:create) do |trace, evaluator|