From 0a19418d154058fab31f9779081812e333453ff1 Mon Sep 17 00:00:00 2001 From: Henne Vogelsang Date: Mon, 3 Sep 2018 20:44:39 +0200 Subject: [PATCH] Replace All FactoryGirl Constant References --- lib/tasks/data_demo.rake | 2 +- lib/tasks/demo_data_for_development.rake | 2 +- lib/tasks/factory_girl.rake | 4 ++-- spec/factories/answer.rb | 2 +- spec/factories/booth_request.rb | 2 +- spec/factories/booths.rb | 2 +- spec/factories/campaigns.rb | 2 +- spec/factories/cfps.rb | 2 +- spec/factories/comments.rb | 2 +- spec/factories/commercials.rb | 2 +- spec/factories/conferences.rb | 2 +- spec/factories/contacts.rb | 2 +- spec/factories/difficulty_levels.rb | 2 +- spec/factories/email_settings.rb | 2 +- spec/factories/event_schedule.rb | 2 +- spec/factories/event_types.rb | 2 +- spec/factories/event_users.rb | 2 +- spec/factories/events.rb | 2 +- spec/factories/events_registrations.rb | 2 +- spec/factories/lodgings.rb | 2 +- spec/factories/openid.rb | 2 +- spec/factories/organizations.rb | 2 +- spec/factories/payments.rb | 2 +- spec/factories/physical_ticket.rb | 2 +- spec/factories/programs.rb | 2 +- spec/factories/qanswer.rb | 2 +- spec/factories/question.rb | 2 +- spec/factories/question_type.rb | 2 +- spec/factories/registration.rb | 2 +- spec/factories/registration_periods.rb | 2 +- spec/factories/resource.rb | 2 +- spec/factories/roles.rb | 2 +- spec/factories/rooms.rb | 2 +- spec/factories/schedule.rb | 2 +- spec/factories/splashpages.rb | 2 +- spec/factories/sponsors.rb | 2 +- spec/factories/sponsorship_levels.rb | 2 +- spec/factories/subscriptions.rb | 2 +- spec/factories/survey_questions.rb | 2 +- spec/factories/survey_replies.rb | 2 +- spec/factories/survey_submissions.rb | 2 +- spec/factories/surveys.rb | 2 +- spec/factories/targets.rb | 2 +- spec/factories/ticket_purchases.rb | 2 +- spec/factories/ticket_scanning.rb | 2 +- spec/factories/tickets.rb | 2 +- spec/factories/tracks.rb | 2 +- spec/factories/users.rb | 2 +- spec/factories/vdays.rb | 2 +- spec/factories/venues.rb | 2 +- spec/factories/visits.rb | 2 +- spec/factories/votes.rb | 2 +- spec/factories/vpositions.rb | 2 +- spec/spec_helper.rb | 2 +- spec/support/factory_girl.rb | 2 +- 55 files changed, 56 insertions(+), 56 deletions(-) diff --git a/lib/tasks/data_demo.rake b/lib/tasks/data_demo.rake index 4683a3c4..4209e799 100644 --- a/lib/tasks/data_demo.rake +++ b/lib/tasks/data_demo.rake @@ -4,7 +4,7 @@ namespace :data do desc 'Create demo data using our factories' task demo: :environment do - include FactoryGirl::Syntax::Methods + include FactoryBot::Syntax::Methods conference = create(:full_conference, title: 'Open Source Event Manager Demo', short_title: 'osemdemo' ,description: "This is a [Open Source Event Manager](http://osem.io/) demo instance. You can log in as **admin** with the password **password123** or just you just [sign up](/accounts/sign_up) with your own user. We hope you enjoy checking out all the functionality, if you have questions don't hesitate to [contact us](http://osem.io/#contact)!\r\n\r\n## Data will be destroyed every thirty minutes or whenever someone updates the [OSEM source code on github](https://github.com/openSUSE/osem/commits/master).") conference.contact.update_attributes(email: 'osemdemo@osem.io', sponsor_email: 'osemdemo@osem.io') create(:admin, email: 'admin@osem.io', username: 'admin', password: 'password123', password_confirmation: 'password123') diff --git a/lib/tasks/demo_data_for_development.rake b/lib/tasks/demo_data_for_development.rake index 13b7fdfb..d54f8cfb 100644 --- a/lib/tasks/demo_data_for_development.rake +++ b/lib/tasks/demo_data_for_development.rake @@ -2,7 +2,7 @@ namespace :data do desc 'Create demo data for our local development' - include FactoryGirl::Syntax::Methods + include FactoryBot::Syntax::Methods task surveys: :environment do conference = create(:full_conference, start_date: Date.current, end_date: Date.current + 1.day) diff --git a/lib/tasks/factory_girl.rake b/lib/tasks/factory_girl.rake index 81874326..a95745ae 100644 --- a/lib/tasks/factory_girl.rake +++ b/lib/tasks/factory_girl.rake @@ -1,12 +1,12 @@ # frozen_string_literal: true namespace :factory_girl do - desc "Verify that all FactoryGirl factories are valid" + desc "Verify that all FactoryBot factories are valid" task lint: :environment do if Rails.env.test? begin DatabaseCleaner.start - FactoryGirl.lint + FactoryBot.lint ensure DatabaseCleaner.clean end diff --git a/spec/factories/answer.rb b/spec/factories/answer.rb index f2c69c32..e9fe3a0d 100644 --- a/spec/factories/answer.rb +++ b/spec/factories/answer.rb @@ -2,7 +2,7 @@ # Read about factories at https://github.com/thoughtbot/factory_girl -FactoryGirl.define do +FactoryBot.define do factory :answer do title 'Do you?' end diff --git a/spec/factories/booth_request.rb b/spec/factories/booth_request.rb index 1b7a37e8..d8dca42f 100644 --- a/spec/factories/booth_request.rb +++ b/spec/factories/booth_request.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -FactoryGirl.define do +FactoryBot.define do factory :booth_request do booth user diff --git a/spec/factories/booths.rb b/spec/factories/booths.rb index eff90c44..fa7e9824 100644 --- a/spec/factories/booths.rb +++ b/spec/factories/booths.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -FactoryGirl.define do +FactoryBot.define do factory :booth do title { Faker::Hipster.sentence } description { Faker::Lorem.paragraph } diff --git a/spec/factories/campaigns.rb b/spec/factories/campaigns.rb index dc745487..f15bed6e 100644 --- a/spec/factories/campaigns.rb +++ b/spec/factories/campaigns.rb @@ -2,7 +2,7 @@ # Read about factories at https://github.com/thoughtbot/factory_girl -FactoryGirl.define do +FactoryBot.define do factory :campaign do name 'Test Campaign' utm_campaign 'testcampaign' diff --git a/spec/factories/cfps.rb b/spec/factories/cfps.rb index d7932e2d..2d8e00e6 100644 --- a/spec/factories/cfps.rb +++ b/spec/factories/cfps.rb @@ -2,7 +2,7 @@ # Read about factories at https://github.com/thoughtbot/factory_girl -FactoryGirl.define do +FactoryBot.define do factory :cfp do start_date { 1.day.ago } end_date { 2.days.from_now } diff --git a/spec/factories/comments.rb b/spec/factories/comments.rb index 736ba0ba..b5475c37 100644 --- a/spec/factories/comments.rb +++ b/spec/factories/comments.rb @@ -2,7 +2,7 @@ # Read about factories at https://github.com/thoughtbot/factory_girl -FactoryGirl.define do +FactoryBot.define do factory :comment do body 'Most interresting comment ever, created by a girl.' user diff --git a/spec/factories/commercials.rb b/spec/factories/commercials.rb index 00404b36..d0ee7f99 100644 --- a/spec/factories/commercials.rb +++ b/spec/factories/commercials.rb @@ -2,7 +2,7 @@ # Read about factories at https://github.com/thoughtbot/factory_girl -FactoryGirl.define do +FactoryBot.define do factory :commercial do sequence(:url) { |n| "https://www.youtube.com/watch?v=4VrhlyIgo3M&factory=#{n}" } diff --git a/spec/factories/conferences.rb b/spec/factories/conferences.rb index dad360c5..fc95a5a7 100644 --- a/spec/factories/conferences.rb +++ b/spec/factories/conferences.rb @@ -2,7 +2,7 @@ # Read about factories at https://github.com/thoughtbot/factory_girl -FactoryGirl.define do +FactoryBot.define do factory :conference do title { Faker::Book.title } short_title { SecureRandom.urlsafe_base64(4) } diff --git a/spec/factories/contacts.rb b/spec/factories/contacts.rb index ac3bccc1..edec9ea9 100644 --- a/spec/factories/contacts.rb +++ b/spec/factories/contacts.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -FactoryGirl.define do +FactoryBot.define do factory :contact do social_tag { SecureRandom.urlsafe_base64(4) } email { Faker::Internet.email } diff --git a/spec/factories/difficulty_levels.rb b/spec/factories/difficulty_levels.rb index 9c147830..528f9f20 100644 --- a/spec/factories/difficulty_levels.rb +++ b/spec/factories/difficulty_levels.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -FactoryGirl.define do +FactoryBot.define do factory :difficulty_level do title 'Example Difficulty Level' description 'Lorem Ipsum dolsum' diff --git a/spec/factories/email_settings.rb b/spec/factories/email_settings.rb index db8a1480..635c310c 100644 --- a/spec/factories/email_settings.rb +++ b/spec/factories/email_settings.rb @@ -2,7 +2,7 @@ # Read about factories at https://github.com/thoughtbot/factory_girl -FactoryGirl.define do +FactoryBot.define do factory :email_settings do send_on_registration true send_on_accepted false diff --git a/spec/factories/event_schedule.rb b/spec/factories/event_schedule.rb index bb76f6f3..937d0f80 100644 --- a/spec/factories/event_schedule.rb +++ b/spec/factories/event_schedule.rb @@ -2,7 +2,7 @@ # Read about factories at https://github.com/thoughtbot/factory_girl -FactoryGirl.define do +FactoryBot.define do factory :event_schedule do event after(:build) do |event_schedule| diff --git a/spec/factories/event_types.rb b/spec/factories/event_types.rb index 7dc96497..5cce1f53 100644 --- a/spec/factories/event_types.rb +++ b/spec/factories/event_types.rb @@ -2,7 +2,7 @@ # Read about factories at https://github.com/thoughtbot/factory_girl -FactoryGirl.define do +FactoryBot.define do factory :event_type do title 'Example Event Type' length 30 diff --git a/spec/factories/event_users.rb b/spec/factories/event_users.rb index f0830243..f0f5aafb 100644 --- a/spec/factories/event_users.rb +++ b/spec/factories/event_users.rb @@ -2,7 +2,7 @@ # Read about factories at https://github.com/thoughtbot/factory_girl -FactoryGirl.define do +FactoryBot.define do factory :event_user do user diff --git a/spec/factories/events.rb b/spec/factories/events.rb index c2f34988..6e5a6b5d 100644 --- a/spec/factories/events.rb +++ b/spec/factories/events.rb @@ -2,7 +2,7 @@ # Read about factories at https://github.com/thoughtbot/factory_girl -FactoryGirl.define do +FactoryBot.define do factory :event do title { Faker::Hipster.sentence } abstract { Faker::Hipster.paragraph(2) } diff --git a/spec/factories/events_registrations.rb b/spec/factories/events_registrations.rb index 84012f57..5df72c3b 100644 --- a/spec/factories/events_registrations.rb +++ b/spec/factories/events_registrations.rb @@ -2,7 +2,7 @@ # Read about factories at https://github.com/thoughtbot/factory_girl -FactoryGirl.define do +FactoryBot.define do factory :events_registration do event registration diff --git a/spec/factories/lodgings.rb b/spec/factories/lodgings.rb index 42d02c0b..0bc2338f 100644 --- a/spec/factories/lodgings.rb +++ b/spec/factories/lodgings.rb @@ -2,7 +2,7 @@ # Read about factories at https://github.com/thoughtbot/factory_girl -FactoryGirl.define do +FactoryBot.define do factory :lodging do name { "#{Faker::App.name} Hotel" } description { Faker::Lorem.paragraph } diff --git a/spec/factories/openid.rb b/spec/factories/openid.rb index 60dcf29f..db204194 100644 --- a/spec/factories/openid.rb +++ b/spec/factories/openid.rb @@ -2,7 +2,7 @@ # Read about factories at https://github.com/thoughtbot/factory_girl -FactoryGirl.define do +FactoryBot.define do factory :openid do provider { Faker::Internet.domain_word } email { Faker::Internet.email } diff --git a/spec/factories/organizations.rb b/spec/factories/organizations.rb index 8b10893b..1fde9081 100644 --- a/spec/factories/organizations.rb +++ b/spec/factories/organizations.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -FactoryGirl.define do +FactoryBot.define do factory :organization do sequence(:name) { |n| "#{Faker::Company.name} #{n}" } description { Faker::Lorem.paragraph } diff --git a/spec/factories/payments.rb b/spec/factories/payments.rb index 71a7adff..f2e143eb 100644 --- a/spec/factories/payments.rb +++ b/spec/factories/payments.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -FactoryGirl.define do +FactoryBot.define do factory :payment do user conference diff --git a/spec/factories/physical_ticket.rb b/spec/factories/physical_ticket.rb index 0356657f..17fbc6ca 100644 --- a/spec/factories/physical_ticket.rb +++ b/spec/factories/physical_ticket.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -FactoryGirl.define do +FactoryBot.define do factory :physical_ticket do ticket_purchase end diff --git a/spec/factories/programs.rb b/spec/factories/programs.rb index c6345088..eec95af8 100644 --- a/spec/factories/programs.rb +++ b/spec/factories/programs.rb @@ -2,7 +2,7 @@ # Read about factories at https://github.com/thoughtbot/factory_girl -FactoryGirl.define do +FactoryBot.define do factory :program do schedule_public false schedule_fluid false diff --git a/spec/factories/qanswer.rb b/spec/factories/qanswer.rb index 962392a1..dc1b1916 100644 --- a/spec/factories/qanswer.rb +++ b/spec/factories/qanswer.rb @@ -2,7 +2,7 @@ # Read about factories at https://github.com/thoughtbot/factory_girl -FactoryGirl.define do +FactoryBot.define do factory :qanswer do question answer diff --git a/spec/factories/question.rb b/spec/factories/question.rb index 310e61b9..2ba2e8a1 100644 --- a/spec/factories/question.rb +++ b/spec/factories/question.rb @@ -2,7 +2,7 @@ # Read about factories at https://github.com/thoughtbot/factory_girl -FactoryGirl.define do +FactoryBot.define do factory :question do title { Faker::Lorem.sentence } question_type diff --git a/spec/factories/question_type.rb b/spec/factories/question_type.rb index 15a942b9..24c0451b 100644 --- a/spec/factories/question_type.rb +++ b/spec/factories/question_type.rb @@ -2,7 +2,7 @@ # Read about factories at https://github.com/thoughtbot/factory_girl -FactoryGirl.define do +FactoryBot.define do factory :question_type do title 'Multiple Choice' end diff --git a/spec/factories/registration.rb b/spec/factories/registration.rb index 1cdb297d..6ef459c2 100644 --- a/spec/factories/registration.rb +++ b/spec/factories/registration.rb @@ -2,7 +2,7 @@ # Read about factories at https://github.com/thoughtbot/factory_girl -FactoryGirl.define do +FactoryBot.define do factory :registration do user conference diff --git a/spec/factories/registration_periods.rb b/spec/factories/registration_periods.rb index 333c29d0..0d05fb70 100644 --- a/spec/factories/registration_periods.rb +++ b/spec/factories/registration_periods.rb @@ -2,7 +2,7 @@ # Read about factories at https://github.com/thoughtbot/factory_girl -FactoryGirl.define do +FactoryBot.define do factory :registration_period do start_date { 3.days.ago } end_date { 5.days.from_now } diff --git a/spec/factories/resource.rb b/spec/factories/resource.rb index 4848f09d..fcd1018d 100644 --- a/spec/factories/resource.rb +++ b/spec/factories/resource.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -FactoryGirl.define do +FactoryBot.define do factory :resource do name { 'Resource' } quantity { 10 } diff --git a/spec/factories/roles.rb b/spec/factories/roles.rb index a2997a91..a79acb33 100644 --- a/spec/factories/roles.rb +++ b/spec/factories/roles.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -FactoryGirl.define do +FactoryBot.define do factory :role do name 'my role' diff --git a/spec/factories/rooms.rb b/spec/factories/rooms.rb index 7e3ebe65..08f41ff4 100644 --- a/spec/factories/rooms.rb +++ b/spec/factories/rooms.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true # Read about factories at https://github.com/thoughtbot/factory_girl -FactoryGirl.define do +FactoryBot.define do factory :room do name { "Room #{Faker::Address.country}" } size 4 diff --git a/spec/factories/schedule.rb b/spec/factories/schedule.rb index 8a5635d9..09a4a8aa 100644 --- a/spec/factories/schedule.rb +++ b/spec/factories/schedule.rb @@ -2,7 +2,7 @@ # Read about factories at https://github.com/thoughtbot/factory_girl -FactoryGirl.define do +FactoryBot.define do factory :schedule do program end diff --git a/spec/factories/splashpages.rb b/spec/factories/splashpages.rb index 80c9f0f6..57b91d4c 100644 --- a/spec/factories/splashpages.rb +++ b/spec/factories/splashpages.rb @@ -2,7 +2,7 @@ # Read about factories at https://github.com/thoughtbot/factory_girl -FactoryGirl.define do +FactoryBot.define do factory :splashpage do public false diff --git a/spec/factories/sponsors.rb b/spec/factories/sponsors.rb index 26958a6b..305711f5 100644 --- a/spec/factories/sponsors.rb +++ b/spec/factories/sponsors.rb @@ -2,7 +2,7 @@ # Read about factories at https://github.com/thoughtbot/factory_girl -FactoryGirl.define do +FactoryBot.define do factory :sponsor do name { Faker::Company.name } website_url { Faker::Internet.url } diff --git a/spec/factories/sponsorship_levels.rb b/spec/factories/sponsorship_levels.rb index 6b8a4da9..a49f1281 100644 --- a/spec/factories/sponsorship_levels.rb +++ b/spec/factories/sponsorship_levels.rb @@ -2,7 +2,7 @@ # Read about factories at https://github.com/thoughtbot/factory_girl -FactoryGirl.define do +FactoryBot.define do factory :sponsorship_level do title { Faker::Lorem.word } diff --git a/spec/factories/subscriptions.rb b/spec/factories/subscriptions.rb index 6141331c..174d643e 100644 --- a/spec/factories/subscriptions.rb +++ b/spec/factories/subscriptions.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -FactoryGirl.define do +FactoryBot.define do factory :subscription do user conference diff --git a/spec/factories/survey_questions.rb b/spec/factories/survey_questions.rb index 7e8bda5c..9875f1ca 100644 --- a/spec/factories/survey_questions.rb +++ b/spec/factories/survey_questions.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -FactoryGirl.define do +FactoryBot.define do factory :survey_question do survey title 'What about this question?' diff --git a/spec/factories/survey_replies.rb b/spec/factories/survey_replies.rb index 46114e51..19a0fc2b 100644 --- a/spec/factories/survey_replies.rb +++ b/spec/factories/survey_replies.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -FactoryGirl.define do +FactoryBot.define do factory :survey_reply do user survey_question diff --git a/spec/factories/survey_submissions.rb b/spec/factories/survey_submissions.rb index 26aec771..9c4178d1 100644 --- a/spec/factories/survey_submissions.rb +++ b/spec/factories/survey_submissions.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -FactoryGirl.define do +FactoryBot.define do factory :survey_submission do user survey diff --git a/spec/factories/surveys.rb b/spec/factories/surveys.rb index 2d1b785f..a179f199 100644 --- a/spec/factories/surveys.rb +++ b/spec/factories/surveys.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -FactoryGirl.define do +FactoryBot.define do factory :survey do title 'This is my survey' start_date Date.current - 1.day diff --git a/spec/factories/targets.rb b/spec/factories/targets.rb index 8318b081..2756e828 100644 --- a/spec/factories/targets.rb +++ b/spec/factories/targets.rb @@ -2,7 +2,7 @@ # Read about factories at https://github.com/thoughtbot/factory_girl -FactoryGirl.define do +FactoryBot.define do factory :target do due_date { 14.days.from_now } target_count 100 diff --git a/spec/factories/ticket_purchases.rb b/spec/factories/ticket_purchases.rb index 9b339ed9..f3ad7185 100644 --- a/spec/factories/ticket_purchases.rb +++ b/spec/factories/ticket_purchases.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -FactoryGirl.define do +FactoryBot.define do factory :ticket_purchase do user conference diff --git a/spec/factories/ticket_scanning.rb b/spec/factories/ticket_scanning.rb index df18fc80..93dd56e4 100644 --- a/spec/factories/ticket_scanning.rb +++ b/spec/factories/ticket_scanning.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -FactoryGirl.define do +FactoryBot.define do factory :ticket_scanning do physical_ticket end diff --git a/spec/factories/tickets.rb b/spec/factories/tickets.rb index ba623044..b6aed3bb 100644 --- a/spec/factories/tickets.rb +++ b/spec/factories/tickets.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -FactoryGirl.define do +FactoryBot.define do factory :ticket do title { "#{Faker::Hipster.word} Ticket" } price_cents 1000 diff --git a/spec/factories/tracks.rb b/spec/factories/tracks.rb index eda41a11..b105186f 100644 --- a/spec/factories/tracks.rb +++ b/spec/factories/tracks.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -FactoryGirl.define do +FactoryBot.define do factory :track do name { Faker::Commerce.department(2, true) } description { Faker::Lorem.sentence } diff --git a/spec/factories/users.rb b/spec/factories/users.rb index d253af3c..67996edb 100644 --- a/spec/factories/users.rb +++ b/spec/factories/users.rb @@ -15,7 +15,7 @@ # For a non-admin user, use: `create(:user)` # For an admin user, use: `create(:admin) -FactoryGirl.define do +FactoryBot.define do factory :user do sequence(:email) { |n| "example#{n}@example.com" } sequence(:name) { |n| "name#{n}" } diff --git a/spec/factories/vdays.rb b/spec/factories/vdays.rb index 17edb081..c875e8c1 100644 --- a/spec/factories/vdays.rb +++ b/spec/factories/vdays.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -FactoryGirl.define do +FactoryBot.define do factory :vday do day { Time.zone.today } description 'Lorem Ipsum dolsum' diff --git a/spec/factories/venues.rb b/spec/factories/venues.rb index a240f951..45138791 100644 --- a/spec/factories/venues.rb +++ b/spec/factories/venues.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true # Read about factories at https://github.com/thoughtbot/factory_girl -FactoryGirl.define do +FactoryBot.define do factory :venue do name { "#{Faker::Company.name} Office" } street { Faker::Address.street_address } diff --git a/spec/factories/visits.rb b/spec/factories/visits.rb index 145e919d..c756c4a7 100644 --- a/spec/factories/visits.rb +++ b/spec/factories/visits.rb @@ -2,7 +2,7 @@ # Read about factories at https://github.com/thoughtbot/factory_girl -FactoryGirl.define do +FactoryBot.define do factory :visit do end end diff --git a/spec/factories/votes.rb b/spec/factories/votes.rb index 6fe973d9..ec8b5dfd 100644 --- a/spec/factories/votes.rb +++ b/spec/factories/votes.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -FactoryGirl.define do +FactoryBot.define do factory :vote do event user diff --git a/spec/factories/vpositions.rb b/spec/factories/vpositions.rb index ee016776..4f7a0545 100644 --- a/spec/factories/vpositions.rb +++ b/spec/factories/vpositions.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -FactoryGirl.define do +FactoryBot.define do factory :vposition do title 'Example Volunteer Position' description 'Lorem Ipsum dolsum' diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index a62932bf..f39baca2 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -73,7 +73,7 @@ RSpec.configure do |config| end # Includes helpers and connect them to specific types of tests - config.include FactoryGirl::Syntax::Methods + config.include FactoryBot::Syntax::Methods config.include OmniauthMacros config.include Devise::TestHelpers, type: :controller config.include LoginMacros, type: :feature diff --git a/spec/support/factory_girl.rb b/spec/support/factory_girl.rb index ab8b14a9..75e2be51 100644 --- a/spec/support/factory_girl.rb +++ b/spec/support/factory_girl.rb @@ -11,7 +11,7 @@ RSpec.configure do |config| begin DatabaseCleaner.start mock_commercial_request - FactoryGirl.lint + FactoryBot.lint ensure DatabaseCleaner.clean end