From 52ab208b922ab0273eb65ddd75d8c17c10db65d3 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Sat, 28 Oct 2017 21:43:38 +0300 Subject: [PATCH] Rename FactoryGirl to FactoryBot https://robots.thoughtbot.com/factory_bot --- Gemfile | 2 +- Gemfile.lock | 8 ++++---- lib/tasks/dev.rake | 2 +- spec/factories/account.rb | 2 +- spec/factories/account_activity.rb | 2 +- spec/factories/admin_domain_contact.rb | 2 +- spec/factories/admin_user.rb | 2 +- spec/factories/api_user.rb | 2 +- spec/factories/bank_statement.rb | 4 ++-- spec/factories/bank_transaction.rb | 2 +- spec/factories/billing/price.rb | 2 +- spec/factories/contact.rb | 2 +- spec/factories/dns/zone.rb | 2 +- spec/factories/dnskey.rb | 2 +- spec/factories/domain.rb | 6 +++--- spec/factories/domain_contact.rb | 2 +- spec/factories/domain_transfer.rb | 6 +++--- spec/factories/epp_session.rb | 2 +- spec/factories/invoice.rb | 6 +++--- spec/factories/invoice_item.rb | 2 +- spec/factories/keyrelay.rb | 2 +- spec/factories/message.rb | 2 +- spec/factories/nameserver.rb | 2 +- spec/factories/registrant.rb | 2 +- spec/factories/registrant_user.rb | 2 +- spec/factories/registrant_verification.rb | 2 +- spec/factories/registrar.rb | 2 +- spec/factories/reserved_domain.rb | 2 +- spec/factories/tech_domain_contact.rb | 2 +- spec/factories/white_ip.rb | 2 +- spec/factory_lint_spec.rb | 6 +++--- spec/rails_helper.rb | 2 +- spec/support/factory_bot.rb | 3 +++ spec/support/factory_girl.rb | 3 --- 34 files changed, 47 insertions(+), 47 deletions(-) create mode 100644 spec/support/factory_bot.rb delete mode 100644 spec/support/factory_girl.rb diff --git a/Gemfile b/Gemfile index b93f8d78e..9b65f92a9 100644 --- a/Gemfile +++ b/Gemfile @@ -116,7 +116,7 @@ group :development do end group :development, :test do - gem 'factory_girl_rails' + gem 'factory_bot_rails' gem 'capybara' gem 'rspec-rails', '~> 3.6' gem 'phantomjs-binaries' diff --git a/Gemfile.lock b/Gemfile.lock index 2c88bd596..a4a23575f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -182,10 +182,10 @@ GEM equalizer (0.0.11) erubis (2.7.0) execjs (2.7.0) - factory_girl (4.8.0) + 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) ffi (1.9.18) figaro (1.1.1) @@ -509,7 +509,7 @@ DEPENDENCIES digidoc_client! epp (= 1.5.0)! epp-xml (= 1.1.0)! - factory_girl_rails + factory_bot_rails figaro (= 1.1.1) grape (= 0.12.0) haml-rails (= 0.9.0) diff --git a/lib/tasks/dev.rake b/lib/tasks/dev.rake index c9ab84856..2bfb5c5ae 100644 --- a/lib/tasks/dev.rake +++ b/lib/tasks/dev.rake @@ -5,7 +5,7 @@ namespace :dev do task :prime, [:random] => :environment do |t, args| abort 'Production environment is not supported' if Rails.env.production? - include FactoryGirl::Syntax::Methods + include FactoryBot::Syntax::Methods PaperTrail.enabled = false Domain.paper_trail_on! diff --git a/spec/factories/account.rb b/spec/factories/account.rb index 65f40a433..4407b1f86 100644 --- a/spec/factories/account.rb +++ b/spec/factories/account.rb @@ -1,4 +1,4 @@ -FactoryGirl.define do +FactoryBot.define do factory :account do account_type Account::CASH balance 1 diff --git a/spec/factories/account_activity.rb b/spec/factories/account_activity.rb index 3735349b9..b5dd348f2 100644 --- a/spec/factories/account_activity.rb +++ b/spec/factories/account_activity.rb @@ -1,4 +1,4 @@ -FactoryGirl.define do +FactoryBot.define do factory :account_activity do sum 1.0 account diff --git a/spec/factories/admin_domain_contact.rb b/spec/factories/admin_domain_contact.rb index 786825214..bdfb193e3 100644 --- a/spec/factories/admin_domain_contact.rb +++ b/spec/factories/admin_domain_contact.rb @@ -1,4 +1,4 @@ -FactoryGirl.define do +FactoryBot.define do factory :admin_domain_contact, parent: :domain_contact, class: AdminDomainContact do end diff --git a/spec/factories/admin_user.rb b/spec/factories/admin_user.rb index 0714d9f1f..8f948062d 100644 --- a/spec/factories/admin_user.rb +++ b/spec/factories/admin_user.rb @@ -1,4 +1,4 @@ -FactoryGirl.define do +FactoryBot.define do factory :admin_user do username 'test' sequence(:email) { |n| "test#{n}@test.com" } diff --git a/spec/factories/api_user.rb b/spec/factories/api_user.rb index a38fb8bf9..a3f9623b6 100644 --- a/spec/factories/api_user.rb +++ b/spec/factories/api_user.rb @@ -1,4 +1,4 @@ -FactoryGirl.define do +FactoryBot.define do factory :api_user do sequence(:username) { |n| "test#{n}" } password 'a' * ApiUser.min_password_length diff --git a/spec/factories/bank_statement.rb b/spec/factories/bank_statement.rb index 988ba7681..fa4865496 100644 --- a/spec/factories/bank_statement.rb +++ b/spec/factories/bank_statement.rb @@ -1,11 +1,11 @@ -FactoryGirl.define do +FactoryBot.define do factory :bank_statement do bank_code { '767' } iban { 'EE557700771000598731' } queried_at { Time.zone.now } after :build do |bank_statement| - bank_statement.bank_transactions << FactoryGirl.create_pair(:bank_transaction) + bank_statement.bank_transactions << FactoryBot.create_pair(:bank_transaction) end end end diff --git a/spec/factories/bank_transaction.rb b/spec/factories/bank_transaction.rb index f8eb26b99..ebe471984 100644 --- a/spec/factories/bank_transaction.rb +++ b/spec/factories/bank_transaction.rb @@ -1,4 +1,4 @@ -FactoryGirl.define do +FactoryBot.define do factory :bank_transaction do currency { 'EUR' } sum { 100.0 } diff --git a/spec/factories/billing/price.rb b/spec/factories/billing/price.rb index b7d49653d..4d44cf6a1 100644 --- a/spec/factories/billing/price.rb +++ b/spec/factories/billing/price.rb @@ -1,4 +1,4 @@ -FactoryGirl.define do +FactoryBot.define do factory :price, class: Billing::Price do price Money.from_amount(1) valid_from Time.zone.parse('05.07.2010') diff --git a/spec/factories/contact.rb b/spec/factories/contact.rb index e47b67012..7e7a9a6a2 100644 --- a/spec/factories/contact.rb +++ b/spec/factories/contact.rb @@ -1,4 +1,4 @@ -FactoryGirl.define do +FactoryBot.define do factory :contact do name 'test' sequence(:code) { |n| "test#{n}" } diff --git a/spec/factories/dns/zone.rb b/spec/factories/dns/zone.rb index c1180bb50..e88a3f2fe 100644 --- a/spec/factories/dns/zone.rb +++ b/spec/factories/dns/zone.rb @@ -1,4 +1,4 @@ -FactoryGirl.define do +FactoryBot.define do factory :zone, class: DNS::Zone do sequence(:origin) { |n| "test#{n}" } ttl 1 diff --git a/spec/factories/dnskey.rb b/spec/factories/dnskey.rb index 379253c84..4dbf0a788 100644 --- a/spec/factories/dnskey.rb +++ b/spec/factories/dnskey.rb @@ -1,4 +1,4 @@ -FactoryGirl.define do +FactoryBot.define do factory :dnskey do alg Dnskey::ALGORITHMS.first flags Dnskey::FLAGS.first diff --git a/spec/factories/domain.rb b/spec/factories/domain.rb index 4c1b4b1cc..191a8055c 100644 --- a/spec/factories/domain.rb +++ b/spec/factories/domain.rb @@ -1,4 +1,4 @@ -FactoryGirl.define do +FactoryBot.define do factory :domain do sequence(:name) { |n| "test#{n}.com" } period 1 @@ -7,8 +7,8 @@ FactoryGirl.define do registrant after :build do |domain| - domain.admin_domain_contacts << FactoryGirl.build(:admin_domain_contact) - domain.tech_domain_contacts << FactoryGirl.build(:tech_domain_contact) + domain.admin_domain_contacts << FactoryBot.build(:admin_domain_contact) + domain.tech_domain_contacts << FactoryBot.build(:tech_domain_contact) end factory :domain_without_force_delete do diff --git a/spec/factories/domain_contact.rb b/spec/factories/domain_contact.rb index ae05fd293..caf964ed3 100644 --- a/spec/factories/domain_contact.rb +++ b/spec/factories/domain_contact.rb @@ -1,4 +1,4 @@ -FactoryGirl.define do +FactoryBot.define do factory :domain_contact do contact end diff --git a/spec/factories/domain_transfer.rb b/spec/factories/domain_transfer.rb index 66ec57081..4ecbfd084 100644 --- a/spec/factories/domain_transfer.rb +++ b/spec/factories/domain_transfer.rb @@ -1,7 +1,7 @@ -FactoryGirl.define do +FactoryBot.define do factory :domain_transfer do domain - transfer_from { FactoryGirl.create(:registrar) } - transfer_to { FactoryGirl.create(:registrar) } + transfer_from { FactoryBot.create(:registrar) } + transfer_to { FactoryBot.create(:registrar) } end end diff --git a/spec/factories/epp_session.rb b/spec/factories/epp_session.rb index 61fa06151..96dd78da3 100644 --- a/spec/factories/epp_session.rb +++ b/spec/factories/epp_session.rb @@ -1,4 +1,4 @@ -FactoryGirl.define do +FactoryBot.define do factory :epp_session do end diff --git a/spec/factories/invoice.rb b/spec/factories/invoice.rb index e9ded973c..7eeed32b9 100644 --- a/spec/factories/invoice.rb +++ b/spec/factories/invoice.rb @@ -1,4 +1,4 @@ -FactoryGirl.define do +FactoryBot.define do factory :invoice do buyer_name 'Registrar 1' currency { 'EUR' } @@ -9,10 +9,10 @@ FactoryGirl.define do seller_city { 'Tallinn' } seller_street { 'Paldiski mnt. 123' } vat_prc 0.2 - buyer { FactoryGirl.create(:registrar) } + buyer { FactoryBot.create(:registrar) } after :build do |invoice| - invoice.invoice_items << FactoryGirl.create_pair(:invoice_item) + invoice.invoice_items << FactoryBot.create_pair(:invoice_item) end end end diff --git a/spec/factories/invoice_item.rb b/spec/factories/invoice_item.rb index ee951dee8..3dee95319 100644 --- a/spec/factories/invoice_item.rb +++ b/spec/factories/invoice_item.rb @@ -1,4 +1,4 @@ -FactoryGirl.define do +FactoryBot.define do factory :invoice_item do description { 'add money' } unit 1 diff --git a/spec/factories/keyrelay.rb b/spec/factories/keyrelay.rb index 40a202dc7..4587af999 100644 --- a/spec/factories/keyrelay.rb +++ b/spec/factories/keyrelay.rb @@ -1,4 +1,4 @@ -FactoryGirl.define do +FactoryBot.define do factory :keyrelay do pa_date { Time.zone.now } expiry_relative 'P1W' diff --git a/spec/factories/message.rb b/spec/factories/message.rb index 5f1fd4e43..6ae235aaf 100644 --- a/spec/factories/message.rb +++ b/spec/factories/message.rb @@ -1,4 +1,4 @@ -FactoryGirl.define do +FactoryBot.define do factory :message do body 'fabricator body' end diff --git a/spec/factories/nameserver.rb b/spec/factories/nameserver.rb index ebe7a7909..edae45597 100644 --- a/spec/factories/nameserver.rb +++ b/spec/factories/nameserver.rb @@ -1,4 +1,4 @@ -FactoryGirl.define do +FactoryBot.define do factory :nameserver do sequence(:hostname) { |n| "ns.test#{n}.ee" } ipv4 '192.168.1.1' diff --git a/spec/factories/registrant.rb b/spec/factories/registrant.rb index d84d1688e..f21fbe7c4 100644 --- a/spec/factories/registrant.rb +++ b/spec/factories/registrant.rb @@ -1,4 +1,4 @@ -FactoryGirl.define do +FactoryBot.define do factory :registrant, parent: :contact, class: Registrant do name 'test' diff --git a/spec/factories/registrant_user.rb b/spec/factories/registrant_user.rb index 38f883067..29d0a2479 100644 --- a/spec/factories/registrant_user.rb +++ b/spec/factories/registrant_user.rb @@ -1,4 +1,4 @@ -FactoryGirl.define do +FactoryBot.define do factory :registrant_user do end diff --git a/spec/factories/registrant_verification.rb b/spec/factories/registrant_verification.rb index 136f272ae..5ecc81fa5 100644 --- a/spec/factories/registrant_verification.rb +++ b/spec/factories/registrant_verification.rb @@ -1,4 +1,4 @@ -FactoryGirl.define do +FactoryBot.define do factory :registrant_verification do sequence(:domain_name) { |i| "domain#{i}.ee" } domain diff --git a/spec/factories/registrar.rb b/spec/factories/registrar.rb index 426561dda..df7d73690 100644 --- a/spec/factories/registrar.rb +++ b/spec/factories/registrar.rb @@ -1,4 +1,4 @@ -FactoryGirl.define do +FactoryBot.define do factory :registrar do sequence(:name) { |n| "test#{n}" } sequence(:code) { |n| "test#{n}" } diff --git a/spec/factories/reserved_domain.rb b/spec/factories/reserved_domain.rb index f4ca99db7..54d3c61df 100644 --- a/spec/factories/reserved_domain.rb +++ b/spec/factories/reserved_domain.rb @@ -1,4 +1,4 @@ -FactoryGirl.define do +FactoryBot.define do factory :reserved_domain do sequence(:name) { |i| "domain#{i}.ee" } end diff --git a/spec/factories/tech_domain_contact.rb b/spec/factories/tech_domain_contact.rb index e407474a3..b3b3f0564 100644 --- a/spec/factories/tech_domain_contact.rb +++ b/spec/factories/tech_domain_contact.rb @@ -1,4 +1,4 @@ -FactoryGirl.define do +FactoryBot.define do factory :tech_domain_contact, parent: :domain_contact, class: TechDomainContact do end diff --git a/spec/factories/white_ip.rb b/spec/factories/white_ip.rb index eb4033fc9..f2b46711c 100644 --- a/spec/factories/white_ip.rb +++ b/spec/factories/white_ip.rb @@ -1,4 +1,4 @@ -FactoryGirl.define do +FactoryBot.define do factory :white_ip do ipv4 '127.0.0.1' end diff --git a/spec/factory_lint_spec.rb b/spec/factory_lint_spec.rb index 619779827..8d6386f2f 100644 --- a/spec/factory_lint_spec.rb +++ b/spec/factory_lint_spec.rb @@ -1,15 +1,15 @@ require_relative 'rails_helper' -RSpec.describe 'FactoryGirl', db: true do +RSpec.describe 'FactoryBot', db: true do before :example do allow(Contact).to receive(:address_processing?).and_return(false) end it 'lints factories' do - factories_to_lint = FactoryGirl.factories.reject do |factory| + factories_to_lint = FactoryBot.factories.reject do |factory| %i(reserved_domain).include?(factory.name) || factory.name.to_s =~ /^domain/ # Ignore the ones with domain_name validator end - FactoryGirl.lint factories_to_lint + FactoryBot.lint factories_to_lint end end diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb index cd242967b..966d68b60 100644 --- a/spec/rails_helper.rb +++ b/spec/rails_helper.rb @@ -13,7 +13,7 @@ require 'support/matchers/epp/code' require 'support/capybara' require 'support/devise' -require 'support/factory_girl' +require 'support/factory_bot' require 'support/database_cleaner' require 'support/paper_trail' require 'support/settings' diff --git a/spec/support/factory_bot.rb b/spec/support/factory_bot.rb new file mode 100644 index 000000000..c7890e49c --- /dev/null +++ b/spec/support/factory_bot.rb @@ -0,0 +1,3 @@ +RSpec.configure do |config| + config.include FactoryBot::Syntax::Methods +end diff --git a/spec/support/factory_girl.rb b/spec/support/factory_girl.rb deleted file mode 100644 index eec437fb3..000000000 --- a/spec/support/factory_girl.rb +++ /dev/null @@ -1,3 +0,0 @@ -RSpec.configure do |config| - config.include FactoryGirl::Syntax::Methods -end