Fix FactoryBot deprecation warnings

diff --git a/test/factories/changeset_comments.rb b/test/factories/changeset_comments.rb
index fb3eef8953d7183aa2942b5594a3b9fe5e9526d8..673a0a9d6798c58940b14b6ac00fd4c099604b1a 100644 (file)
--- a/test/factories/changeset_comments.rb
+++ b/test/factories/changeset_comments.rb
@@ -1,7 +1,7 @@
 FactoryBot.define do
   factory :changeset_comment do
     sequence(:body) { |n| "Changeset comment #{n}" }
 FactoryBot.define do
   factory :changeset_comment do
     sequence(:body) { |n| "Changeset comment #{n}" }

-    visible true
+    visible { true }

 
     changeset
 
 
     changeset
 

diff --git a/test/factories/changesets.rb b/test/factories/changesets.rb
index f42242e786a1c343e611e2411148ccd530fc0097..d4ebdcee133d8811822db1f8974e8f13066f3b27 100644 (file)
--- a/test/factories/changesets.rb
+++ b/test/factories/changesets.rb
@@ -1,13 +1,13 @@
 FactoryBot.define do
   factory :changeset do
 FactoryBot.define do
   factory :changeset do

-    created_at Time.now.utc
-    closed_at Time.now.utc + 1.day
+    created_at { Time.now.utc }
+    closed_at { Time.now.utc + 1.day }

 
     user
 
     trait :closed do
 
     user
 
     trait :closed do

-      created_at Time.now.utc - 5.hours
-      closed_at Time.now.utc - 4.hours
+      created_at { Time.now.utc - 5.hours }
+      closed_at { Time.now.utc - 4.hours }

     end
   end
 end
     end
   end
 end

diff --git a/test/factories/issues.rb b/test/factories/issues.rb
index e209bd25dab26f2827fc737afb5fb1dc3273e7d4..c575c3398e3fe16108329098316eb2430cb822d4 100644 (file)
--- a/test/factories/issues.rb
+++ b/test/factories/issues.rb
@@ -5,6 +5,6 @@ FactoryBot.define do
     association :reported_user, :factory => :user
 
     # Default to assigning to an administrator
     association :reported_user, :factory => :user
 
     # Default to assigning to an administrator

-    assigned_role "administrator"
+    assigned_role { "administrator" }

   end
 end
   end
 end

diff --git a/test/factories/languages.rb b/test/factories/languages.rb
index ddf4588e98e29e75569803ae2b68a3716e6ba6c1..c97904259169b1120912a32cf517ec846b038a3e 100644 (file)
--- a/test/factories/languages.rb
+++ b/test/factories/languages.rb
@@ -1,7 +1,7 @@
 FactoryBot.define do
   factory :language do
 FactoryBot.define do
   factory :language do

-    code "en"
-    english_name "English"
-    native_name "English"
+    code { "en" }
+    english_name { "English" }
+    native_name { "English" }

   end
 end
   end
 end

diff --git a/test/factories/messages.rb b/test/factories/messages.rb
index ece10ae72cb4d3ee1d7d2b3469c08980d1a53b65..57a434fa1e739fb8ec32ee56922419631d32f95c 100644 (file)
--- a/test/factories/messages.rb
+++ b/test/factories/messages.rb
@@ -2,17 +2,17 @@ FactoryBot.define do
   factory :message do
     sequence(:title) { |n| "Message #{n}" }
     sequence(:body) { |n| "Body text for message #{n}" }
   factory :message do
     sequence(:title) { |n| "Message #{n}" }
     sequence(:body) { |n| "Body text for message #{n}" }

-    sent_on Time.now
+    sent_on { Time.now }

 
     association :sender, :factory => :user
     association :recipient, :factory => :user
 
     trait :unread do
 
     association :sender, :factory => :user
     association :recipient, :factory => :user
 
     trait :unread do

-      message_read false
+      message_read { false }

     end
 
     trait :read do
     end
 
     trait :read do

-      message_read true
+      message_read { true }

     end
   end
 end
     end
   end
 end

diff --git a/test/factories/node.rb b/test/factories/node.rb
index d849755cd18fb14124e6bea753d82dcffdadec96..ae32926cdc0a2c81be54e89f36756249e71badc1 100644 (file)
--- a/test/factories/node.rb
+++ b/test/factories/node.rb
@@ -1,16 +1,16 @@
 FactoryBot.define do
   factory :node do
 FactoryBot.define 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 }
+    version { 1 }

 
     trait :deleted do
 
     trait :deleted do

-      visible false
+      visible { false }

     end
 
     trait :with_history do
     end
 
     trait :with_history do

diff --git a/test/factories/note_comments.rb b/test/factories/note_comments.rb
index d3fb3ce966922ecde7223f4fc330b783d3cbf789..da51c022818cfaad36cf15a27093c3567bb7e540 100644 (file)
--- a/test/factories/note_comments.rb
+++ b/test/factories/note_comments.rb
@@ -1,8 +1,8 @@
 FactoryBot.define do
   factory :note_comment do
     sequence(:body) { |n| "This is note comment #{n}" }
 FactoryBot.define do
   factory :note_comment do
     sequence(:body) { |n| "This is note comment #{n}" }

-    visible true
-    event "opened"
+    visible { true }
+    event { "opened" }

     note
   end
 end
     note
   end
 end

diff --git a/test/factories/notes.rb b/test/factories/notes.rb
index 56a9541dcc56548414aa0104e98f965da8771caf..77b4245aa5b037fdf5eb491d565e63f2017d93d0 100644 (file)
--- a/test/factories/notes.rb
+++ b/test/factories/notes.rb
@@ -1,12 +1,12 @@
 FactoryBot.define do
   factory :note do
 FactoryBot.define do
   factory :note do

-    latitude 1 * GeoRecord::SCALE
-    longitude 1 * GeoRecord::SCALE
-    # tile QuadTile.tile_for_point(1,1)
+    latitude { 1 * GeoRecord::SCALE }
+    longitude { 1 * GeoRecord::SCALE }
+    # tile { QuadTile.tile_for_point(1,1) }

 
     factory :note_with_comments do
       transient do
 
     factory :note_with_comments do
       transient do

-        comments_count 1
+        comments_count { 1 }

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

diff --git a/test/factories/old_node.rb b/test/factories/old_node.rb
index 089363397bb054bf1f3434f59b0484fa55b39754..e129b62f7b7a5b6118f6cf9f136964c193aecb65 100644 (file)
--- a/test/factories/old_node.rb
+++ b/test/factories/old_node.rb
@@ -1,13 +1,13 @@
 FactoryBot.define do
   factory :old_node do
 FactoryBot.define do
   factory :old_node do

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

 
     changeset
     association :current_node, :factory => :node
 
 
     changeset
     association :current_node, :factory => :node
 

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

   end
 end
   end
 end

diff --git a/test/factories/old_relation.rb b/test/factories/old_relation.rb
index a6e87a38bd4aaaef1d5cf1e348fb2fe759e5bb62..8fdb23f58e3b65752aed5e819edca7aaec4b6be7 100644 (file)
--- a/test/factories/old_relation.rb
+++ b/test/factories/old_relation.rb
@@ -1,8 +1,8 @@
 FactoryBot.define do
   factory :old_relation do
 FactoryBot.define do
   factory :old_relation do

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

 
     changeset
     association :current_relation, :factory => :relation
 
     changeset
     association :current_relation, :factory => :relation

diff --git a/test/factories/old_relation_member.rb b/test/factories/old_relation_member.rb
index 524a71074131f80daab8f1490bcd2a37c664c17c..17495d7ea862703017f0124ed3506ee533407783 100644 (file)
--- a/test/factories/old_relation_member.rb
+++ b/test/factories/old_relation_member.rb
@@ -1,6 +1,6 @@
 FactoryBot.define do
   factory :old_relation_member do
 FactoryBot.define do
   factory :old_relation_member do

-    member_role ""
+    member_role { "" }

 
     old_relation
     # Default to creating nodes, but could be ways or relations as members
 
     old_relation
     # Default to creating nodes, but could be ways or relations as members

diff --git a/test/factories/old_way.rb b/test/factories/old_way.rb
index a57ccb7136be6643028e3ad0e0e9e1153c120a40..4fc0721d798d14e2c64d9c5579aee9360df4dc44 100644 (file)
--- a/test/factories/old_way.rb
+++ b/test/factories/old_way.rb
@@ -1,8 +1,8 @@
 FactoryBot.define do
   factory :old_way do
 FactoryBot.define do
   factory :old_way do

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

 
     changeset
     association :current_way, :factory => :way
 
     changeset
     association :current_way, :factory => :way

diff --git a/test/factories/old_way_node.rb b/test/factories/old_way_node.rb
index 0a544aaf7548122d014597840955022f5ff44671..80bc8316fd84330d1837881cf8b1c4cef1ab962e 100644 (file)
--- a/test/factories/old_way_node.rb
+++ b/test/factories/old_way_node.rb
@@ -1,6 +1,6 @@
 FactoryBot.define do
   factory :old_way_node do
 FactoryBot.define do
   factory :old_way_node do

-    sequence_id 1
+    sequence_id { 1 }

 
     old_way
     node
 
     old_way
     node

diff --git a/test/factories/relation.rb b/test/factories/relation.rb
index c4c947a4f8858099f2bdfe1b7e84d3bb8c3a1207..8bb00e287e4045e3ada93f7a154b9f26412660e1 100644 (file)
--- a/test/factories/relation.rb
+++ b/test/factories/relation.rb
@@ -1,13 +1,13 @@
 FactoryBot.define do
   factory :relation do
 FactoryBot.define do
   factory :relation do

-    timestamp Time.now
-    visible true
-    version 1
+    timestamp { Time.now }
+    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

diff --git a/test/factories/relation_member.rb b/test/factories/relation_member.rb
index 4357f3de7eb873dfca2aa1a6608d20a6a10c5d0e..b4498a28d1ad780784a8f81b10186a5b9b09be03 100644 (file)
--- a/test/factories/relation_member.rb
+++ b/test/factories/relation_member.rb
@@ -1,6 +1,6 @@
 FactoryBot.define do
   factory :relation_member do
 FactoryBot.define do
   factory :relation_member do

-    member_role ""
+    member_role { "" }

 
     relation
     # Default to creating nodes, but could be ways or relations as members
 
     relation
     # Default to creating nodes, but could be ways or relations as members

diff --git a/test/factories/reports.rb b/test/factories/reports.rb
index 7936d46b2d3f4b619a75e9e6437e4d1c878154b3..084c2d1ac891951c1b22f11b5ec3c599fb9fd62c 100644 (file)
--- a/test/factories/reports.rb
+++ b/test/factories/reports.rb
@@ -1,7 +1,7 @@
 FactoryBot.define do
   factory :report do
     sequence(:details) { |n| "Report details #{n}" }
 FactoryBot.define do
   factory :report do
     sequence(:details) { |n| "Report details #{n}" }

-    category "other"
+    category { "other" }

     issue
     user
   end
     issue
     user
   end

diff --git a/test/factories/tracepoints.rb b/test/factories/tracepoints.rb
index ad520ea1f1f74e047efff100b1c2636bc6871006..4ba152f6e05c73244b9860483a31afddf4676f40 100644 (file)
--- a/test/factories/tracepoints.rb
+++ b/test/factories/tracepoints.rb
@@ -1,10 +1,10 @@
 FactoryBot.define do
   factory :tracepoint do
 FactoryBot.define do
   factory :tracepoint do

-    trackid 1
-    latitude 1 * GeoRecord::SCALE
-    longitude 1 * GeoRecord::SCALE
-    # tile QuadTile.tile_for_point(1,1)
-    timestamp Time.now
+    trackid { 1 }
+    latitude { 1 * GeoRecord::SCALE }
+    longitude { 1 * GeoRecord::SCALE }
+    # tile { QuadTile.tile_for_point(1,1) }
+    timestamp { Time.now }

 
     trace
   end
 
     trace
   end

diff --git a/test/factories/traces.rb b/test/factories/traces.rb
index efc1180cdbe7afc2c3a5c5b63f7edda94c1caec8..8663ccf2795eb8866b032b6ef85736ca9a5fed1e 100644 (file)
--- a/test/factories/traces.rb
+++ b/test/factories/traces.rb
@@ -5,15 +5,15 @@ FactoryBot.define do
 
     user
 
 
     user
 

-    timestamp Time.now
-    inserted true
+    timestamp { Time.now }
+    inserted { true }

 
     trait :deleted do
 
     trait :deleted do

-      visible false
+      visible { false }

     end
 
     transient do
     end
 
     transient do

-      fixture nil
+      fixture { nil }

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

diff --git a/test/factories/user.rb b/test/factories/user.rb
index d6ee1fa8c03249f9f4216cde09b890c921936bc0..69d5ba376471b2684b6fff8ba31cdb4e45af39c6 100644 (file)
--- a/test/factories/user.rb
+++ b/test/factories/user.rb
@@ -2,13 +2,13 @@ FactoryBot.define do
   factory :user do
     sequence(:email) { |n| "user#{n}@example.com" }
     sequence(:display_name) { |n| "User #{n}" }
   factory :user do
     sequence(:email) { |n| "user#{n}@example.com" }
     sequence(:display_name) { |n| "User #{n}" }

-    pass_crypt Digest::MD5.hexdigest("test")
+    pass_crypt { Digest::MD5.hexdigest("test") }

 
     # These attributes are not the defaults, but in most tests we want
     # a 'normal' user who can log in without being redirected etc.
 
     # These attributes are not the defaults, but in most tests we want
     # a 'normal' user who can log in without being redirected etc.

-    status "active"
-    terms_seen true
-    data_public true
+    status { "active" }
+    terms_seen { true }
+    data_public { true }

 
     trait :with_home_location do
       home_lat { rand(-90.0...90.0) }
 
     trait :with_home_location do
       home_lat { rand(-90.0...90.0) }


@@ -16,23 +16,23 @@ FactoryBot.define do
     end
 
     trait :pending do
     end
 
     trait :pending do

-      status "pending"
+      status { "pending" }

     end
 
     trait :active do
     end
 
     trait :active do

-      status "active"
+      status { "active" }

     end
 
     trait :confirmed do
     end
 
     trait :confirmed do

-      status "confirmed"
+      status { "confirmed" }

     end
 
     trait :suspended do
     end
 
     trait :suspended do

-      status "suspended"
+      status { "suspended" }

     end
 
     trait :deleted do
     end
 
     trait :deleted do

-      status "deleted"
+      status { "deleted" }

     end
 
     factory :moderator_user do
     end
 
     factory :moderator_user do

diff --git a/test/factories/user_blocks.rb b/test/factories/user_blocks.rb
index d206511b4616c7053e2d3b7c49e9e8895f5db7be..53864bb0eb6fc5bbf75cf19b36e8d8b50875a6f1 100644 (file)
--- a/test/factories/user_blocks.rb
+++ b/test/factories/user_blocks.rb
@@ -1,17 +1,17 @@
 FactoryBot.define do
   factory :user_block do
     sequence(:reason) { |n| "User Block #{n}" }
 FactoryBot.define do
   factory :user_block do
     sequence(:reason) { |n| "User Block #{n}" }

-    ends_at Time.now + 1.day
+    ends_at { Time.now + 1.day }

 
     user
     association :creator, :factory => :moderator_user
 
     trait :needs_view do
 
     user
     association :creator, :factory => :moderator_user
 
     trait :needs_view do

-      needs_view true
+      needs_view { true }

     end
 
     trait :expired do
     end
 
     trait :expired do

-      ends_at Time.now - 1.day
+      ends_at { Time.now - 1.day }

     end
 
     trait :revoked do
     end
 
     trait :revoked do

diff --git a/test/factories/way.rb b/test/factories/way.rb
index 68826e91942e98c8180949e2ba31bde7cc4c9913..1b6b18dc98a0aedae7821791d9831c0c3c4549ce 100644 (file)
--- a/test/factories/way.rb
+++ b/test/factories/way.rb
@@ -1,13 +1,13 @@
 FactoryBot.define do
   factory :way do
 FactoryBot.define do
   factory :way do

-    timestamp Time.now
-    visible true
-    version 1
+    timestamp { Time.now }
+    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 @@ FactoryBot.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|

diff --git a/test/factories/way_node.rb b/test/factories/way_node.rb
index 770de02d9b3474fcd9376c7c47c551bcdb0a2999..230fe1270bf607eb52ff59837764d6211cf229d8 100644 (file)
--- a/test/factories/way_node.rb
+++ b/test/factories/way_node.rb
@@ -1,6 +1,6 @@
 FactoryBot.define do
   factory :way_node do
 FactoryBot.define do
   factory :way_node do

-    sequence_id 1
+    sequence_id { 1 }

 
     way
     node
 
     way
     node