Replace factory_girl with factory_bot

Gemfile

@@ -120,7 +120,7 @@ end
 # Needed in development as well so rake can see konacha tasks
 group :development, :test do
   gem "coveralls", :require => false
-  gem "factory_girl_rails"
+  gem "factory_bot_rails"
   gem "jshint"
   #  gem "konacha"
   gem "poltergeist"

Gemfile.lock

@@ -90,10 +90,10 @@ GEM
     erubi (1.6.1)
     execjs (2.7.0)
     exifr (1.3.2)
-    factory_girl (4.8.1)
+    factory_bot (4.8.2)
       activesupport (>= 3.0.0)
-    factory_girl_rails (4.8.0)
-      factory_girl (~> 4.8.0)
+    factory_bot_rails (4.8.2)
+      factory_bot (~> 4.8.2)
       railties (>= 3.0.0)
     faraday (0.12.2)
       multipart-post (>= 1.2, < 3)
@@ -363,7 +363,7 @@ DEPENDENCIES
   coveralls
   dalli
   dynamic_form
-  factory_girl_rails
+  factory_bot_rails
   faraday
   geoip
   htmlentities

test/factories/acls.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :acl do
     sequence(:k) { |n| "Key #{n}" }
   end

test/factories/changeset_comments.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :changeset_comment do
     sequence(:body) { |n| "Changeset comment #{n}" }
     visible true

test/factories/changeset_tags.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :changeset_tag do
     sequence(:k) { |n| "Key #{n}" }
     sequence(:v) { |n| "Value #{n}" }

test/factories/changesets.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :changeset do
     created_at Time.now.utc
     closed_at Time.now.utc + 1.day

test/factories/client_applications.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :client_application do
     sequence(:name) { |n| "Client application #{n}" }
     sequence(:url) { |n| "http://example.com/app/#{n}" }

test/factories/diary_comments.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :diary_comment do
     sequence(:body) { |n| "This is diary comment #{n}" }
 

test/factories/diary_entries.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :diary_entry do
     sequence(:title) { |n| "Diary entry #{n}" }
     sequence(:body) { |n| "This is diary entry #{n}" }

test/factories/friends.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :friend do
     association :befriender, :factory => :user
     association :befriendee, :factory => :user

test/factories/languages.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :language do
     code "en"
     english_name "English"

test/factories/messages.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :message do
     sequence(:title) { |n| "Message #{n}" }
     sequence(:body) { |n| "Body text for message #{n}" }

test/factories/node.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :node do
     latitude 1 * GeoRecord::SCALE
     longitude 1 * GeoRecord::SCALE

test/factories/node_tags.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :node_tag do
     sequence(:k) { |n| "Key #{n}" }
     sequence(:v) { |n| "Value #{n}" }

test/factories/note_comments.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :note_comment do
     sequence(:body) { |n| "This is note comment #{n}" }
     visible true

test/factories/notes.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :note do
     latitude 1 * GeoRecord::SCALE
     longitude 1 * GeoRecord::SCALE

test/factories/old_node.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :old_node do
     latitude 1 * GeoRecord::SCALE
     longitude 1 * GeoRecord::SCALE

test/factories/old_node_tags.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :old_node_tag do
     sequence(:k) { |n| "Key #{n}" }
     sequence(:v) { |n| "Value #{n}" }

test/factories/old_relation.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :old_relation do
     timestamp Time.now
     visible true

test/factories/old_relation_member.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :old_relation_member do
     member_role ""
 

test/factories/old_relation_tags.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :old_relation_tag do
     sequence(:k) { |n| "Key #{n}" }
     sequence(:v) { |n| "Value #{n}" }

test/factories/old_way.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :old_way do
     timestamp Time.now
     visible true

test/factories/old_way_node.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :old_way_node do
     sequence_id 1
 

test/factories/old_way_tags.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :old_way_tag do
     sequence(:k) { |n| "Key #{n}" }
     sequence(:v) { |n| "Value #{n}" }

test/factories/redaction.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :redaction do
     sequence(:title) { |n| "Redaction #{n}" }
     sequence(:description) { |n| "Description of redaction #{n}" }

test/factories/relation.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :relation do
     timestamp Time.now
     visible true

test/factories/relation_member.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :relation_member do
     member_role ""
 

test/factories/relation_tags.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :relation_tag do
     sequence(:k) { |n| "Key #{n}" }
     sequence(:v) { |n| "Value #{n}" }

test/factories/tracepoints.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :tracepoint do
     trackid 1
     latitude 1 * GeoRecord::SCALE

test/factories/traces.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :trace do
     sequence(:name) { |n| "Trace #{n}.gpx" }
     sequence(:description) { |n| "This is trace #{n}" }

test/factories/tracetags.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :tracetag do
     sequence(:tag) { |n| "Tag #{n}" }
 

test/factories/user.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :user do
     sequence(:email) { |n| "user#{n}@example.com" }
     sequence(:display_name) { |n| "User #{n}" }

test/factories/user_blocks.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :user_block do
     sequence(:reason) { |n| "User Block #{n}" }
     ends_at Time.now + 1.day

test/factories/user_preferences.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :user_preference do
     sequence(:k) { |n| "Key #{n}" }
     sequence(:v) { |n| "Value #{n}" }

test/factories/user_role.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :user_role do
     user
     association :granter, :factory => :user

test/factories/way.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :way do
     timestamp Time.now
     visible true

test/factories/way_node.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :way_node do
     sequence_id 1
 

test/factories/way_tags.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :way_tag do
     sequence(:k) { |n| "Key #{n}" }
     sequence(:v) { |n| "Value #{n}" }

test/test_helper.rb

@@ -8,7 +8,7 @@ require "webmock/minitest"
 
 module ActiveSupport
   class TestCase
-    include FactoryGirl::Syntax::Methods
+    include FactoryBot::Syntax::Methods
 
     ##
     # takes a block which is executed in the context of a different