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

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

diff --git a/test/factories/way.rb b/test/factories/way.rb
index 1c31de3d0316e1461f0a8a48acde79eb8efdc23d..f2093e305ca8c32807939c06a362c7bf4b534dc0 100644 (file)
--- a/test/factories/way.rb
+++ b/test/factories/way.rb
@@ -1,13 +1,13 @@
-FactoryGirl.define do
+FactoryBot.define do

   factory :way do
   factory :way do

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

 
     changeset
 
     trait :deleted do
 
     changeset
 
     trait :deleted do

-      visible false
+      visible { false }

     end
 
     trait :with_history do
     end
 
     trait :with_history do


@@ -27,7 +27,7 @@ FactoryGirl.define do
 
     factory :way_with_nodes do
       transient do
 
     factory :way_with_nodes do
       transient do

-        nodes_count 1
+        nodes_count { 1 }

       end
 
       after(:create) do |way, evaluator|
       end
 
       after(:create) do |way, evaluator|