Merge pull request RefugeRestrooms#412 from RefugeRestrooms/update-to…

…-factory-bot

update factory girl to factory bot

Gemfile

@@ -34,7 +34,7 @@ gem 'activeadmin', '~> 1.0.0'
 
 group :development, :test do
   gem 'rspec-rails'
-  gem 'factory_girl_rails', '~> 4.0'
+  gem 'factory_bot_rails', '~> 4.8.2'
   gem 'dotenv-rails', '~> 2.2.1'
   gem 'pry'
   gem 'better_errors', '~> 2.4.0'

Gemfile.lock

@@ -149,10 +149,10 @@ GEM
     equalizer (0.0.11)
     erubi (1.7.0)
     execjs (2.7.0)
-    factory_girl (4.9.0)
+    factory_bot (4.8.2)
       activesupport (>= 3.0.0)
-    factory_girl_rails (4.9.0)
-      factory_girl (~> 4.9.0)
+    factory_bot_rails (4.8.2)
+      factory_bot (~> 4.8.2)
       railties (>= 3.0.0)
     ffi (1.9.18)
     formtastic (3.1.5)
@@ -400,7 +400,7 @@ DEPENDENCIES
   database_cleaner
   devise (~> 4.3)
   dotenv-rails (~> 2.2.1)
-  factory_girl_rails (~> 4.0)
+  factory_bot_rails (~> 4.8.2)
   geocoder (~> 1.2.1)
   grape (= 0.7.0)
   grape-kaminari

features/step_definitions/restroom_steps.rb

@@ -1,5 +1,5 @@
 Given(/^a restroom exists in Winnipeg$/) do
-  FactoryGirl.create(:restroom, {name: 'Winnipeg restroom', street: '91 Albert St.', city: 'Winnipeg', state: 'MB', country: 'Canada'}.merge(locations[:Winnipeg]))
+  FactoryBot.create(:restroom, {name: 'Winnipeg restroom', street: '91 Albert St.', city: 'Winnipeg', state: 'MB', country: 'Canada'}.merge(locations[:Winnipeg]))
 end
 
 Then(/^I should( not)? see a restroom$/) do |negation|

spec/api/v1/restrooms_spec.rb

@@ -2,7 +2,7 @@
 
 describe "Restrooms API", type: :request do
   it 'sends a list of restrooms order by date descending' do
-    FactoryGirl.create_list(:restroom, 15)
+    FactoryBot.create_list(:restroom, 15)
 
     get '/api/v1/restrooms'
     expect(response).to be_success
@@ -19,7 +19,7 @@
   end
 
   it 'paginates list of restrooms by 10 results' do
-    FactoryGirl.create_list(:restroom, 15)
+    FactoryBot.create_list(:restroom, 15)
 
     get '/api/v1/restrooms'
     expect(response).to be_success
@@ -35,10 +35,10 @@
 
   context 'filters' do
     before :each do
-      FactoryGirl.create_list(:restroom, 5)
-      FactoryGirl.create_list(:unisex_restroom, 5)
-      FactoryGirl.create_list(:ada_restroom, 5)
-      FactoryGirl.create_list(:unisex_and_ada_restroom, 5)
+      FactoryBot.create_list(:restroom, 5)
+      FactoryBot.create_list(:unisex_restroom, 5)
+      FactoryBot.create_list(:ada_restroom, 5)
+      FactoryBot.create_list(:unisex_and_ada_restroom, 5)
     end
 
     let(:json) { JSON.parse(response.body) }
@@ -81,10 +81,10 @@
   end
 
   it 'full-text searches a list of restrooms' do
-    FactoryGirl.create(:restroom)
-    FactoryGirl.create(:restroom, name: 'Frankie\'s Coffee Shop')
-    FactoryGirl.create(:restroom, name: 'Hipster Coffee Shop')
-    FactoryGirl.create(:restroom, name: 'Organic Co. Coffee', comment: 'Pretty tile.')
+    FactoryBot.create(:restroom)
+    FactoryBot.create(:restroom, name: 'Frankie\'s Coffee Shop')
+    FactoryBot.create(:restroom, name: 'Hipster Coffee Shop')
+    FactoryBot.create(:restroom, name: 'Organic Co. Coffee', comment: 'Pretty tile.')
 
     get '/api/v1/restrooms/search', params: { query: 'Coffee Shop' }
     json = JSON.parse(response.body)
@@ -107,7 +107,7 @@
   end
 
   it 'paginates full-text searches a list of restrooms by 10 results' do
-    FactoryGirl.create_list(:restroom, 15)
+    FactoryBot.create_list(:restroom, 15)
 
     get '/api/v1/restrooms/search', params: { query: 'San Francisco' }
     expect(response).to be_success
@@ -123,10 +123,10 @@
 
   context "queries" do
     before :each do
-      FactoryGirl.create(:restroom)
-      FactoryGirl.create(:unisex_restroom, name: 'Frankie\'s Coffee Shop')
-      FactoryGirl.create(:ada_restroom, name: 'Hipster Coffee Shop')
-      FactoryGirl.create(:unisex_and_ada_restroom, name: 'Organic Co. Coffee', comment: 'Pretty tile.')
+      FactoryBot.create(:restroom)
+      FactoryBot.create(:unisex_restroom, name: 'Frankie\'s Coffee Shop')
+      FactoryBot.create(:ada_restroom, name: 'Hipster Coffee Shop')
+      FactoryBot.create(:unisex_and_ada_restroom, name: 'Organic Co. Coffee', comment: 'Pretty tile.')
     end
 
     let(:json) { JSON.parse(response.body) }
@@ -177,7 +177,7 @@
 
     context "filters a list of restrooms by updated date" do
       before :each do
-        FactoryGirl.create(:restroom, created_at: 1.day.ago)
+        FactoryBot.create(:restroom, created_at: 1.day.ago)
         get "/api/v1/restrooms/by_date", params: { updated: true, day: Date.today.day, month: Date.today.month, year: Date.today.year }
       end
 
@@ -192,7 +192,7 @@
 
     context "filters a list of restrooms by created date" do
       before :each do
-        FactoryGirl.create(:restroom, created_at: 1.week.ago)
+        FactoryBot.create(:restroom, created_at: 1.week.ago)
         get "/api/v1/restrooms/by_date", params: { day: Date.today.day, month: Date.today.month, year: Date.today.year }
       end
 

spec/controllers/restrooms_controller_spec.rb

@@ -7,7 +7,7 @@
   end
 
   context "voting" do
-    let(:restroom) { FactoryGirl.create(:restroom) }
+    let(:restroom) { FactoryBot.create(:restroom) }
 
     it "should downvote" do
       post_params = {

spec/factories/restrooms.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :restroom do
     name 'Moonlight Café'
     street '123 Example St.'

spec/spec_helper.rb

@@ -43,8 +43,8 @@
   #     --seed 1234
   config.order = "random"
 
-  # Include FactoryGirl methods into the RSpec test suite.
-  config.include FactoryGirl::Syntax::Methods
+  # Include FactoryBot methods into the RSpec test suite.
+  config.include FactoryBot::Syntax::Methods
 end
 
 Geocoder.configure(:lookup => :test)