From 5566ed9fbbba66d5051e2632069e2e3a2db7a0f6 Mon Sep 17 00:00:00 2001 From: Braden Date: Fri, 17 Aug 2018 13:55:25 -0400 Subject: [PATCH 1/2] Upgrade To Factory Bot. Let's get away from Factory Girl completely. This is a bit of a headache but since we are using fork, bake this in. --- .../spree/api/orders_controller_spec.rb | 4 +- .../return_authorizations_controller_spec.rb | 26 ++++----- api/spec/features/checkout_spec.rb | 16 +++--- api/spec/spec_helper.rb | 2 +- .../admin/stock_locations_controller_spec.rb | 2 +- .../features/admin/orders/listing_spec.rb | 4 +- .../admin/payments/store_credits_spec.rb | 4 +- .../features/admin/products/products_spec.rb | 12 ++-- backend/spec/spec_helper.rb | 2 +- common_spree_dependencies.rb | 2 +- core/lib/spree/testing_support/factories.rb | 2 +- .../factories/address_factory.rb | 2 +- .../factories/adjustment_factory.rb | 2 +- .../factories/adjustment_reason_factory.rb | 2 +- .../factories/calculator_factory.rb | 2 +- .../factories/carton_factory.rb | 2 +- .../factories/country_factory.rb | 2 +- .../factories/credit_card_factory.rb | 2 +- .../factories/customer_return_factory.rb | 2 +- .../factories/image_factory.rb | 2 +- .../factories/inventory_unit_factory.rb | 2 +- .../factories/line_item_factory.rb | 2 +- .../factories/option_type_factory.rb | 2 +- .../factories/option_value_factory.rb | 2 +- .../factories/order_factory.rb | 2 +- .../factories/order_promotion_factory.rb | 2 +- .../factories/payment_factory.rb | 2 +- .../factories/payment_method_factory.rb | 2 +- .../factories/price_factory.rb | 2 +- .../factories/product_factory.rb | 2 +- .../factories/product_option_type_factory.rb | 2 +- .../factories/product_property_factory.rb | 2 +- .../factories/promotion_category_factory.rb | 2 +- .../factories/promotion_code_factory.rb | 2 +- .../factories/promotion_factory.rb | 2 +- .../factories/property_factory.rb | 2 +- .../factories/prototype_factory.rb | 2 +- .../factories/refund_factory.rb | 2 +- .../factories/refund_reason_factory.rb | 2 +- .../factories/reimbursement_factory.rb | 2 +- .../factories/reimbursement_type_factory.rb | 2 +- .../factories/return_authorization_factory.rb | 2 +- .../factories/return_item_factory.rb | 2 +- .../factories/return_reason_factory.rb | 2 +- .../testing_support/factories/role_factory.rb | 2 +- .../factories/shipment_factory.rb | 2 +- .../factories/shipping_category_factory.rb | 2 +- .../factories/shipping_method_factory.rb | 4 +- .../factories/shipping_rate_factory.rb | 2 +- .../factories/state_factory.rb | 2 +- .../factories/stock_item_factory.rb | 2 +- .../factories/stock_location_factory.rb | 2 +- .../factories/stock_movement_factory.rb | 2 +- .../factories/stock_package_factory.rb | 2 +- .../factories/stock_packer_factory.rb | 2 +- .../factories/stock_transfer_factory.rb | 2 +- .../store_credit_category_factory.rb | 2 +- .../factories/store_credit_event_factory.rb | 2 +- .../factories/store_credit_factory.rb | 2 +- .../factories/store_credit_type_factory.rb | 2 +- .../store_credit_update_reason_factory.rb | 2 +- .../factories/store_factory.rb | 2 +- .../factories/tax_category_factory.rb | 2 +- .../factories/tax_rate_factory.rb | 2 +- .../factories/taxon_factory.rb | 2 +- .../factories/taxonomy_factory.rb | 2 +- .../factories/tracker_factory.rb | 2 +- .../testing_support/factories/user_factory.rb | 2 +- .../factories/variant_factory.rb | 2 +- ...variant_property_rule_condition_factory.rb | 2 +- .../variant_property_rule_factory.rb | 2 +- .../variant_property_rule_value_factory.rb | 2 +- .../testing_support/factories/zone_factory.rb | 2 +- .../testing_support/order_walkthrough.rb | 18 +++--- core/lib/spree/testing_support/sequences.rb | 4 +- core/spec/lib/search/variant_spec.rb | 8 +-- .../core/controller_helpers/pricing_spec.rb | 10 ++-- .../factories/reimbursement_factory_spec.rb | 2 +- core/spec/mailers/order_mailer_spec.rb | 2 +- core/spec/models/spree/credit_card_spec.rb | 22 ++++---- core/spec/models/spree/order/checkout_spec.rb | 56 +++++++++---------- .../spree/order/risk_assessment_spec.rb | 18 +++--- core/spec/models/spree/order_shipping_spec.rb | 4 +- core/spec/models/spree/order_spec.rb | 12 ++-- .../create_quantity_adjustments_spec.rb | 22 ++++---- core/spec/models/spree/promotion_code_spec.rb | 28 +++++----- .../spree/promotion_handler/coupon_spec.rb | 2 +- core/spec/models/spree/promotion_spec.rb | 28 +++++----- core/spec/models/spree/taxon_spec.rb | 6 +- core/spec/models/spree/variant_spec.rb | 2 +- core/spec/spec_helper.rb | 2 +- core/spec/support/concerns/default_price.rb | 2 +- .../spree/checkout_controller_spec.rb | 20 +++---- .../spree/current_order_tracking_spec.rb | 2 +- .../orders_controller_transitions_spec.rb | 2 +- frontend/spec/features/checkout_spec.rb | 2 +- frontend/spec/features/products_spec.rb | 4 +- .../promotion_code_invalidation_spec.rb | 6 +- .../spec/features/quantity_promotions_spec.rb | 10 ++-- frontend/spec/spec_helper.rb | 2 +- .../shared_contexts/custom_products.rb | 34 +++++------ .../shared_contexts/product_prototypes.rb | 8 +-- sample/spec/spec_helper.rb | 2 +- 103 files changed, 271 insertions(+), 271 deletions(-) diff --git a/api/spec/controllers/spree/api/orders_controller_spec.rb b/api/spec/controllers/spree/api/orders_controller_spec.rb index e32543be082..f17996a39f5 100644 --- a/api/spec/controllers/spree/api/orders_controller_spec.rb +++ b/api/spec/controllers/spree/api/orders_controller_spec.rb @@ -207,7 +207,7 @@ module Spree describe 'GET #show' do let(:order) { create :order_with_line_items } - let(:adjustment) { FactoryGirl.create(:adjustment, adjustable: order, order: order) } + let(:adjustment) { FactoryBot.create(:adjustment, adjustable: order, order: order) } subject { api_get :show, id: order.to_param } @@ -560,7 +560,7 @@ module Spree context "when in delivery" do let!(:shipping_method) do - FactoryGirl.create(:shipping_method).tap do |shipping_method| + FactoryBot.create(:shipping_method).tap do |shipping_method| shipping_method.calculator.preferred_amount = 10 shipping_method.calculator.save end diff --git a/api/spec/controllers/spree/api/return_authorizations_controller_spec.rb b/api/spec/controllers/spree/api/return_authorizations_controller_spec.rb index 86c71fad0e0..b0d5d99c557 100644 --- a/api/spec/controllers/spree/api/return_authorizations_controller_spec.rb +++ b/api/spec/controllers/spree/api/return_authorizations_controller_spec.rb @@ -16,8 +16,8 @@ module Spree shared_examples_for 'a return authorization creator' do it "can create a new return authorization" do - stock_location = FactoryGirl.create(:stock_location) - reason = FactoryGirl.create(:return_reason) + stock_location = FactoryBot.create(:stock_location) + reason = FactoryBot.create(:return_reason) rma_params = { stock_location_id: stock_location.id, return_reason_id: reason.id, memo: "Defective" } @@ -76,7 +76,7 @@ module Spree sign_in_as_admin! it "can show return authorization" do - FactoryGirl.create(:return_authorization, order: order) + FactoryBot.create(:return_authorization, order: order) return_authorization = order.return_authorizations.first api_get :show, order_id: order.number, id: return_authorization.id expect(response.status).to eq(200) @@ -85,8 +85,8 @@ module Spree end it "can get a list of return authorizations" do - FactoryGirl.create(:return_authorization, order: order) - FactoryGirl.create(:return_authorization, order: order) + FactoryBot.create(:return_authorization, order: order) + FactoryBot.create(:return_authorization, order: order) api_get :index, { order_id: order.number } expect(response.status).to eq(200) return_authorizations = json_response["return_authorizations"] @@ -95,8 +95,8 @@ module Spree end it 'can control the page size through a parameter' do - FactoryGirl.create(:return_authorization, order: order) - FactoryGirl.create(:return_authorization, order: order) + FactoryBot.create(:return_authorization, order: order) + FactoryBot.create(:return_authorization, order: order) api_get :index, order_id: order.number, per_page: 1 expect(json_response['count']).to eq(1) expect(json_response['current_page']).to eq(1) @@ -104,7 +104,7 @@ module Spree end it 'can query the results through a paramter' do - FactoryGirl.create(:return_authorization, order: order) + FactoryBot.create(:return_authorization, order: order) expected_result = create(:return_authorization, memo: 'damaged') order.return_authorizations << expected_result api_get :index, q: { memo_cont: 'damaged' } @@ -120,7 +120,7 @@ module Spree end it "can update a return authorization on the order" do - FactoryGirl.create(:return_authorization, order: order) + FactoryBot.create(:return_authorization, order: order) return_authorization = order.return_authorizations.first api_put :update, id: return_authorization.id, return_authorization: { memo: "ABC" } expect(response.status).to eq(200) @@ -128,7 +128,7 @@ module Spree end it "can cancel a return authorization on the order" do - FactoryGirl.create(:new_return_authorization, order: order) + FactoryBot.create(:new_return_authorization, order: order) return_authorization = order.return_authorizations.first expect(return_authorization.state).to eq("authorized") api_delete :cancel, id: return_authorization.id @@ -137,7 +137,7 @@ module Spree end it "can delete a return authorization on the order" do - FactoryGirl.create(:return_authorization, order: order) + FactoryBot.create(:return_authorization, order: order) return_authorization = order.return_authorizations.first api_delete :destroy, id: return_authorization.id expect(response.status).to eq(204) @@ -154,7 +154,7 @@ module Spree end it "cannot update a return authorization on the order" do - FactoryGirl.create(:return_authorization, order: order) + FactoryBot.create(:return_authorization, order: order) return_authorization = order.return_authorizations.first api_put :update, id: return_authorization.id, return_authorization: { memo: "ABC" } assert_unauthorized! @@ -162,7 +162,7 @@ module Spree end it "cannot delete a return authorization on the order" do - FactoryGirl.create(:return_authorization, order: order) + FactoryBot.create(:return_authorization, order: order) return_authorization = order.return_authorizations.first api_delete :destroy, id: return_authorization.id assert_unauthorized! diff --git a/api/spec/features/checkout_spec.rb b/api/spec/features/checkout_spec.rb index a9579ddee5c..bb5eaee3f39 100644 --- a/api/spec/features/checkout_spec.rb +++ b/api/spec/features/checkout_spec.rb @@ -3,16 +3,16 @@ module Spree describe 'Api Feature Specs', type: :request do before { Spree::Api::Config[:requires_authentication] = false } - let!(:promotion) { FactoryGirl.create(:promotion, :with_order_adjustment, code: 'foo', weighted_order_adjustment_amount: 10) } + let!(:promotion) { FactoryBot.create(:promotion, :with_order_adjustment, code: 'foo', weighted_order_adjustment_amount: 10) } let(:promotion_code) { promotion.codes.first } - let!(:store) { FactoryGirl.create(:store) } - let(:bill_address) { FactoryGirl.create(:address) } - let(:ship_address) { FactoryGirl.create(:address) } - let(:variant_1) { FactoryGirl.create(:variant, price: 100.00) } - let(:variant_2) { FactoryGirl.create(:variant, price: 200.00) } - let(:payment_method) { FactoryGirl.create(:check_payment_method) } + let!(:store) { FactoryBot.create(:store) } + let(:bill_address) { FactoryBot.create(:address) } + let(:ship_address) { FactoryBot.create(:address) } + let(:variant_1) { FactoryBot.create(:variant, price: 100.00) } + let(:variant_2) { FactoryBot.create(:variant, price: 200.00) } + let(:payment_method) { FactoryBot.create(:check_payment_method) } let!(:shipping_method) do - FactoryGirl.create(:shipping_method).tap do |shipping_method| + FactoryBot.create(:shipping_method).tap do |shipping_method| shipping_method.zones.first.zone_members.create!(zoneable: ship_address.country) shipping_method.calculator.set_preference(:amount, 10.0) end diff --git a/api/spec/spec_helper.rb b/api/spec/spec_helper.rb index f10a54d7ee7..64204657931 100644 --- a/api/spec/spec_helper.rb +++ b/api/spec/spec_helper.rb @@ -49,7 +49,7 @@ c.syntax = :expect end - config.include FactoryGirl::Syntax::Methods + config.include FactoryBot::Syntax::Methods config.include Spree::Api::TestingSupport::Helpers, type: :controller config.extend Spree::Api::TestingSupport::Setup, type: :controller config.include Spree::TestingSupport::Preferences diff --git a/backend/spec/controllers/spree/admin/stock_locations_controller_spec.rb b/backend/spec/controllers/spree/admin/stock_locations_controller_spec.rb index 8737aa2fe5c..70e694a1266 100644 --- a/backend/spec/controllers/spree/admin/stock_locations_controller_spec.rb +++ b/backend/spec/controllers/spree/admin/stock_locations_controller_spec.rb @@ -29,7 +29,7 @@ module Admin context "with a country with the ISO code of 'US' existing" do before do - FactoryGirl.create(:country, iso: 'US') + FactoryBot.create(:country, iso: 'US') end it "can create a new stock location" do diff --git a/backend/spec/features/admin/orders/listing_spec.rb b/backend/spec/features/admin/orders/listing_spec.rb index 71deb1209d8..f8f10f9ddc3 100644 --- a/backend/spec/features/admin/orders/listing_spec.rb +++ b/backend/spec/features/admin/orders/listing_spec.rb @@ -46,11 +46,11 @@ context "searching orders" do context "when there are multiple stores" do - let(:stores) { FactoryGirl.create_pair(:store) } + let(:stores) { FactoryBot.create_pair(:store) } before do stores.each do |store| - FactoryGirl.create(:completed_order_with_totals, number: "R#{store.id}999", store: store) + FactoryBot.create(:completed_order_with_totals, number: "R#{store.id}999", store: store) end end diff --git a/backend/spec/features/admin/payments/store_credits_spec.rb b/backend/spec/features/admin/payments/store_credits_spec.rb index bb51fba8d29..dc1dac39276 100644 --- a/backend/spec/features/admin/payments/store_credits_spec.rb +++ b/backend/spec/features/admin/payments/store_credits_spec.rb @@ -3,9 +3,9 @@ RSpec.describe 'Store credits', type: :feature do stub_authorization! - let(:order) { FactoryGirl.create(:completed_order_with_totals) } + let(:order) { FactoryBot.create(:completed_order_with_totals) } let(:payment) do - FactoryGirl.create( + FactoryBot.create( :store_credit_payment, order: order, amount: 20 diff --git a/backend/spec/features/admin/products/products_spec.rb b/backend/spec/features/admin/products/products_spec.rb index 24b30b0df43..4ef6cd32593 100644 --- a/backend/spec/features/admin/products/products_spec.rb +++ b/backend/spec/features/admin/products/products_spec.rb @@ -10,7 +10,7 @@ end def build_option_type_with_values(name, values) - ot = FactoryGirl.create(:option_type, name: name) + ot = FactoryBot.create(:option_type, name: name) values.each do |val| ot.option_values.create(name: val.downcase, presentation: val) end @@ -111,7 +111,7 @@ def build_option_type_with_values(name, values) context "creating a new product from a prototype" do def build_option_type_with_values(name, values) - ot = FactoryGirl.create(:option_type, name: name) + ot = FactoryBot.create(:option_type, name: name) values.each do |val| ot.option_values.create(name: val.downcase, presentation: val) end @@ -119,14 +119,14 @@ def build_option_type_with_values(name, values) end let(:product_attributes) do - # FactoryGirl.attributes_for is un-deprecated! + # FactoryBot.attributes_for is un-deprecated! # https://github.com/thoughtbot/factory_girl/issues/274#issuecomment-3592054 - FactoryGirl.attributes_for(:simple_product) + FactoryBot.attributes_for(:simple_product) end let(:prototype) do size = build_option_type_with_values("size", %w(Small Medium Large)) - FactoryGirl.create(:prototype, name: "Size", option_types: [size]) + FactoryBot.create(:prototype, name: "Size", option_types: [size]) end let(:option_values_hash) do @@ -298,7 +298,7 @@ def build_option_type_with_values(name, values) let(:prototype) do size = build_option_type_with_values("size", %w(Small Medium Large)) - FactoryGirl.create(:prototype, name: "Size", option_types: [size]) + FactoryBot.create(:prototype, name: "Size", option_types: [size]) end before(:each) do diff --git a/backend/spec/spec_helper.rb b/backend/spec/spec_helper.rb index 4398e652b8e..9e807f9365c 100644 --- a/backend/spec/spec_helper.rb +++ b/backend/spec/spec_helper.rb @@ -102,7 +102,7 @@ end end - config.include FactoryGirl::Syntax::Methods + config.include FactoryBot::Syntax::Methods config.include Spree::TestingSupport::Preferences config.include Spree::TestingSupport::UrlHelpers diff --git a/common_spree_dependencies.rb b/common_spree_dependencies.rb index 44391ac2a99..8bb83c616ba 100644 --- a/common_spree_dependencies.rb +++ b/common_spree_dependencies.rb @@ -23,7 +23,7 @@ gem 'capybara-screenshot' gem 'database_cleaner', '~> 1.3' gem 'email_spec' - gem 'factory_girl_rails', '~> 4.5.0' + gem 'factory_bot' gem 'launchy' gem 'rspec-activemodel-mocks', '~>1.0.2' gem 'rspec-collection_matchers' diff --git a/core/lib/spree/testing_support/factories.rb b/core/lib/spree/testing_support/factories.rb index ed77e610ff3..fb605343cb1 100644 --- a/core/lib/spree/testing_support/factories.rb +++ b/core/lib/spree/testing_support/factories.rb @@ -1,4 +1,4 @@ -require 'factory_girl' +require 'factory_bot' Dir["#{File.dirname(__FILE__)}/factories/**"].each do |f| require File.expand_path(f) diff --git a/core/lib/spree/testing_support/factories/address_factory.rb b/core/lib/spree/testing_support/factories/address_factory.rb index 775b3da6672..f05d2f65ca5 100644 --- a/core/lib/spree/testing_support/factories/address_factory.rb +++ b/core/lib/spree/testing_support/factories/address_factory.rb @@ -2,7 +2,7 @@ require 'spree/testing_support/factories/country_factory' require 'twitter_cldr' -FactoryGirl.define do +FactoryBot.define do factory :address, class: Spree::Address do transient do # There's `Spree::Address#country_iso=`, prohibiting me from using `country_iso` here diff --git a/core/lib/spree/testing_support/factories/adjustment_factory.rb b/core/lib/spree/testing_support/factories/adjustment_factory.rb index 581f1d77f7d..1ca012cd46f 100644 --- a/core/lib/spree/testing_support/factories/adjustment_factory.rb +++ b/core/lib/spree/testing_support/factories/adjustment_factory.rb @@ -4,7 +4,7 @@ require 'spree/testing_support/factories/tax_rate_factory' require 'spree/testing_support/factories/zone_factory' -FactoryGirl.define do +FactoryBot.define do factory :adjustment, class: Spree::Adjustment do order adjustable { order } diff --git a/core/lib/spree/testing_support/factories/adjustment_reason_factory.rb b/core/lib/spree/testing_support/factories/adjustment_reason_factory.rb index c70cf054efc..c05cf7e1919 100644 --- a/core/lib/spree/testing_support/factories/adjustment_reason_factory.rb +++ b/core/lib/spree/testing_support/factories/adjustment_reason_factory.rb @@ -1,4 +1,4 @@ -FactoryGirl.define do +FactoryBot.define do factory :adjustment_reason, class: Spree::AdjustmentReason do sequence(:name) { |n| "Refund for return ##{n}" } sequence(:code) { |n| "Code #{n}" } diff --git a/core/lib/spree/testing_support/factories/calculator_factory.rb b/core/lib/spree/testing_support/factories/calculator_factory.rb index 914bc12ec6e..b3a2aa7bb80 100644 --- a/core/lib/spree/testing_support/factories/calculator_factory.rb +++ b/core/lib/spree/testing_support/factories/calculator_factory.rb @@ -1,4 +1,4 @@ -FactoryGirl.define do +FactoryBot.define do factory :calculator, aliases: [:flat_rate_calculator], class: Spree::Calculator::FlatRate do preferred_amount 10.0 end diff --git a/core/lib/spree/testing_support/factories/carton_factory.rb b/core/lib/spree/testing_support/factories/carton_factory.rb index 94ad3de6a91..991f3fb7a9c 100644 --- a/core/lib/spree/testing_support/factories/carton_factory.rb +++ b/core/lib/spree/testing_support/factories/carton_factory.rb @@ -1,7 +1,7 @@ require 'spree/testing_support/factories/shipment_factory' require 'spree/testing_support/factories/inventory_unit_factory' -FactoryGirl.define do +FactoryBot.define do factory :carton, class: Spree::Carton do address stock_location diff --git a/core/lib/spree/testing_support/factories/country_factory.rb b/core/lib/spree/testing_support/factories/country_factory.rb index 1d2db3092f7..e3fc8b4b4eb 100644 --- a/core/lib/spree/testing_support/factories/country_factory.rb +++ b/core/lib/spree/testing_support/factories/country_factory.rb @@ -1,6 +1,6 @@ require 'carmen' -FactoryGirl.define do +FactoryBot.define do factory :country, class: Spree::Country do iso 'US' diff --git a/core/lib/spree/testing_support/factories/credit_card_factory.rb b/core/lib/spree/testing_support/factories/credit_card_factory.rb index fbf199a7c9c..79af9671ac6 100644 --- a/core/lib/spree/testing_support/factories/credit_card_factory.rb +++ b/core/lib/spree/testing_support/factories/credit_card_factory.rb @@ -1,4 +1,4 @@ -FactoryGirl.define do +FactoryBot.define do factory :credit_card, class: Spree::CreditCard do verification_value 123 month 12 diff --git a/core/lib/spree/testing_support/factories/customer_return_factory.rb b/core/lib/spree/testing_support/factories/customer_return_factory.rb index 16a02ace694..b2c77b3f63b 100644 --- a/core/lib/spree/testing_support/factories/customer_return_factory.rb +++ b/core/lib/spree/testing_support/factories/customer_return_factory.rb @@ -2,7 +2,7 @@ require 'spree/testing_support/factories/order_factory' require 'spree/testing_support/factories/return_item_factory' -FactoryGirl.define do +FactoryBot.define do factory :customer_return, class: Spree::CustomerReturn do association(:stock_location, factory: :stock_location) diff --git a/core/lib/spree/testing_support/factories/image_factory.rb b/core/lib/spree/testing_support/factories/image_factory.rb index 3c7e6dfe1c2..a1b79f7cad6 100644 --- a/core/lib/spree/testing_support/factories/image_factory.rb +++ b/core/lib/spree/testing_support/factories/image_factory.rb @@ -1,4 +1,4 @@ -FactoryGirl.define do +FactoryBot.define do factory :image, class: Spree::Image do attachment { File.new(Spree::Core::Engine.root + 'spec/fixtures/thinking-cat.jpg') } end diff --git a/core/lib/spree/testing_support/factories/inventory_unit_factory.rb b/core/lib/spree/testing_support/factories/inventory_unit_factory.rb index 073f7dd2819..12e203dc27e 100644 --- a/core/lib/spree/testing_support/factories/inventory_unit_factory.rb +++ b/core/lib/spree/testing_support/factories/inventory_unit_factory.rb @@ -3,7 +3,7 @@ require 'spree/testing_support/factories/order_factory' require 'spree/testing_support/factories/shipment_factory' -FactoryGirl.define do +FactoryBot.define do factory :inventory_unit, class: Spree::InventoryUnit do variant order diff --git a/core/lib/spree/testing_support/factories/line_item_factory.rb b/core/lib/spree/testing_support/factories/line_item_factory.rb index 711853a01ad..4bd8c4b1117 100644 --- a/core/lib/spree/testing_support/factories/line_item_factory.rb +++ b/core/lib/spree/testing_support/factories/line_item_factory.rb @@ -1,7 +1,7 @@ require 'spree/testing_support/factories/order_factory' require 'spree/testing_support/factories/product_factory' -FactoryGirl.define do +FactoryBot.define do factory :line_item, class: Spree::LineItem do quantity 1 price { BigDecimal.new('10.00') } diff --git a/core/lib/spree/testing_support/factories/option_type_factory.rb b/core/lib/spree/testing_support/factories/option_type_factory.rb index 09caa639061..8008c6228dd 100644 --- a/core/lib/spree/testing_support/factories/option_type_factory.rb +++ b/core/lib/spree/testing_support/factories/option_type_factory.rb @@ -1,4 +1,4 @@ -FactoryGirl.define do +FactoryBot.define do factory :option_type, class: Spree::OptionType do sequence(:name) { |n| "foo-size-#{n}" } presentation 'Size' diff --git a/core/lib/spree/testing_support/factories/option_value_factory.rb b/core/lib/spree/testing_support/factories/option_value_factory.rb index ee6293d3394..7a13c6273ba 100644 --- a/core/lib/spree/testing_support/factories/option_value_factory.rb +++ b/core/lib/spree/testing_support/factories/option_value_factory.rb @@ -1,4 +1,4 @@ -FactoryGirl.define do +FactoryBot.define do factory :option_value, class: Spree::OptionValue do sequence(:name) { |n| "Size-#{n}" } diff --git a/core/lib/spree/testing_support/factories/order_factory.rb b/core/lib/spree/testing_support/factories/order_factory.rb index 722b31be90e..6c549645e38 100644 --- a/core/lib/spree/testing_support/factories/order_factory.rb +++ b/core/lib/spree/testing_support/factories/order_factory.rb @@ -5,7 +5,7 @@ require 'spree/testing_support/factories/line_item_factory' require 'spree/testing_support/factories/payment_factory' -FactoryGirl.define do +FactoryBot.define do factory :order, class: Spree::Order do user bill_address diff --git a/core/lib/spree/testing_support/factories/order_promotion_factory.rb b/core/lib/spree/testing_support/factories/order_promotion_factory.rb index 1873cdddf0b..8c950e43fc6 100644 --- a/core/lib/spree/testing_support/factories/order_promotion_factory.rb +++ b/core/lib/spree/testing_support/factories/order_promotion_factory.rb @@ -1,7 +1,7 @@ require 'spree/testing_support/factories/order_factory' require 'spree/testing_support/factories/promotion_factory' -FactoryGirl.define do +FactoryBot.define do factory :order_promotion, class: Spree::OrderPromotion do association :order association :promotion diff --git a/core/lib/spree/testing_support/factories/payment_factory.rb b/core/lib/spree/testing_support/factories/payment_factory.rb index aa8d0eba741..3bf341ac210 100644 --- a/core/lib/spree/testing_support/factories/payment_factory.rb +++ b/core/lib/spree/testing_support/factories/payment_factory.rb @@ -3,7 +3,7 @@ require 'spree/testing_support/factories/order_factory' require 'spree/testing_support/factories/store_credit_factory' -FactoryGirl.define do +FactoryBot.define do factory :payment, aliases: [:credit_card_payment], class: Spree::Payment do association(:payment_method, factory: :credit_card_payment_method) source { create(:credit_card, user: order.user) } diff --git a/core/lib/spree/testing_support/factories/payment_method_factory.rb b/core/lib/spree/testing_support/factories/payment_method_factory.rb index 4ca4fe860b0..e35b4379ed7 100644 --- a/core/lib/spree/testing_support/factories/payment_method_factory.rb +++ b/core/lib/spree/testing_support/factories/payment_method_factory.rb @@ -1,4 +1,4 @@ -FactoryGirl.define do +FactoryBot.define do factory :payment_method, aliases: [:credit_card_payment_method], class: Spree::Gateway::Bogus do name 'Credit Card' end diff --git a/core/lib/spree/testing_support/factories/price_factory.rb b/core/lib/spree/testing_support/factories/price_factory.rb index 2630a2768ba..f99cd7ccc15 100644 --- a/core/lib/spree/testing_support/factories/price_factory.rb +++ b/core/lib/spree/testing_support/factories/price_factory.rb @@ -1,6 +1,6 @@ require 'spree/testing_support/factories/variant_factory' -FactoryGirl.define do +FactoryBot.define do factory :price, class: Spree::Price do variant amount 19.99 diff --git a/core/lib/spree/testing_support/factories/product_factory.rb b/core/lib/spree/testing_support/factories/product_factory.rb index 27aab7f240f..dc89ce2ab5d 100644 --- a/core/lib/spree/testing_support/factories/product_factory.rb +++ b/core/lib/spree/testing_support/factories/product_factory.rb @@ -4,7 +4,7 @@ require 'spree/testing_support/factories/tax_category_factory' require 'spree/testing_support/factories/product_option_type_factory' -FactoryGirl.define do +FactoryBot.define do factory :base_product, class: Spree::Product do sequence(:name) { |n| "Product ##{n} - #{Kernel.rand(9999)}" } description "As seen on TV!" diff --git a/core/lib/spree/testing_support/factories/product_option_type_factory.rb b/core/lib/spree/testing_support/factories/product_option_type_factory.rb index 96e73065905..78b0614971d 100644 --- a/core/lib/spree/testing_support/factories/product_option_type_factory.rb +++ b/core/lib/spree/testing_support/factories/product_option_type_factory.rb @@ -1,7 +1,7 @@ require 'spree/testing_support/factories/product_factory' require 'spree/testing_support/factories/option_type_factory' -FactoryGirl.define do +FactoryBot.define do factory :product_option_type, class: Spree::ProductOptionType do product option_type diff --git a/core/lib/spree/testing_support/factories/product_property_factory.rb b/core/lib/spree/testing_support/factories/product_property_factory.rb index 0465c89c374..09b2bb90111 100644 --- a/core/lib/spree/testing_support/factories/product_property_factory.rb +++ b/core/lib/spree/testing_support/factories/product_property_factory.rb @@ -1,7 +1,7 @@ require 'spree/testing_support/factories/product_factory' require 'spree/testing_support/factories/property_factory' -FactoryGirl.define do +FactoryBot.define do factory :product_property, class: Spree::ProductProperty do product property diff --git a/core/lib/spree/testing_support/factories/promotion_category_factory.rb b/core/lib/spree/testing_support/factories/promotion_category_factory.rb index 3c55dbb9f8a..e7e4ef8bdf8 100644 --- a/core/lib/spree/testing_support/factories/promotion_category_factory.rb +++ b/core/lib/spree/testing_support/factories/promotion_category_factory.rb @@ -1,4 +1,4 @@ -FactoryGirl.define do +FactoryBot.define do factory :promotion_category, class: Spree::PromotionCategory do name 'Promotion Category' end diff --git a/core/lib/spree/testing_support/factories/promotion_code_factory.rb b/core/lib/spree/testing_support/factories/promotion_code_factory.rb index 89aff874fd6..5dff8b6adb8 100644 --- a/core/lib/spree/testing_support/factories/promotion_code_factory.rb +++ b/core/lib/spree/testing_support/factories/promotion_code_factory.rb @@ -1,7 +1,7 @@ require 'spree/testing_support/sequences' require 'spree/testing_support/factories/promotion_factory' -FactoryGirl.define do +FactoryBot.define do factory :promotion_code, class: 'Spree::PromotionCode' do promotion value { generate(:random_code) } diff --git a/core/lib/spree/testing_support/factories/promotion_factory.rb b/core/lib/spree/testing_support/factories/promotion_factory.rb index 62d6ce191eb..10cb3dcd1c5 100644 --- a/core/lib/spree/testing_support/factories/promotion_factory.rb +++ b/core/lib/spree/testing_support/factories/promotion_factory.rb @@ -1,7 +1,7 @@ require 'spree/testing_support/factories/promotion_code_factory' require 'spree/testing_support/factories/variant_factory' -FactoryGirl.define do +FactoryBot.define do factory :promotion, class: Spree::Promotion do name 'Promo' diff --git a/core/lib/spree/testing_support/factories/property_factory.rb b/core/lib/spree/testing_support/factories/property_factory.rb index 793f3d5f67c..552c6f97389 100644 --- a/core/lib/spree/testing_support/factories/property_factory.rb +++ b/core/lib/spree/testing_support/factories/property_factory.rb @@ -1,4 +1,4 @@ -FactoryGirl.define do +FactoryBot.define do factory :property, class: Spree::Property do name 'baseball_cap_color' presentation 'cap color' diff --git a/core/lib/spree/testing_support/factories/prototype_factory.rb b/core/lib/spree/testing_support/factories/prototype_factory.rb index 528c1ee4330..146db1704f9 100644 --- a/core/lib/spree/testing_support/factories/prototype_factory.rb +++ b/core/lib/spree/testing_support/factories/prototype_factory.rb @@ -1,6 +1,6 @@ require 'spree/testing_support/factories/property_factory' -FactoryGirl.define do +FactoryBot.define do factory :prototype, class: Spree::Prototype do name 'Baseball Cap' properties { [create(:property)] } diff --git a/core/lib/spree/testing_support/factories/refund_factory.rb b/core/lib/spree/testing_support/factories/refund_factory.rb index 36058784c1f..60f20c91769 100644 --- a/core/lib/spree/testing_support/factories/refund_factory.rb +++ b/core/lib/spree/testing_support/factories/refund_factory.rb @@ -1,7 +1,7 @@ require 'spree/testing_support/factories/payment_factory' require 'spree/testing_support/factories/refund_reason_factory' -FactoryGirl.define do +FactoryBot.define do sequence(:refund_transaction_id) { |n| "fake-refund-transaction-#{n}" } factory :refund, class: Spree::Refund do diff --git a/core/lib/spree/testing_support/factories/refund_reason_factory.rb b/core/lib/spree/testing_support/factories/refund_reason_factory.rb index 89ee1e03db3..fe00c3449d2 100644 --- a/core/lib/spree/testing_support/factories/refund_reason_factory.rb +++ b/core/lib/spree/testing_support/factories/refund_reason_factory.rb @@ -1,4 +1,4 @@ -FactoryGirl.define do +FactoryBot.define do factory :refund_reason, class: Spree::RefundReason do sequence(:name) { |n| "Refund for return ##{n}" } end diff --git a/core/lib/spree/testing_support/factories/reimbursement_factory.rb b/core/lib/spree/testing_support/factories/reimbursement_factory.rb index 3beb772641d..b1f7acc7b69 100644 --- a/core/lib/spree/testing_support/factories/reimbursement_factory.rb +++ b/core/lib/spree/testing_support/factories/reimbursement_factory.rb @@ -1,6 +1,6 @@ require 'spree/testing_support/factories/customer_return_factory' -FactoryGirl.define do +FactoryBot.define do factory :reimbursement, class: Spree::Reimbursement do transient do return_items_count 1 diff --git a/core/lib/spree/testing_support/factories/reimbursement_type_factory.rb b/core/lib/spree/testing_support/factories/reimbursement_type_factory.rb index 74495bbfb59..70a329b5ba5 100644 --- a/core/lib/spree/testing_support/factories/reimbursement_type_factory.rb +++ b/core/lib/spree/testing_support/factories/reimbursement_type_factory.rb @@ -1,4 +1,4 @@ -FactoryGirl.define do +FactoryBot.define do factory :reimbursement_type, class: Spree::ReimbursementType do sequence(:name) { |n| "Reimbursement Type #{n}" } active true diff --git a/core/lib/spree/testing_support/factories/return_authorization_factory.rb b/core/lib/spree/testing_support/factories/return_authorization_factory.rb index 2858aa00cb1..9592ee9253f 100644 --- a/core/lib/spree/testing_support/factories/return_authorization_factory.rb +++ b/core/lib/spree/testing_support/factories/return_authorization_factory.rb @@ -2,7 +2,7 @@ require 'spree/testing_support/factories/stock_location_factory' require 'spree/testing_support/factories/return_reason_factory' -FactoryGirl.define do +FactoryBot.define do factory :return_authorization, class: Spree::ReturnAuthorization do association(:order, factory: :shipped_order) association(:stock_location, factory: :stock_location) diff --git a/core/lib/spree/testing_support/factories/return_item_factory.rb b/core/lib/spree/testing_support/factories/return_item_factory.rb index 63658408ddf..979f2ad5403 100644 --- a/core/lib/spree/testing_support/factories/return_item_factory.rb +++ b/core/lib/spree/testing_support/factories/return_item_factory.rb @@ -2,7 +2,7 @@ require 'spree/testing_support/factories/return_reason_factory' require 'spree/testing_support/factories/return_authorization_factory' -FactoryGirl.define do +FactoryBot.define do factory :return_item, class: Spree::ReturnItem do association(:inventory_unit, factory: :inventory_unit, state: :shipped) association(:return_reason, factory: :return_reason) diff --git a/core/lib/spree/testing_support/factories/return_reason_factory.rb b/core/lib/spree/testing_support/factories/return_reason_factory.rb index ed6c0b1dfd3..22194aea81f 100644 --- a/core/lib/spree/testing_support/factories/return_reason_factory.rb +++ b/core/lib/spree/testing_support/factories/return_reason_factory.rb @@ -1,4 +1,4 @@ -FactoryGirl.define do +FactoryBot.define do factory :return_reason, class: Spree::ReturnReason do sequence(:name) { |n| "Defect ##{n}" } end diff --git a/core/lib/spree/testing_support/factories/role_factory.rb b/core/lib/spree/testing_support/factories/role_factory.rb index 4974b645a00..a5c3aad5d04 100644 --- a/core/lib/spree/testing_support/factories/role_factory.rb +++ b/core/lib/spree/testing_support/factories/role_factory.rb @@ -1,4 +1,4 @@ -FactoryGirl.define do +FactoryBot.define do factory :role, class: Spree::Role do sequence(:name) { |n| "Role ##{n}" } diff --git a/core/lib/spree/testing_support/factories/shipment_factory.rb b/core/lib/spree/testing_support/factories/shipment_factory.rb index 24008addc1a..2c0dc76dcc5 100644 --- a/core/lib/spree/testing_support/factories/shipment_factory.rb +++ b/core/lib/spree/testing_support/factories/shipment_factory.rb @@ -3,7 +3,7 @@ require 'spree/testing_support/factories/shipping_method_factory' require 'spree/testing_support/factories/stock_location_factory' -FactoryGirl.define do +FactoryBot.define do factory :shipment, class: Spree::Shipment do tracking 'U10000' cost 100.00 diff --git a/core/lib/spree/testing_support/factories/shipping_category_factory.rb b/core/lib/spree/testing_support/factories/shipping_category_factory.rb index c3ea75c9f03..beec7a76955 100644 --- a/core/lib/spree/testing_support/factories/shipping_category_factory.rb +++ b/core/lib/spree/testing_support/factories/shipping_category_factory.rb @@ -1,4 +1,4 @@ -FactoryGirl.define do +FactoryBot.define do factory :shipping_category, class: Spree::ShippingCategory do sequence(:name) { |n| "ShippingCategory ##{n}" } end diff --git a/core/lib/spree/testing_support/factories/shipping_method_factory.rb b/core/lib/spree/testing_support/factories/shipping_method_factory.rb index da40ddbdfeb..e48df272cdd 100644 --- a/core/lib/spree/testing_support/factories/shipping_method_factory.rb +++ b/core/lib/spree/testing_support/factories/shipping_method_factory.rb @@ -2,7 +2,7 @@ require 'spree/testing_support/factories/shipping_category_factory' require 'spree/testing_support/factories/zone_factory' -FactoryGirl.define do +FactoryBot.define do factory( :shipping_method, aliases: [ @@ -11,7 +11,7 @@ class: Spree::ShippingMethod ) do zones do - [Spree::Zone.find_by(name: 'GlobalZone') || FactoryGirl.create(:global_zone)] + [Spree::Zone.find_by(name: 'GlobalZone') || FactoryBot.create(:global_zone)] end name 'UPS Ground' diff --git a/core/lib/spree/testing_support/factories/shipping_rate_factory.rb b/core/lib/spree/testing_support/factories/shipping_rate_factory.rb index 7342e17a0f1..9c5ae2a77e1 100644 --- a/core/lib/spree/testing_support/factories/shipping_rate_factory.rb +++ b/core/lib/spree/testing_support/factories/shipping_rate_factory.rb @@ -1,7 +1,7 @@ require 'spree/testing_support/factories/shipping_method_factory' require 'spree/testing_support/factories/shipment_factory' -FactoryGirl.define do +FactoryBot.define do factory :shipping_rate, class: Spree::ShippingRate do shipping_method shipment diff --git a/core/lib/spree/testing_support/factories/state_factory.rb b/core/lib/spree/testing_support/factories/state_factory.rb index aea070f5f61..ae552e5c35e 100644 --- a/core/lib/spree/testing_support/factories/state_factory.rb +++ b/core/lib/spree/testing_support/factories/state_factory.rb @@ -1,6 +1,6 @@ require 'spree/testing_support/factories/country_factory' -FactoryGirl.define do +FactoryBot.define do factory :state, class: Spree::State do transient do country_iso 'US' diff --git a/core/lib/spree/testing_support/factories/stock_item_factory.rb b/core/lib/spree/testing_support/factories/stock_item_factory.rb index 0f7b3f768a5..474bc5b6fe8 100644 --- a/core/lib/spree/testing_support/factories/stock_item_factory.rb +++ b/core/lib/spree/testing_support/factories/stock_item_factory.rb @@ -1,7 +1,7 @@ require 'spree/testing_support/factories/stock_location_factory' require 'spree/testing_support/factories/variant_factory' -FactoryGirl.define do +FactoryBot.define do factory :stock_item, class: Spree::StockItem do backorderable true association :stock_location, factory: :stock_location_without_variant_propagation diff --git a/core/lib/spree/testing_support/factories/stock_location_factory.rb b/core/lib/spree/testing_support/factories/stock_location_factory.rb index 1d9596fcbb5..dcf87ec6776 100644 --- a/core/lib/spree/testing_support/factories/stock_location_factory.rb +++ b/core/lib/spree/testing_support/factories/stock_location_factory.rb @@ -2,7 +2,7 @@ require 'spree/testing_support/factories/state_factory' require 'spree/testing_support/factories/product_factory' -FactoryGirl.define do +FactoryBot.define do factory :stock_location, class: Spree::StockLocation do name 'NY Warehouse' address1 '1600 Pennsylvania Ave NW' diff --git a/core/lib/spree/testing_support/factories/stock_movement_factory.rb b/core/lib/spree/testing_support/factories/stock_movement_factory.rb index ba1f6bf68cf..8379ec630d9 100644 --- a/core/lib/spree/testing_support/factories/stock_movement_factory.rb +++ b/core/lib/spree/testing_support/factories/stock_movement_factory.rb @@ -1,6 +1,6 @@ require 'spree/testing_support/factories/stock_item_factory' -FactoryGirl.define do +FactoryBot.define do factory :stock_movement, class: Spree::StockMovement do quantity 1 action 'sold' diff --git a/core/lib/spree/testing_support/factories/stock_package_factory.rb b/core/lib/spree/testing_support/factories/stock_package_factory.rb index 8e9239ec9e0..68d2c9d9db1 100644 --- a/core/lib/spree/testing_support/factories/stock_package_factory.rb +++ b/core/lib/spree/testing_support/factories/stock_package_factory.rb @@ -1,7 +1,7 @@ require 'spree/testing_support/factories/inventory_unit_factory' require 'spree/testing_support/factories/variant_factory' -FactoryGirl.define do +FactoryBot.define do factory :stock_package, class: Spree::Stock::Package do skip_create diff --git a/core/lib/spree/testing_support/factories/stock_packer_factory.rb b/core/lib/spree/testing_support/factories/stock_packer_factory.rb index 7a977d3790f..55a4a23e239 100644 --- a/core/lib/spree/testing_support/factories/stock_packer_factory.rb +++ b/core/lib/spree/testing_support/factories/stock_packer_factory.rb @@ -1,6 +1,6 @@ require 'spree/testing_support/factories/stock_location_factory' -FactoryGirl.define do +FactoryBot.define do # must use build() factory :stock_packer, class: Spree::Stock::Packer do transient do diff --git a/core/lib/spree/testing_support/factories/stock_transfer_factory.rb b/core/lib/spree/testing_support/factories/stock_transfer_factory.rb index cf7a1f17d16..03649ea3182 100644 --- a/core/lib/spree/testing_support/factories/stock_transfer_factory.rb +++ b/core/lib/spree/testing_support/factories/stock_transfer_factory.rb @@ -1,4 +1,4 @@ -FactoryGirl.define do +FactoryBot.define do factory :stock_transfer, class: Spree::StockTransfer do source_location { Spree::StockLocation.create!(name: "Source Location", code: "SRC", admin_name: "Source") } diff --git a/core/lib/spree/testing_support/factories/store_credit_category_factory.rb b/core/lib/spree/testing_support/factories/store_credit_category_factory.rb index ed358b35315..426820a7d4f 100644 --- a/core/lib/spree/testing_support/factories/store_credit_category_factory.rb +++ b/core/lib/spree/testing_support/factories/store_credit_category_factory.rb @@ -1,4 +1,4 @@ -FactoryGirl.define do +FactoryBot.define do factory :store_credit_category, class: Spree::StoreCreditCategory do name "Exchange" end diff --git a/core/lib/spree/testing_support/factories/store_credit_event_factory.rb b/core/lib/spree/testing_support/factories/store_credit_event_factory.rb index 4cc3dc927ac..9c0cc3efa18 100644 --- a/core/lib/spree/testing_support/factories/store_credit_event_factory.rb +++ b/core/lib/spree/testing_support/factories/store_credit_event_factory.rb @@ -1,7 +1,7 @@ require 'spree/testing_support/factories/store_credit_factory' require 'spree/testing_support/factories/store_credit_update_reason_factory' -FactoryGirl.define do +FactoryBot.define do factory :store_credit_event, class: Spree::StoreCreditEvent do store_credit amount { 100.00 } diff --git a/core/lib/spree/testing_support/factories/store_credit_factory.rb b/core/lib/spree/testing_support/factories/store_credit_factory.rb index bd369181751..937e1dee304 100644 --- a/core/lib/spree/testing_support/factories/store_credit_factory.rb +++ b/core/lib/spree/testing_support/factories/store_credit_factory.rb @@ -2,7 +2,7 @@ require 'spree/testing_support/factories/store_credit_type_factory' require 'spree/testing_support/factories/user_factory' -FactoryGirl.define do +FactoryBot.define do factory :store_credit, class: Spree::StoreCredit do user association :created_by, factory: :user diff --git a/core/lib/spree/testing_support/factories/store_credit_type_factory.rb b/core/lib/spree/testing_support/factories/store_credit_type_factory.rb index b268ff071dd..cb0146dc926 100644 --- a/core/lib/spree/testing_support/factories/store_credit_type_factory.rb +++ b/core/lib/spree/testing_support/factories/store_credit_type_factory.rb @@ -1,4 +1,4 @@ -FactoryGirl.define do +FactoryBot.define do factory :primary_credit_type, class: Spree::StoreCreditType do name Spree::StoreCreditType::DEFAULT_TYPE_NAME priority { "1" } diff --git a/core/lib/spree/testing_support/factories/store_credit_update_reason_factory.rb b/core/lib/spree/testing_support/factories/store_credit_update_reason_factory.rb index a317edd7813..ce586ba155c 100644 --- a/core/lib/spree/testing_support/factories/store_credit_update_reason_factory.rb +++ b/core/lib/spree/testing_support/factories/store_credit_update_reason_factory.rb @@ -1,4 +1,4 @@ -FactoryGirl.define do +FactoryBot.define do factory :store_credit_update_reason, class: Spree::StoreCreditUpdateReason do name "Input error" end diff --git a/core/lib/spree/testing_support/factories/store_factory.rb b/core/lib/spree/testing_support/factories/store_factory.rb index 07d61fdf7ed..b7372bd627e 100644 --- a/core/lib/spree/testing_support/factories/store_factory.rb +++ b/core/lib/spree/testing_support/factories/store_factory.rb @@ -1,4 +1,4 @@ -FactoryGirl.define do +FactoryBot.define do factory :store, class: Spree::Store do sequence(:code) { |i| "spree_#{i}" } sequence(:name) { |i| "Spree Test Store #{i}" } diff --git a/core/lib/spree/testing_support/factories/tax_category_factory.rb b/core/lib/spree/testing_support/factories/tax_category_factory.rb index b6dbed899e1..47393598a26 100644 --- a/core/lib/spree/testing_support/factories/tax_category_factory.rb +++ b/core/lib/spree/testing_support/factories/tax_category_factory.rb @@ -1,6 +1,6 @@ require 'spree/testing_support/sequences' -FactoryGirl.define do +FactoryBot.define do factory :tax_category, class: Spree::TaxCategory do name { "TaxCategory - #{rand(999_999)}" } tax_code { "TaxCode - #{rand(999_999)}" } diff --git a/core/lib/spree/testing_support/factories/tax_rate_factory.rb b/core/lib/spree/testing_support/factories/tax_rate_factory.rb index 89bd53c8f78..435003a6b22 100644 --- a/core/lib/spree/testing_support/factories/tax_rate_factory.rb +++ b/core/lib/spree/testing_support/factories/tax_rate_factory.rb @@ -2,7 +2,7 @@ require 'spree/testing_support/factories/tax_category_factory' require 'spree/testing_support/factories/zone_factory' -FactoryGirl.define do +FactoryBot.define do factory :tax_rate, class: Spree::TaxRate do zone amount 0.1 diff --git a/core/lib/spree/testing_support/factories/taxon_factory.rb b/core/lib/spree/testing_support/factories/taxon_factory.rb index 49be6e3ba60..a938bef8240 100644 --- a/core/lib/spree/testing_support/factories/taxon_factory.rb +++ b/core/lib/spree/testing_support/factories/taxon_factory.rb @@ -1,6 +1,6 @@ require 'spree/testing_support/factories/taxonomy_factory' -FactoryGirl.define do +FactoryBot.define do factory :taxon, class: Spree::Taxon do name 'Ruby on Rails' taxonomy diff --git a/core/lib/spree/testing_support/factories/taxonomy_factory.rb b/core/lib/spree/testing_support/factories/taxonomy_factory.rb index c4e8681d4af..dc4bfe48554 100644 --- a/core/lib/spree/testing_support/factories/taxonomy_factory.rb +++ b/core/lib/spree/testing_support/factories/taxonomy_factory.rb @@ -1,4 +1,4 @@ -FactoryGirl.define do +FactoryBot.define do factory :taxonomy, class: Spree::Taxonomy do name 'Brand' end diff --git a/core/lib/spree/testing_support/factories/tracker_factory.rb b/core/lib/spree/testing_support/factories/tracker_factory.rb index 52f2d0d796c..68580b609dc 100644 --- a/core/lib/spree/testing_support/factories/tracker_factory.rb +++ b/core/lib/spree/testing_support/factories/tracker_factory.rb @@ -1,4 +1,4 @@ -FactoryGirl.define do +FactoryBot.define do factory :tracker, class: Spree::Tracker do analytics_id 'A100' active true diff --git a/core/lib/spree/testing_support/factories/user_factory.rb b/core/lib/spree/testing_support/factories/user_factory.rb index 47655489242..e22b8d58b21 100644 --- a/core/lib/spree/testing_support/factories/user_factory.rb +++ b/core/lib/spree/testing_support/factories/user_factory.rb @@ -2,7 +2,7 @@ require 'spree/testing_support/factories/role_factory' require 'spree/testing_support/factories/address_factory' -FactoryGirl.define do +FactoryBot.define do sequence :user_authentication_token do |n| "xxxx#{Time.current.to_i}#{rand(1000)}#{n}xxxxxxxxxxxxx" end diff --git a/core/lib/spree/testing_support/factories/variant_factory.rb b/core/lib/spree/testing_support/factories/variant_factory.rb index 83f99f37258..7b8fa600933 100644 --- a/core/lib/spree/testing_support/factories/variant_factory.rb +++ b/core/lib/spree/testing_support/factories/variant_factory.rb @@ -3,7 +3,7 @@ require 'spree/testing_support/factories/option_type_factory' require 'spree/testing_support/factories/product_factory' -FactoryGirl.define do +FactoryBot.define do sequence(:random_float) { BigDecimal.new("#{rand(200)}.#{rand(99)}") } factory :base_variant, class: Spree::Variant do diff --git a/core/lib/spree/testing_support/factories/variant_property_rule_condition_factory.rb b/core/lib/spree/testing_support/factories/variant_property_rule_condition_factory.rb index d0e90bb23ec..3c6736debcc 100644 --- a/core/lib/spree/testing_support/factories/variant_property_rule_condition_factory.rb +++ b/core/lib/spree/testing_support/factories/variant_property_rule_condition_factory.rb @@ -1,7 +1,7 @@ require 'spree/testing_support/factories/option_value_factory' require 'spree/testing_support/factories/variant_property_rule_factory' -FactoryGirl.define do +FactoryBot.define do factory :variant_property_rule_condition, class: Spree::VariantPropertyRuleCondition do variant_property_rule option_value diff --git a/core/lib/spree/testing_support/factories/variant_property_rule_factory.rb b/core/lib/spree/testing_support/factories/variant_property_rule_factory.rb index 24d77d1eee9..8c5d0fd22e3 100644 --- a/core/lib/spree/testing_support/factories/variant_property_rule_factory.rb +++ b/core/lib/spree/testing_support/factories/variant_property_rule_factory.rb @@ -2,7 +2,7 @@ require 'spree/testing_support/factories/property_factory' require 'spree/testing_support/factories/option_value_factory' -FactoryGirl.define do +FactoryBot.define do factory :variant_property_rule, class: Spree::VariantPropertyRule do product diff --git a/core/lib/spree/testing_support/factories/variant_property_rule_value_factory.rb b/core/lib/spree/testing_support/factories/variant_property_rule_value_factory.rb index 43fbb39e624..b965506a6df 100644 --- a/core/lib/spree/testing_support/factories/variant_property_rule_value_factory.rb +++ b/core/lib/spree/testing_support/factories/variant_property_rule_value_factory.rb @@ -1,7 +1,7 @@ require 'spree/testing_support/factories/variant_property_rule_factory' require 'spree/testing_support/factories/property_factory' -FactoryGirl.define do +FactoryBot.define do factory :variant_property_rule_value, class: Spree::VariantPropertyRuleValue do variant_property_rule property diff --git a/core/lib/spree/testing_support/factories/zone_factory.rb b/core/lib/spree/testing_support/factories/zone_factory.rb index c840ad52b24..f7599d16ef7 100644 --- a/core/lib/spree/testing_support/factories/zone_factory.rb +++ b/core/lib/spree/testing_support/factories/zone_factory.rb @@ -1,7 +1,7 @@ require 'spree/testing_support/sequences' require 'spree/testing_support/factories/country_factory' -FactoryGirl.define do +FactoryBot.define do factory :global_zone, class: Spree::Zone do name 'GlobalZone' description { generate(:random_string) } diff --git a/core/lib/spree/testing_support/order_walkthrough.rb b/core/lib/spree/testing_support/order_walkthrough.rb index 3a1d35088a3..4f9c1681eab 100644 --- a/core/lib/spree/testing_support/order_walkthrough.rb +++ b/core/lib/spree/testing_support/order_walkthrough.rb @@ -5,14 +5,14 @@ def self.up_to(state) def up_to(state) # Need to create a valid zone too... - @zone = FactoryGirl.create(:zone) - @country = FactoryGirl.create(:country) - @state = FactoryGirl.create(:state, country: @country) + @zone = FactoryBot.create(:zone) + @country = FactoryBot.create(:country) + @state = FactoryBot.create(:state, country: @country) @zone.members << Spree::ZoneMember.create(zoneable: @country) # A shipping method must exist for rates to be displayed on checkout page - FactoryGirl.create(:shipping_method, zones: [@zone]).tap do |sm| + FactoryBot.create(:shipping_method, zones: [@zone]).tap do |sm| sm.calculator.preferred_amount = 10 sm.calculator.preferred_currency = Spree::Config[:currency] sm.calculator.save @@ -20,7 +20,7 @@ def up_to(state) order = Spree::Order.create!( email: "spree@example.com", - store: Spree::Store.first || FactoryGirl.create(:store) + store: Spree::Store.first || FactoryBot.create(:store) ) add_line_item!(order) order.next! @@ -42,13 +42,13 @@ def up_to(state) private def add_line_item!(order) - FactoryGirl.create(:line_item, order: order) + FactoryBot.create(:line_item, order: order) order.reload end def address(order) - order.bill_address = FactoryGirl.create(:address, country: @country, state: @state) - order.ship_address = FactoryGirl.create(:address, country: @country, state: @state) + order.bill_address = FactoryBot.create(:address, country: @country, state: @state) + order.ship_address = FactoryBot.create(:address, country: @country, state: @state) order.next! end @@ -57,7 +57,7 @@ def delivery(order) end def payment(order) - credit_card = FactoryGirl.create(:credit_card) + credit_card = FactoryBot.create(:credit_card) order.payments.create!(payment_method: credit_card.payment_method, amount: order.total, source: credit_card) # TODO: maybe look at some way of making this payment_state change automatic order.payment_state = 'paid' diff --git a/core/lib/spree/testing_support/sequences.rb b/core/lib/spree/testing_support/sequences.rb index d795fec6025..b57bc935086 100644 --- a/core/lib/spree/testing_support/sequences.rb +++ b/core/lib/spree/testing_support/sequences.rb @@ -1,7 +1,7 @@ -require 'factory_girl' +require 'factory_bot' require 'ffaker' -FactoryGirl.define do +FactoryBot.define do sequence(:random_code) { FFaker::Lorem.characters(10) } sequence(:random_description) { FFaker::Lorem.paragraphs(1 + Kernel.rand(5)).join("\n") } sequence(:random_email) { FFaker::Internet.email } diff --git a/core/spec/lib/search/variant_spec.rb b/core/spec/lib/search/variant_spec.rb index 5bcfc87cbf6..7bf8df374ff 100644 --- a/core/spec/lib/search/variant_spec.rb +++ b/core/spec/lib/search/variant_spec.rb @@ -10,8 +10,8 @@ def refute_found(query_string, variant) expect(described_class.new(query_string).results).not_to include variant end - let(:product) { FactoryGirl.create(:product, name: "My Special Product", slug: "my-special-product") } - let!(:variant) { FactoryGirl.create(:variant, product: product, sku: "abc-123") } + let(:product) { FactoryBot.create(:product, name: "My Special Product", slug: "my-special-product") } + let!(:variant) { FactoryBot.create(:variant, product: product, sku: "abc-123") } context "blank string" do it { assert_found(nil, variant) } @@ -103,8 +103,8 @@ def search_terms(word) end end - let!(:numeric_sku_variant) { FactoryGirl.create(:variant, product: product, sku: "123") } - let!(:non_numeric_sku_variant) { FactoryGirl.create(:variant, product: product, sku: "abc") } + let!(:numeric_sku_variant) { FactoryBot.create(:variant, product: product, sku: "123") } + let!(:non_numeric_sku_variant) { FactoryBot.create(:variant, product: product, sku: "abc") } it { expect(NumericSkuSearcher.new('123').results).to include numeric_sku_variant } it { expect(NumericSkuSearcher.new('abc').results).not_to include non_numeric_sku_variant } diff --git a/core/spec/lib/spree/core/controller_helpers/pricing_spec.rb b/core/spec/lib/spree/core/controller_helpers/pricing_spec.rb index abdf18ae10a..3f4724ca79c 100644 --- a/core/spec/lib/spree/core/controller_helpers/pricing_spec.rb +++ b/core/spec/lib/spree/core/controller_helpers/pricing_spec.rb @@ -20,13 +20,13 @@ class FakesController < ApplicationController end context "when the current store default_currency empty" do - let(:store) { FactoryGirl.create :store, default_currency: '' } + let(:store) { FactoryBot.create :store, default_currency: '' } it { Spree::Deprecation.silence { is_expected.to eq('USD') } } end context "when the current store default_currency is a currency" do - let(:store) { FactoryGirl.create :store, default_currency: 'EUR' } + let(:store) { FactoryBot.create :store, default_currency: 'EUR' } it { Spree::Deprecation.silence { is_expected.to eq('EUR') } } end @@ -35,7 +35,7 @@ class FakesController < ApplicationController describe '#current_pricing_options' do subject { controller.current_pricing_options } - let(:store) { FactoryGirl.create(:store, default_currency: nil) } + let(:store) { FactoryBot.create(:store, default_currency: nil) } it { is_expected.to be_a(Spree::Config.pricing_options_class) } @@ -48,13 +48,13 @@ class FakesController < ApplicationController end context "when the current store default_currency empty" do - let(:store) { FactoryGirl.create :store, default_currency: '' } + let(:store) { FactoryBot.create :store, default_currency: '' } it { is_expected.to eq('USD') } end context "when the current store default_currency is a currency" do - let(:store) { FactoryGirl.create :store, default_currency: 'EUR' } + let(:store) { FactoryBot.create :store, default_currency: 'EUR' } it { is_expected.to eq('EUR') } end diff --git a/core/spec/lib/spree/core/testing_support/factories/reimbursement_factory_spec.rb b/core/spec/lib/spree/core/testing_support/factories/reimbursement_factory_spec.rb index 3f9dfcd1c65..bef51de1ccd 100644 --- a/core/spec/lib/spree/core/testing_support/factories/reimbursement_factory_spec.rb +++ b/core/spec/lib/spree/core/testing_support/factories/reimbursement_factory_spec.rb @@ -11,7 +11,7 @@ end describe 'total' do - subject { FactoryGirl.create(:reimbursement).total } + subject { FactoryBot.create(:reimbursement).total } it { is_expected.to be_present } end diff --git a/core/spec/mailers/order_mailer_spec.rb b/core/spec/mailers/order_mailer_spec.rb index 5bed15ac04e..08e3b865509 100644 --- a/core/spec/mailers/order_mailer_spec.rb +++ b/core/spec/mailers/order_mailer_spec.rb @@ -10,7 +10,7 @@ product = stub_model(Spree::Product, name: %{The "BEST" product}) variant = stub_model(Spree::Variant, product: product) price = stub_model(Spree::Price, variant: variant, amount: 5.00) - store = FactoryGirl.build :store, mail_from_address: "store@example.com" + store = FactoryBot.build :store, mail_from_address: "store@example.com" line_item = stub_model(Spree::LineItem, variant: variant, order: order, quantity: 1, price: 4.99) allow(variant).to receive_messages(default_price: price) allow(order).to receive_messages(line_items: [line_item]) diff --git a/core/spec/models/spree/credit_card_spec.rb b/core/spec/models/spree/credit_card_spec.rb index a028b736f97..d1d6608b192 100644 --- a/core/spec/models/spree/credit_card_spec.rb +++ b/core/spec/models/spree/credit_card_spec.rb @@ -304,9 +304,9 @@ def self.payment_states end it 'ensures only one credit card per user is default at a time' do - user = FactoryGirl.create(:user) - first = FactoryGirl.create(:credit_card, user: user, default: true) - second = FactoryGirl.create(:credit_card, user: user, default: true) + user = FactoryBot.create(:user) + first = FactoryBot.create(:credit_card, user: user, default: true) + second = FactoryBot.create(:credit_card, user: user, default: true) expect(first.reload.default).to eq false expect(second.reload.default).to eq true @@ -319,26 +319,26 @@ def self.payment_states end it 'allows default credit cards for different users' do - first = FactoryGirl.create(:credit_card, user: FactoryGirl.create(:user), default: true) - second = FactoryGirl.create(:credit_card, user: FactoryGirl.create(:user), default: true) + first = FactoryBot.create(:credit_card, user: FactoryBot.create(:user), default: true) + second = FactoryBot.create(:credit_card, user: FactoryBot.create(:user), default: true) expect(first.reload.default).to eq true expect(second.reload.default).to eq true end it 'allows this card to save even if the previously default card has expired' do - user = FactoryGirl.create(:user) - first = FactoryGirl.create(:credit_card, user: user, default: true) - second = FactoryGirl.create(:credit_card, user: user, default: false) + user = FactoryBot.create(:user) + first = FactoryBot.create(:credit_card, user: user, default: true) + second = FactoryBot.create(:credit_card, user: user, default: false) first.update_columns(year: DateTime.current.year, month: 1.month.ago.month) second.update_attributes!(default: true) end it 'allows this card to save even if the previously default card has expired' do - user = FactoryGirl.create(:user) - first = FactoryGirl.create(:credit_card, user: user, default: true) - second = FactoryGirl.create(:credit_card, user: user, default: false) + user = FactoryBot.create(:user) + first = FactoryBot.create(:credit_card, user: user, default: true) + second = FactoryBot.create(:credit_card, user: user, default: false) first.update_columns(year: DateTime.current.year, month: 1.month.ago.month) second.update_attributes!(default: true) diff --git a/core/spec/models/spree/order/checkout_spec.rb b/core/spec/models/spree/order/checkout_spec.rb index 824b6175ccf..b4eafcafb5d 100644 --- a/core/spec/models/spree/order/checkout_spec.rb +++ b/core/spec/models/spree/order/checkout_spec.rb @@ -108,7 +108,7 @@ def assert_state_changed(order, from, to) context "with a line item" do before do - order.line_items << FactoryGirl.create(:line_item) + order.line_items << FactoryBot.create(:line_item) end it "transitions to address" do @@ -123,7 +123,7 @@ def assert_state_changed(order, from, to) end context "with default addresses" do - let(:default_address) { FactoryGirl.create(:address) } + let(:default_address) { FactoryBot.create(:address) } shared_examples "it references the user's the default address" do it do @@ -137,7 +137,7 @@ def assert_state_changed(order, from, to) it_behaves_like "it references the user's the default address" do let(:address_kind) { :ship } before do - order.user = FactoryGirl.create(:user) + order.user = FactoryBot.create(:user) order.user.default_address = default_address order.next! order.reload @@ -147,7 +147,7 @@ def assert_state_changed(order, from, to) it_behaves_like "it references the user's the default address" do let(:address_kind) { :bill } before do - order.user = FactoryGirl.create(:user, bill_address: default_address) + order.user = FactoryBot.create(:user, bill_address: default_address) order.next! order.reload end @@ -200,7 +200,7 @@ def assert_state_changed(order, from, to) end it "does not call persist_order_address if there is no address on the order" do - order.user = FactoryGirl.create(:user) + order.user = FactoryBot.create(:user) order.save! expect(order.user).to_not receive(:persist_order_address).with(order) @@ -208,9 +208,9 @@ def assert_state_changed(order, from, to) end it "calls persist_order_address on the order's user" do - order.user = FactoryGirl.create(:user) - order.ship_address = FactoryGirl.create(:address) - order.bill_address = FactoryGirl.create(:address) + order.user = FactoryBot.create(:user) + order.ship_address = FactoryBot.create(:address) + order.bill_address = FactoryBot.create(:address) order.save! expect(order.user).to receive(:persist_order_address).with(order) @@ -218,7 +218,7 @@ def assert_state_changed(order, from, to) end it "does not call persist_order_address on the order's user for a temporary address" do - order.user = FactoryGirl.create(:user) + order.user = FactoryBot.create(:user) order.temporary_address = true order.save! @@ -228,7 +228,7 @@ def assert_state_changed(order, from, to) end context "to delivery" do - let(:ship_address) { FactoryGirl.create(:ship_address) } + let(:ship_address) { FactoryBot.create(:ship_address) } before do order.ship_address = ship_address @@ -279,7 +279,7 @@ def assert_state_changed(order, from, to) end context "from delivery" do - let(:ship_address) { FactoryGirl.create(:ship_address) } + let(:ship_address) { FactoryBot.create(:ship_address) } before do order.ship_address = ship_address @@ -319,7 +319,7 @@ def assert_state_changed(order, from, to) context "correctly determining payment required based on shipping information" do let(:shipment) do - FactoryGirl.create(:shipment) + FactoryBot.create(:shipment) end before do @@ -450,11 +450,11 @@ def assert_state_changed(order, from, to) context "out of stock" do before do - order.user = FactoryGirl.create(:user) + order.user = FactoryBot.create(:user) order.email = 'spree@example.org' - order.payments << FactoryGirl.create(:payment) + order.payments << FactoryBot.create(:payment) allow(order).to receive_messages(payment_required?: true) - order.line_items << FactoryGirl.create(:line_item) + order.line_items << FactoryBot.create(:line_item) order.line_items.first.variant.stock_items.each do |si| si.set_count_on_hand(0) si.update_attributes(backorderable: false) @@ -477,12 +477,12 @@ def assert_state_changed(order, from, to) context "no inventory units" do before do - order.user = FactoryGirl.create(:user) + order.user = FactoryBot.create(:user) order.email = 'spree@example.com' - order.payments << FactoryGirl.create(:payment) + order.payments << FactoryBot.create(:payment) allow(order).to receive_messages(payment_required?: true) allow(order).to receive(:ensure_available_shipping_rates) { true } - order.line_items << FactoryGirl.create(:line_item) + order.line_items << FactoryBot.create(:line_item) Spree::OrderUpdater.new(order).update order.save! @@ -517,7 +517,7 @@ def assert_state_changed(order, from, to) context "exchange order completion" do before do order.email = 'spree@example.org' - order.payments << FactoryGirl.create(:payment) + order.payments << FactoryBot.create(:payment) order.shipments.create! allow(order).to receive_messages(payment_required?: true) allow(order).to receive(:ensure_available_shipping_rates).and_return(true) @@ -525,8 +525,8 @@ def assert_state_changed(order, from, to) context 'when the line items are not available' do before do - order.line_items << FactoryGirl.create(:line_item) - order.store = FactoryGirl.build(:store) + order.line_items << FactoryBot.create(:line_item) + order.store = FactoryBot.build(:store) Spree::OrderUpdater.new(order).update order.save! @@ -556,16 +556,16 @@ def assert_state_changed(order, from, to) context "default credit card" do before do - order.user = FactoryGirl.create(:user) - order.store = FactoryGirl.create(:store) + order.user = FactoryBot.create(:user) + order.store = FactoryBot.create(:store) order.email = 'spree@example.org' - order.payments << FactoryGirl.create(:payment) + order.payments << FactoryBot.create(:payment) # make sure we will actually capture a payment allow(order).to receive_messages(payment_required?: true) allow(order).to receive_messages(ensure_available_shipping_rates: true) allow(order).to receive_messages(validate_line_item_availability: true) - order.line_items << FactoryGirl.create(:line_item) + order.line_items << FactoryBot.create(:line_item) order.create_proposed_shipments Spree::OrderUpdater.new(order).update @@ -587,9 +587,9 @@ def assert_state_changed(order, from, to) context "a payment fails during processing" do before do - order.user = FactoryGirl.create(:user) + order.user = FactoryBot.create(:user) order.email = 'spree@example.org' - payment = FactoryGirl.create(:payment) + payment = FactoryBot.create(:payment) allow(payment).to receive(:process!).and_raise(Spree::Core::GatewayError.new('processing failed')) order.line_items.each { |li| li.inventory_units.create! } order.payments << payment @@ -598,7 +598,7 @@ def assert_state_changed(order, from, to) allow(order).to receive_messages(payment_required?: true) allow(order).to receive_messages(ensure_available_shipping_rates: true) allow(order).to receive_messages(validate_line_item_availability: true) - order.line_items << FactoryGirl.create(:line_item) + order.line_items << FactoryBot.create(:line_item) order.create_proposed_shipments Spree::OrderUpdater.new(order).update end diff --git a/core/spec/models/spree/order/risk_assessment_spec.rb b/core/spec/models/spree/order/risk_assessment_spec.rb index a9f7eeb47de..c5c167114a8 100644 --- a/core/spec/models/spree/order/risk_assessment_spec.rb +++ b/core/spec/models/spree/order/risk_assessment_spec.rb @@ -5,37 +5,37 @@ describe ".is_risky?" do context "Not risky order" do - let(:order) { FactoryGirl.create(:order, payments: [payment]) } + let(:order) { FactoryBot.create(:order, payments: [payment]) } context "with avs_response == D" do - let(:payment) { FactoryGirl.create(:payment, avs_response: "D") } + let(:payment) { FactoryBot.create(:payment, avs_response: "D") } it "is not considered risky" do expect(order.is_risky?).to eq(false) end end context "with avs_response == M" do - let(:payment) { FactoryGirl.create(:payment, avs_response: "M") } + let(:payment) { FactoryBot.create(:payment, avs_response: "M") } it "is not considered risky" do expect(order.is_risky?).to eq(false) end end context "with avs_response == ''" do - let(:payment) { FactoryGirl.create(:payment, avs_response: "") } + let(:payment) { FactoryBot.create(:payment, avs_response: "") } it "is not considered risky" do expect(order.is_risky?).to eq(false) end end context "with cvv_response_code == M" do - let(:payment) { FactoryGirl.create(:payment, cvv_response_code: "M") } + let(:payment) { FactoryBot.create(:payment, cvv_response_code: "M") } it "is not considered risky" do expect(order.is_risky?).to eq(false) end end context "with cvv_response_message == ''" do - let(:payment) { FactoryGirl.create(:payment, cvv_response_message: "") } + let(:payment) { FactoryBot.create(:payment, cvv_response_message: "") } it "is not considered risky" do expect(order.is_risky?).to eq(false) end @@ -44,21 +44,21 @@ context "Risky order" do context "AVS response message" do - let(:order) { FactoryGirl.create(:order, payments: [FactoryGirl.create(:payment, avs_response: "A")]) } + let(:order) { FactoryBot.create(:order, payments: [FactoryBot.create(:payment, avs_response: "A")]) } it "returns true if the order has an avs_response" do expect(order.is_risky?).to eq(true) end end context "CVV response code" do - let(:order) { FactoryGirl.create(:order, payments: [FactoryGirl.create(:payment, cvv_response_code: "N")]) } + let(:order) { FactoryBot.create(:order, payments: [FactoryBot.create(:payment, cvv_response_code: "N")]) } it "returns true if the order has an cvv_response_code" do expect(order.is_risky?).to eq(true) end end context "state == 'failed'" do - let(:order) { FactoryGirl.create(:order, payments: [FactoryGirl.create(:payment, state: 'failed')]) } + let(:order) { FactoryBot.create(:order, payments: [FactoryBot.create(:payment, state: 'failed')]) } it "returns true if the order has state == 'failed'" do expect(order.is_risky?).to eq(true) end diff --git a/core/spec/models/spree/order_shipping_spec.rb b/core/spec/models/spree/order_shipping_spec.rb index 28862223016..8688c124185 100644 --- a/core/spec/models/spree/order_shipping_spec.rb +++ b/core/spec/models/spree/order_shipping_spec.rb @@ -219,9 +219,9 @@ def emails end context "with stale inventory units (regression test)" do - let(:order) { FactoryGirl.create(:order_ready_to_ship, line_items_count: 1) } + let(:order) { FactoryBot.create(:order_ready_to_ship, line_items_count: 1) } let(:shipment) do - FactoryGirl.create( + FactoryBot.create( :shipment, order: order ) diff --git a/core/spec/models/spree/order_spec.rb b/core/spec/models/spree/order_spec.rb index a3d6923ce50..f396fb051d3 100644 --- a/core/spec/models/spree/order_spec.rb +++ b/core/spec/models/spree/order_spec.rb @@ -490,7 +490,7 @@ def merge!(other_order, user = nil) # Regression tests for https://github.com/spree/spree/issues/4072 context "#state_changed" do - let(:order) { FactoryGirl.create(:order) } + let(:order) { FactoryBot.create(:order) } it "logs state changes" do order.update_column(:payment_state, 'balance_due') @@ -543,8 +543,8 @@ def merge!(other_order, user = nil) context "with more than one payment method" do subject { order.available_payment_methods } - let!(:first_method) { FactoryGirl.create(:payment_method, display_on: :both) } - let!(:second_method) { FactoryGirl.create(:payment_method, display_on: :both) } + let!(:first_method) { FactoryBot.create(:payment_method, display_on: :both) } + let!(:second_method) { FactoryBot.create(:payment_method, display_on: :both) } before do second_method.move_to_top @@ -686,10 +686,10 @@ def merge!(other_order, user = nil) end context "#associate_user!" do - let!(:user) { FactoryGirl.create(:user) } + let!(:user) { FactoryBot.create(:user) } it "should associate a user with a persisted order" do - order = FactoryGirl.create(:order_with_line_items, created_by: nil) + order = FactoryBot.create(:order_with_line_items, created_by: nil) order.user = nil order.email = nil order.associate_user!(user) @@ -706,7 +706,7 @@ def merge!(other_order, user = nil) it "should not overwrite the created_by if it already is set" do creator = create(:user) - order = FactoryGirl.create(:order_with_line_items, created_by: creator) + order = FactoryBot.create(:order_with_line_items, created_by: creator) order.user = nil order.email = nil diff --git a/core/spec/models/spree/promotion/actions/create_quantity_adjustments_spec.rb b/core/spec/models/spree/promotion/actions/create_quantity_adjustments_spec.rb index 91f85565772..920c7fd3f45 100644 --- a/core/spec/models/spree/promotion/actions/create_quantity_adjustments_spec.rb +++ b/core/spec/models/spree/promotion/actions/create_quantity_adjustments_spec.rb @@ -4,16 +4,16 @@ module Spree::Promotion::Actions RSpec.describe CreateQuantityAdjustments do let(:action) { CreateQuantityAdjustments.create!(calculator: calculator, promotion: promotion) } - let(:order) { FactoryGirl.create :order } - let(:promotion) { FactoryGirl.create :promotion } + let(:order) { FactoryBot.create :order } + let(:promotion) { FactoryBot.create :promotion } describe "#compute_amount" do subject { action.compute_amount(line_item) } - let!(:item_a) { FactoryGirl.create :line_item, order: order, quantity: quantity, price: 10 } + let!(:item_a) { FactoryBot.create :line_item, order: order, quantity: quantity, price: 10 } context "with a flat rate adjustment" do - let(:calculator) { FactoryGirl.create :flat_rate_calculator, preferred_amount: 5 } + let(:calculator) { FactoryBot.create :flat_rate_calculator, preferred_amount: 5 } context "with a quantity group of 2" do let(:line_item) { item_a } @@ -42,8 +42,8 @@ module Spree::Promotion::Actions context "with a quantity group of 3" do let(:quantity) { 2 } - let!(:item_b) { FactoryGirl.create :line_item, order: order, quantity: 1 } - let!(:item_c) { FactoryGirl.create :line_item, order: order, quantity: 1 } + let!(:item_b) { FactoryBot.create :line_item, order: order, quantity: 1 } + let!(:item_c) { FactoryBot.create :line_item, order: order, quantity: 1 } before { action.preferred_group_size = 3 } context "and 2x item A, 1x item B and 1x item C" do before { action.perform({ order: order, promotion: promotion }) } @@ -67,8 +67,8 @@ module Spree::Promotion::Actions let(:line_item) { item_a } before do action.preferred_group_size = 2 - other_order = FactoryGirl.create :order - FactoryGirl.create :line_item, order: other_order, quantity: 3 + other_order = FactoryBot.create :order + FactoryBot.create :line_item, order: other_order, quantity: 3 action.perform({ order: other_order, promotion: promotion }) end it { is_expected.to eq(-10) } @@ -76,7 +76,7 @@ module Spree::Promotion::Actions end context "with a percentage based adjustment" do - let(:calculator) { FactoryGirl.create :percent_on_item_calculator, preferred_percent: 10 } + let(:calculator) { FactoryBot.create :percent_on_item_calculator, preferred_percent: 10 } context "with a quantity group of 3" do before do @@ -85,7 +85,7 @@ module Spree::Promotion::Actions end context "and 2x item A and 1x item B" do let(:quantity) { 2 } - let!(:item_b) { FactoryGirl.create :line_item, order: order, quantity: 1, price: 10 } + let!(:item_b) { FactoryBot.create :line_item, order: order, quantity: 1, price: 10 } describe "the adjustment for the first item" do let(:line_item) { item_a } it { is_expected.to eq(-2) } @@ -98,7 +98,7 @@ module Spree::Promotion::Actions context "and the items cost different amounts" do let(:quantity) { 3 } - let!(:item_b) { FactoryGirl.create :line_item, order: order, quantity: 1, price: 20 } + let!(:item_b) { FactoryBot.create :line_item, order: order, quantity: 1, price: 20 } describe "the adjustment for the first item" do let(:line_item) { item_a } it { is_expected.to eq(-3) } diff --git a/core/spec/models/spree/promotion_code_spec.rb b/core/spec/models/spree/promotion_code_spec.rb index f4054fe9446..16df5a4f9c5 100644 --- a/core/spec/models/spree/promotion_code_spec.rb +++ b/core/spec/models/spree/promotion_code_spec.rb @@ -28,7 +28,7 @@ let(:usage_limit) { 1 } context "on a different order" do before do - FactoryGirl.create( + FactoryBot.create( :completed_order_with_promotion, promotion: promotion ) @@ -51,7 +51,7 @@ context "with an order-level adjustment" do let(:promotion) do - FactoryGirl.create( + FactoryBot.create( :promotion, :with_order_adjustment, code: "discount", @@ -59,7 +59,7 @@ ) end let(:promotable) do - FactoryGirl.create( + FactoryBot.create( :completed_order_with_promotion, promotion: promotion ) @@ -69,7 +69,7 @@ context "with an item-level adjustment" do let(:promotion) do - FactoryGirl.create( + FactoryBot.create( :promotion, :with_line_item_adjustment, code: "discount", @@ -84,7 +84,7 @@ }) end context "when there are multiple line items" do - let(:order) { FactoryGirl.create(:order_with_line_items, line_items_count: 2) } + let(:order) { FactoryBot.create(:order_with_line_items, line_items_count: 2) } describe "the first item" do let(:promotable) { order.line_items.first } it_behaves_like "it should" @@ -95,7 +95,7 @@ end end context "when there is a single line item" do - let(:order) { FactoryGirl.create(:order_with_line_items) } + let(:order) { FactoryBot.create(:order_with_line_items) } let(:promotable) { order.line_items.first } it_behaves_like "it should" end @@ -104,7 +104,7 @@ describe "#usage_count" do let(:promotion) do - FactoryGirl.create( + FactoryBot.create( :promotion, :with_order_adjustment, code: "discount" @@ -115,13 +115,13 @@ subject { code.usage_count } context "when the code is applied to a non-complete order" do - let(:order) { FactoryGirl.create(:order_with_line_items) } + let(:order) { FactoryBot.create(:order_with_line_items) } before { promotion.activate(order: order, promotion_code: code) } it { is_expected.to eq 0 } end context "when the code is applied to a complete order" do let!(:order) do - FactoryGirl.create( + FactoryBot.create( :completed_order_with_promotion, promotion: promotion ) @@ -138,7 +138,7 @@ describe "completing multiple orders with the same code", slow: true do let(:promotion) do - FactoryGirl.create( + FactoryBot.create( :promotion, :with_order_adjustment, code: "discount", @@ -148,8 +148,8 @@ end let(:code) { promotion.codes.first } let(:order) do - FactoryGirl.create(:order_with_line_items, line_items_price: 40, shipment_cost: 0).tap do |order| - FactoryGirl.create(:payment, amount: 30, order: order) + FactoryBot.create(:order_with_line_items, line_items_price: 40, shipment_cost: 0).tap do |order| + FactoryBot.create(:payment, amount: 30, order: order) promotion.activate(order: order, promotion_code: code) end end @@ -157,8 +157,8 @@ before do order.next! until order.confirm? - FactoryGirl.create(:order_with_line_items, line_items_price: 40, shipment_cost: 0).tap do |order| - FactoryGirl.create(:payment, amount: 30, order: order) + FactoryBot.create(:order_with_line_items, line_items_price: 40, shipment_cost: 0).tap do |order| + FactoryBot.create(:payment, amount: 30, order: order) promotion.activate(order: order, promotion_code: code) order.next! until order.confirm? order.complete! diff --git a/core/spec/models/spree/promotion_handler/coupon_spec.rb b/core/spec/models/spree/promotion_handler/coupon_spec.rb index 0cf9db3d019..163255de276 100644 --- a/core/spec/models/spree/promotion_handler/coupon_spec.rb +++ b/core/spec/models/spree/promotion_handler/coupon_spec.rb @@ -230,7 +230,7 @@ def expect_adjustment_creation(adjustable:, promotion:, promotion_code:nil) end context "when the promotion exceeds its usage limit" do - let!(:second_order) { FactoryGirl.create(:completed_order_with_promotion, promotion: promotion) } + let!(:second_order) { FactoryBot.create(:completed_order_with_promotion, promotion: promotion) } before do promotion.update!(usage_limit: 1) diff --git a/core/spec/models/spree/promotion_spec.rb b/core/spec/models/spree/promotion_spec.rb index b156a899cde..6155fe897ed 100644 --- a/core/spec/models/spree/promotion_spec.rb +++ b/core/spec/models/spree/promotion_spec.rb @@ -189,7 +189,7 @@ let(:usage_limit) { 1 } context "on a different order" do before do - FactoryGirl.create( + FactoryBot.create( :completed_order_with_promotion, promotion: promotion ) @@ -210,7 +210,7 @@ context "with an order-level adjustment" do let(:promotion) do - FactoryGirl.create( + FactoryBot.create( :promotion, :with_order_adjustment, code: "discount", @@ -218,7 +218,7 @@ ) end let(:promotable) do - FactoryGirl.create( + FactoryBot.create( :completed_order_with_promotion, promotion: promotion ) @@ -228,7 +228,7 @@ context "with an item-level adjustment" do let(:promotion) do - FactoryGirl.create( + FactoryBot.create( :promotion, :with_line_item_adjustment, code: "discount", @@ -243,7 +243,7 @@ }) end context "when there are multiple line items" do - let(:order) { FactoryGirl.create(:order_with_line_items, line_items_count: 2) } + let(:order) { FactoryBot.create(:order_with_line_items, line_items_count: 2) } describe "the first item" do let(:promotable) { order.line_items.first } it_behaves_like "it should" @@ -254,7 +254,7 @@ end end context "when there is a single line item" do - let(:order) { FactoryGirl.create(:order_with_line_items) } + let(:order) { FactoryBot.create(:order_with_line_items) } let(:promotable) { order.line_items.first } it_behaves_like "it should" end @@ -263,7 +263,7 @@ describe "#usage_count" do let(:promotion) do - FactoryGirl.create( + FactoryBot.create( :promotion, :with_order_adjustment, code: "discount" @@ -273,13 +273,13 @@ subject { promotion.usage_count } context "when the code is applied to a non-complete order" do - let(:order) { FactoryGirl.create(:order_with_line_items) } + let(:order) { FactoryBot.create(:order_with_line_items) } before { promotion.activate(order: order, promotion_code: promotion.codes.first) } it { is_expected.to eq 0 } end context "when the code is applied to a complete order" do let!(:order) do - FactoryGirl.create( + FactoryBot.create( :completed_order_with_promotion, promotion: promotion ) @@ -444,11 +444,11 @@ end context "when the promotion's usage limit is exceeded" do - let(:order) { FactoryGirl.create(:completed_order_with_promotion, promotion: promotion) } - let(:promotion) { FactoryGirl.create(:promotion, :with_order_adjustment) } + let(:order) { FactoryBot.create(:completed_order_with_promotion, promotion: promotion) } + let(:promotion) { FactoryBot.create(:promotion, :with_order_adjustment) } before do - FactoryGirl.create( + FactoryBot.create( :completed_order_with_promotion, promotion: promotion ) @@ -461,12 +461,12 @@ end context "when the promotion code's usage limit is exceeded" do - let(:order) { FactoryGirl.create(:completed_order_with_promotion, promotion: promotion) } + let(:order) { FactoryBot.create(:completed_order_with_promotion, promotion: promotion) } let(:promotion) { create(:promotion, :with_order_adjustment, code: 'abc123', per_code_usage_limit: 1) } let(:promotion_code) { promotion.codes.first } before do - FactoryGirl.create( + FactoryBot.create( :completed_order_with_promotion, promotion: promotion ) diff --git a/core/spec/models/spree/taxon_spec.rb b/core/spec/models/spree/taxon_spec.rb index 13016288146..132c8ff8a52 100644 --- a/core/spec/models/spree/taxon_spec.rb +++ b/core/spec/models/spree/taxon_spec.rb @@ -4,14 +4,14 @@ describe Spree::Taxon, type: :model do describe '#to_param' do - let(:taxon) { FactoryGirl.build(:taxon, name: "Ruby on Rails") } + let(:taxon) { FactoryBot.build(:taxon, name: "Ruby on Rails") } subject { super().to_param } it { is_expected.to eql taxon.permalink } end context "set_permalink" do - let(:taxon) { FactoryGirl.build(:taxon, name: "Ruby on Rails") } + let(:taxon) { FactoryBot.build(:taxon, name: "Ruby on Rails") } it "should set permalink correctly when no parent present" do taxon.set_permalink @@ -25,7 +25,7 @@ end context "with parent taxon" do - let(:parent) { FactoryGirl.build(:taxon, permalink: "brands") } + let(:parent) { FactoryBot.build(:taxon, permalink: "brands") } before { allow(taxon).to receive_messages parent: parent } it "should set permalink correctly when taxon has parent" do diff --git a/core/spec/models/spree/variant_spec.rb b/core/spec/models/spree/variant_spec.rb index 82a66d7c4bc..96cd6dd6a42 100644 --- a/core/spec/models/spree/variant_spec.rb +++ b/core/spec/models/spree/variant_spec.rb @@ -106,7 +106,7 @@ context "product has other variants" do describe "option value accessors" do before { - @multi_variant = FactoryGirl.create :variant, product: variant.product + @multi_variant = FactoryBot.create :variant, product: variant.product variant.product.reload } diff --git a/core/spec/spec_helper.rb b/core/spec/spec_helper.rb index 3f36f69ee26..6b591cd892a 100644 --- a/core/spec/spec_helper.rb +++ b/core/spec/spec_helper.rb @@ -65,7 +65,7 @@ reset_spree_preferences end - config.include FactoryGirl::Syntax::Methods + config.include FactoryBot::Syntax::Methods config.include Spree::TestingSupport::Preferences config.extend WithModel diff --git a/core/spec/support/concerns/default_price.rb b/core/spec/support/concerns/default_price.rb index 9a18916fa48..5989d61398a 100644 --- a/core/spec/support/concerns/default_price.rb +++ b/core/spec/support/concerns/default_price.rb @@ -1,6 +1,6 @@ shared_examples_for "default_price" do let(:model) { described_class } - subject(:instance) { FactoryGirl.build(model.name.demodulize.downcase.to_sym) } + subject(:instance) { FactoryBot.build(model.name.demodulize.downcase.to_sym) } describe '.has_one :default_price' do let(:default_price_association) { model.reflect_on_association(:default_price) } diff --git a/frontend/spec/controllers/spree/checkout_controller_spec.rb b/frontend/spec/controllers/spree/checkout_controller_spec.rb index 47c70b1c82c..e5828c3cea1 100644 --- a/frontend/spec/controllers/spree/checkout_controller_spec.rb +++ b/frontend/spec/controllers/spree/checkout_controller_spec.rb @@ -3,10 +3,10 @@ describe Spree::CheckoutController, type: :controller do let(:token) { 'some_token' } let(:user) { stub_model(Spree::LegacyUser) } - let(:order) { FactoryGirl.create(:order_with_totals) } + let(:order) { FactoryBot.create(:order_with_totals) } let(:address_params) do - address = FactoryGirl.build(:address) + address = FactoryBot.build(:address) address.attributes.except("created_at", "updated_at") end @@ -85,7 +85,7 @@ def post_address # Must have *a* shipping method and a payment method so updating from address works allow(order).to receive_messages available_payment_methods: [stub_model(Spree::PaymentMethod)] allow(order).to receive_messages ensure_available_shipping_rates: true - order.line_items << FactoryGirl.create(:line_item) + order.line_items << FactoryBot.create(:line_item) end context "with the order in the cart state" do @@ -299,7 +299,7 @@ def post_address context "fails to transition from address" do let(:order) do - FactoryGirl.create(:order_with_line_items).tap do |order| + FactoryBot.create(:order_with_line_items).tap do |order| order.next! expect(order.state).to eq('address') end @@ -327,7 +327,7 @@ def post_address context "fails to transition to complete from confirm" do let(:order) do - FactoryGirl.create(:order_with_line_items).tap(&:next!) + FactoryBot.create(:order_with_line_items).tap(&:next!) end before do @@ -344,8 +344,8 @@ def post_address address.update_columns(country_id: australia.id, state_name: 'Victoria') end - payment_method = FactoryGirl.create(:simple_credit_card_payment_method) - payment = FactoryGirl.create(:payment, payment_method: payment_method) + payment_method = FactoryBot.create(:simple_credit_card_payment_method) + payment = FactoryBot.create(:payment, payment_method: payment_method) order.payments << payment end @@ -362,13 +362,13 @@ def post_address context "when GatewayError is raised" do let(:order) do - FactoryGirl.create(:order_with_line_items).tap do |order| + FactoryBot.create(:order_with_line_items).tap do |order| until order.state == 'payment' order.next! end # So that the confirmation step is skipped and we get straight to the action. - payment_method = FactoryGirl.create(:simple_credit_card_payment_method) - payment = FactoryGirl.create(:payment, payment_method: payment_method, amount: order.total) + payment_method = FactoryBot.create(:simple_credit_card_payment_method) + payment = FactoryBot.create(:payment, payment_method: payment_method, amount: order.total) order.payments << payment order.next! end diff --git a/frontend/spec/controllers/spree/current_order_tracking_spec.rb b/frontend/spec/controllers/spree/current_order_tracking_spec.rb index 75a6201118e..1a24556de86 100644 --- a/frontend/spec/controllers/spree/current_order_tracking_spec.rb +++ b/frontend/spec/controllers/spree/current_order_tracking_spec.rb @@ -10,7 +10,7 @@ def index end end - let(:order) { FactoryGirl.create(:order) } + let(:order) { FactoryBot.create(:order) } it 'automatically tracks who the order was created by & IP address' do allow(controller).to receive_messages(try_spree_current_user: user) diff --git a/frontend/spec/controllers/spree/orders_controller_transitions_spec.rb b/frontend/spec/controllers/spree/orders_controller_transitions_spec.rb index 1ade18dfb10..77c4d1e2077 100644 --- a/frontend/spec/controllers/spree/orders_controller_transitions_spec.rb +++ b/frontend/spec/controllers/spree/orders_controller_transitions_spec.rb @@ -22,7 +22,7 @@ module Spree it "correctly calls the transition callback" do expect(order.did_transition).to be_nil - order.line_items << FactoryGirl.create(:line_item) + order.line_items << FactoryBot.create(:line_item) put :update, params: { checkout: "checkout" }, session: { order_id: 1 } expect(order.did_transition).to be true end diff --git a/frontend/spec/features/checkout_spec.rb b/frontend/spec/features/checkout_spec.rb index e2338de2102..105783fff67 100644 --- a/frontend/spec/features/checkout_spec.rb +++ b/frontend/spec/features/checkout_spec.rb @@ -230,7 +230,7 @@ # regression for https://github.com/spree/spree/issues/2921 context "goes back from payment to add another item", js: true do - let!(:store) { FactoryGirl.create(:store) } + let!(:store) { FactoryBot.create(:store) } let!(:bag) { create(:product, name: "RoR Bag") } it "transit nicely through checkout steps again" do diff --git a/frontend/spec/features/products_spec.rb b/frontend/spec/features/products_spec.rb index 1e9d080001d..22797d7baf5 100644 --- a/frontend/spec/features/products_spec.rb +++ b/frontend/spec/features/products_spec.rb @@ -241,7 +241,7 @@ end it "should be able to put a product without a description in the cart" do - product = FactoryGirl.create(:base_product, description: nil, name: 'Sample', price: '19.99') + product = FactoryBot.create(:base_product, description: nil, name: 'Sample', price: '19.99') visit spree.product_path(product) expect(page).to have_content "This product has no description" click_button 'add-to-cart-button' @@ -249,7 +249,7 @@ end it "shouldn't be able to put a product without a current price in the cart" do - product = FactoryGirl.create(:base_product, description: nil, name: 'Sample', price: '19.99') + product = FactoryBot.create(:base_product, description: nil, name: 'Sample', price: '19.99') Spree::Config.currency = "CAN" Spree::Config.show_products_without_price = true visit spree.product_path(product) diff --git a/frontend/spec/features/promotion_code_invalidation_spec.rb b/frontend/spec/features/promotion_code_invalidation_spec.rb index 70874dc024a..0a3f8306cb2 100644 --- a/frontend/spec/features/promotion_code_invalidation_spec.rb +++ b/frontend/spec/features/promotion_code_invalidation_spec.rb @@ -2,7 +2,7 @@ RSpec.feature "Promotion Code Invalidation" do given!(:promotion) do - FactoryGirl.create( + FactoryBot.create( :promotion_with_item_adjustment, code: "PROMO", per_code_usage_limit: 1, @@ -12,8 +12,8 @@ background do create(:store) - FactoryGirl.create(:product, name: "DL-44") - FactoryGirl.create(:product, name: "E-11") + FactoryBot.create(:product, name: "DL-44") + FactoryBot.create(:product, name: "E-11") visit spree.root_path click_link "DL-44" diff --git a/frontend/spec/features/quantity_promotions_spec.rb b/frontend/spec/features/quantity_promotions_spec.rb index e1fb7e9d74c..f63e91f5504 100644 --- a/frontend/spec/features/quantity_promotions_spec.rb +++ b/frontend/spec/features/quantity_promotions_spec.rb @@ -8,13 +8,13 @@ ) end - given(:promotion) { FactoryGirl.create(:promotion, code: "PROMO") } - given(:calculator) { FactoryGirl.create(:calculator, preferred_amount: 5) } + given(:promotion) { FactoryBot.create(:promotion, code: "PROMO") } + given(:calculator) { FactoryBot.create(:calculator, preferred_amount: 5) } background do create(:store) - FactoryGirl.create(:product, name: "DL-44") - FactoryGirl.create(:product, name: "E-11") + FactoryBot.create(:product, name: "DL-44") + FactoryBot.create(:product, name: "E-11") promotion.actions << action visit spree.root_path @@ -95,7 +95,7 @@ ) end - background { FactoryGirl.create(:product, name: "DC-15A") } + background { FactoryBot.create(:product, name: "DC-15A") } scenario "odd number of changes to quantities" do fill_in "order_line_items_attributes_0_quantity", with: 3 diff --git a/frontend/spec/spec_helper.rb b/frontend/spec/spec_helper.rb index 16387d194a0..ccdc5305599 100644 --- a/frontend/spec/spec_helper.rb +++ b/frontend/spec/spec_helper.rb @@ -111,7 +111,7 @@ end end - config.include FactoryGirl::Syntax::Methods + config.include FactoryBot::Syntax::Methods config.include Spree::TestingSupport::Preferences config.include Spree::TestingSupport::UrlHelpers diff --git a/frontend/spec/support/shared_contexts/custom_products.rb b/frontend/spec/support/shared_contexts/custom_products.rb index 4e5e26fbb5c..3a3c8c512c4 100644 --- a/frontend/spec/support/shared_contexts/custom_products.rb +++ b/frontend/spec/support/shared_contexts/custom_products.rb @@ -1,26 +1,26 @@ shared_context "custom products" do before(:each) do create(:store) - taxonomy = FactoryGirl.create(:taxonomy, name: 'Categories') + taxonomy = FactoryBot.create(:taxonomy, name: 'Categories') root = taxonomy.root - clothing_taxon = FactoryGirl.create(:taxon, name: 'Clothing', parent_id: root.id) - bags_taxon = FactoryGirl.create(:taxon, name: 'Bags', parent_id: root.id) - mugs_taxon = FactoryGirl.create(:taxon, name: 'Mugs', parent_id: root.id) + clothing_taxon = FactoryBot.create(:taxon, name: 'Clothing', parent_id: root.id) + bags_taxon = FactoryBot.create(:taxon, name: 'Bags', parent_id: root.id) + mugs_taxon = FactoryBot.create(:taxon, name: 'Mugs', parent_id: root.id) - taxonomy = FactoryGirl.create(:taxonomy, name: 'Brands') + taxonomy = FactoryBot.create(:taxonomy, name: 'Brands') root = taxonomy.root - apache_taxon = FactoryGirl.create(:taxon, name: 'Apache', parent_id: root.id) - rails_taxon = FactoryGirl.create(:taxon, name: 'Ruby on Rails', parent_id: root.id) - ruby_taxon = FactoryGirl.create(:taxon, name: 'Ruby', parent_id: root.id) + apache_taxon = FactoryBot.create(:taxon, name: 'Apache', parent_id: root.id) + rails_taxon = FactoryBot.create(:taxon, name: 'Ruby on Rails', parent_id: root.id) + ruby_taxon = FactoryBot.create(:taxon, name: 'Ruby', parent_id: root.id) - FactoryGirl.create(:custom_product, name: 'Ruby on Rails Ringer T-Shirt', price: '19.99', taxons: [rails_taxon, clothing_taxon]) - FactoryGirl.create(:custom_product, name: 'Ruby on Rails Mug', price: '15.99', taxons: [rails_taxon, mugs_taxon]) - FactoryGirl.create(:custom_product, name: 'Ruby on Rails Tote', price: '15.99', taxons: [rails_taxon, bags_taxon]) - FactoryGirl.create(:custom_product, name: 'Ruby on Rails Bag', price: '22.99', taxons: [rails_taxon, bags_taxon]) - FactoryGirl.create(:custom_product, name: 'Ruby on Rails Baseball Jersey', price: '19.99', taxons: [rails_taxon, clothing_taxon]) - FactoryGirl.create(:custom_product, name: 'Ruby on Rails Stein', price: '16.99', taxons: [rails_taxon, mugs_taxon]) - FactoryGirl.create(:custom_product, name: 'Ruby on Rails Jr. Spaghetti', price: '19.99', taxons: [rails_taxon, clothing_taxon]) - FactoryGirl.create(:custom_product, name: 'Ruby Baseball Jersey', price: '19.99', taxons: [ruby_taxon, clothing_taxon]) - FactoryGirl.create(:custom_product, name: 'Apache Baseball Jersey', price: '19.99', taxons: [apache_taxon, clothing_taxon]) + FactoryBot.create(:custom_product, name: 'Ruby on Rails Ringer T-Shirt', price: '19.99', taxons: [rails_taxon, clothing_taxon]) + FactoryBot.create(:custom_product, name: 'Ruby on Rails Mug', price: '15.99', taxons: [rails_taxon, mugs_taxon]) + FactoryBot.create(:custom_product, name: 'Ruby on Rails Tote', price: '15.99', taxons: [rails_taxon, bags_taxon]) + FactoryBot.create(:custom_product, name: 'Ruby on Rails Bag', price: '22.99', taxons: [rails_taxon, bags_taxon]) + FactoryBot.create(:custom_product, name: 'Ruby on Rails Baseball Jersey', price: '19.99', taxons: [rails_taxon, clothing_taxon]) + FactoryBot.create(:custom_product, name: 'Ruby on Rails Stein', price: '16.99', taxons: [rails_taxon, mugs_taxon]) + FactoryBot.create(:custom_product, name: 'Ruby on Rails Jr. Spaghetti', price: '19.99', taxons: [rails_taxon, clothing_taxon]) + FactoryBot.create(:custom_product, name: 'Ruby Baseball Jersey', price: '19.99', taxons: [ruby_taxon, clothing_taxon]) + FactoryBot.create(:custom_product, name: 'Apache Baseball Jersey', price: '19.99', taxons: [apache_taxon, clothing_taxon]) end end diff --git a/frontend/spec/support/shared_contexts/product_prototypes.rb b/frontend/spec/support/shared_contexts/product_prototypes.rb index 9aefdf4f1dd..0b2364f6179 100644 --- a/frontend/spec/support/shared_contexts/product_prototypes.rb +++ b/frontend/spec/support/shared_contexts/product_prototypes.rb @@ -1,6 +1,6 @@ shared_context "product prototype" do def build_option_type_with_values(name, values) - ot = FactoryGirl.create(:option_type, name: name) + ot = FactoryBot.create(:option_type, name: name) values.each do |val| ot.option_values.create(name: val.downcase, presentation: val) end @@ -8,14 +8,14 @@ def build_option_type_with_values(name, values) end let(:product_attributes) do - # FactoryGirl.attributes_for is un-deprecated! + # FactoryBot.attributes_for is un-deprecated! # https://github.com/thoughtbot/factory_girl/issues/274#issuecomment-3592054 - FactoryGirl.attributes_for(:base_product) + FactoryBot.attributes_for(:base_product) end let(:prototype) do size = build_option_type_with_values("size", %w(Small Medium Large)) - FactoryGirl.create(:prototype, name: "Size", option_types: [size]) + FactoryBot.create(:prototype, name: "Size", option_types: [size]) end let(:option_values_hash) do diff --git a/sample/spec/spec_helper.rb b/sample/spec/spec_helper.rb index 1491699ea22..570276c4aad 100644 --- a/sample/spec/spec_helper.rb +++ b/sample/spec/spec_helper.rb @@ -28,7 +28,7 @@ # instead of true. config.use_transactional_fixtures = true - config.include FactoryGirl::Syntax::Methods + config.include FactoryBot::Syntax::Methods config.fail_fast = ENV['FAIL_FAST'] || false config.example_status_persistence_file_path = "./spec/examples.txt" From 9609e16dc3de6c464305343d37f6a58051c067c8 Mon Sep 17 00:00:00 2001 From: Braden Date: Mon, 20 Aug 2018 16:24:39 -0400 Subject: [PATCH 2/2] Fix Issues With Attribute Defined Statically. Factory Bot 5 will no longer or soon no longer allow developers to define attributes the older way. This removes a heap of deprecation warnings. --- .../factories/address_factory.rb | 24 ++++++++-------- .../factories/adjustment_factory.rb | 10 +++---- .../factories/calculator_factory.rb | 10 +++---- .../factories/country_factory.rb | 2 +- .../factories/credit_card_factory.rb | 10 +++---- .../factories/customer_return_factory.rb | 2 +- .../factories/inventory_unit_factory.rb | 2 +- .../factories/line_item_factory.rb | 4 +-- .../factories/option_type_factory.rb | 2 +- .../factories/option_value_factory.rb | 2 +- .../factories/order_factory.rb | 28 +++++++++---------- .../factories/payment_factory.rb | 10 +++---- .../factories/payment_method_factory.rb | 16 +++++------ .../factories/price_factory.rb | 4 +-- .../factories/product_factory.rb | 12 ++++---- .../factories/promotion_category_factory.rb | 2 +- .../factories/promotion_factory.rb | 10 +++---- .../factories/property_factory.rb | 4 +-- .../factories/prototype_factory.rb | 2 +- .../factories/refund_factory.rb | 4 +-- .../factories/reimbursement_factory.rb | 2 +- .../factories/reimbursement_type_factory.rb | 4 +-- .../factories/return_authorization_factory.rb | 2 +- .../testing_support/factories/role_factory.rb | 2 +- .../factories/shipment_factory.rb | 8 +++--- .../factories/shipping_method_factory.rb | 14 +++++----- .../factories/state_factory.rb | 4 +-- .../factories/stock_item_factory.rb | 2 +- .../factories/stock_location_factory.rb | 16 +++++------ .../factories/stock_movement_factory.rb | 6 ++-- .../factories/stock_packer_factory.rb | 2 +- .../store_credit_category_factory.rb | 2 +- .../factories/store_credit_factory.rb | 4 +-- .../factories/store_credit_type_factory.rb | 2 +- .../store_credit_update_reason_factory.rb | 2 +- .../factories/store_factory.rb | 2 +- .../factories/tax_rate_factory.rb | 2 +- .../factories/taxon_factory.rb | 4 +-- .../factories/taxonomy_factory.rb | 2 +- .../factories/tracker_factory.rb | 4 +-- .../testing_support/factories/user_factory.rb | 2 +- .../factories/variant_factory.rb | 14 +++++----- .../variant_property_rule_factory.rb | 2 +- .../testing_support/factories/zone_factory.rb | 2 +- 44 files changed, 133 insertions(+), 133 deletions(-) diff --git a/core/lib/spree/testing_support/factories/address_factory.rb b/core/lib/spree/testing_support/factories/address_factory.rb index f05d2f65ca5..84696f625ab 100644 --- a/core/lib/spree/testing_support/factories/address_factory.rb +++ b/core/lib/spree/testing_support/factories/address_factory.rb @@ -6,19 +6,19 @@ factory :address, class: Spree::Address do transient do # There's `Spree::Address#country_iso=`, prohibiting me from using `country_iso` here - country_iso_code 'US' - state_code 'AL' + country_iso_code { 'US' } + state_code { 'AL' } end - firstname 'John' - lastname 'Doe' - company 'Company' - address1 '10 Lovely Street' - address2 'Northwest' - city 'Herndon' + firstname { 'John' } + lastname { 'Doe' } + company { 'Company' } + address1 { '10 Lovely Street' } + address2 { 'Northwest' } + city { 'Herndon' } zipcode { TwitterCldr::Shared::PostalCodes.for_territory(country_iso_code).sample.first } - phone '555-555-0199' - alternative_phone '555-555-0199' + phone { '555-555-0199' } + alternative_phone { '555-555-0199' } state do |address| Spree::State.joins(:country).where('spree_countries.iso = (?)', country_iso_code).find_by(abbr: state_code) || @@ -35,10 +35,10 @@ end factory :ship_address, parent: :address do - address1 'A Different Road' + address1 { 'A Different Road' } end factory :bill_address, parent: :address do - address1 'PO Box 1337' + address1 { 'PO Box 1337' } end end diff --git a/core/lib/spree/testing_support/factories/adjustment_factory.rb b/core/lib/spree/testing_support/factories/adjustment_factory.rb index 1ca012cd46f..3b395eb9e15 100644 --- a/core/lib/spree/testing_support/factories/adjustment_factory.rb +++ b/core/lib/spree/testing_support/factories/adjustment_factory.rb @@ -8,10 +8,10 @@ factory :adjustment, class: Spree::Adjustment do order adjustable { order } - amount 100.0 - label 'Shipping' + amount { 100.0 } + label { 'Shipping' } association(:source, factory: :tax_rate) - eligible true + eligible { true } after(:build) do |adjustment| adjustments = adjustment.adjustable.adjustments @@ -23,8 +23,8 @@ factory :tax_adjustment, class: Spree::Adjustment do order { adjustable.order } association(:adjustable, factory: :line_item) - amount 10.0 - label 'VAT 5%' + amount { 10.0 } + label { 'VAT 5%' } after(:create) do |adjustment| # Set correct tax category, so that adjustment amount is not 0 diff --git a/core/lib/spree/testing_support/factories/calculator_factory.rb b/core/lib/spree/testing_support/factories/calculator_factory.rb index b3a2aa7bb80..3b21859b0c4 100644 --- a/core/lib/spree/testing_support/factories/calculator_factory.rb +++ b/core/lib/spree/testing_support/factories/calculator_factory.rb @@ -1,24 +1,24 @@ FactoryBot.define do factory :calculator, aliases: [:flat_rate_calculator], class: Spree::Calculator::FlatRate do - preferred_amount 10.0 + preferred_amount { 10.0 } end factory :no_amount_calculator, class: Spree::Calculator::FlatRate do - preferred_amount 0 + preferred_amount { 0 } end factory :default_tax_calculator, class: Spree::Calculator::DefaultTax do end factory :shipping_calculator, class: Spree::Calculator::Shipping::FlatRate do - preferred_amount 10.0 + preferred_amount { 10.0 } end factory :shipping_no_amount_calculator, class: Spree::Calculator::Shipping::FlatRate do - preferred_amount 0 + preferred_amount { 0 } end factory :percent_on_item_calculator, class: Spree::Calculator::PercentOnLineItem do - preferred_percent 10 + preferred_percent { 10 } end end diff --git a/core/lib/spree/testing_support/factories/country_factory.rb b/core/lib/spree/testing_support/factories/country_factory.rb index e3fc8b4b4eb..4961a968fb2 100644 --- a/core/lib/spree/testing_support/factories/country_factory.rb +++ b/core/lib/spree/testing_support/factories/country_factory.rb @@ -2,7 +2,7 @@ FactoryBot.define do factory :country, class: Spree::Country do - iso 'US' + iso { 'US' } transient do carmen_country { Carmen::Country.coded(iso) || fail("Unknown country iso code: #{iso.inspect}") } diff --git a/core/lib/spree/testing_support/factories/credit_card_factory.rb b/core/lib/spree/testing_support/factories/credit_card_factory.rb index 79af9671ac6..e8d03530707 100644 --- a/core/lib/spree/testing_support/factories/credit_card_factory.rb +++ b/core/lib/spree/testing_support/factories/credit_card_factory.rb @@ -1,15 +1,15 @@ FactoryBot.define do factory :credit_card, class: Spree::CreditCard do - verification_value 123 - month 12 + verification_value { 123 } + month { 12 } year { 1.year.from_now.year } - number '4111111111111111' - name 'Spree Commerce' + number { '4111111111111111' } + name { 'Spree Commerce' } association(:payment_method, factory: :credit_card_payment_method) association(:address) trait :failing do - number "0000000000000000" + number { "0000000000000000" } end end end diff --git a/core/lib/spree/testing_support/factories/customer_return_factory.rb b/core/lib/spree/testing_support/factories/customer_return_factory.rb index b2c77b3f63b..d865dcfc336 100644 --- a/core/lib/spree/testing_support/factories/customer_return_factory.rb +++ b/core/lib/spree/testing_support/factories/customer_return_factory.rb @@ -7,7 +7,7 @@ association(:stock_location, factory: :stock_location) transient do - line_items_count 1 + line_items_count { 1 } return_items_count { line_items_count } shipped_order { create :shipped_order, line_items_count: line_items_count } return_authorization { create :return_authorization, order: shipped_order } diff --git a/core/lib/spree/testing_support/factories/inventory_unit_factory.rb b/core/lib/spree/testing_support/factories/inventory_unit_factory.rb index 12e203dc27e..e1a9cfd640a 100644 --- a/core/lib/spree/testing_support/factories/inventory_unit_factory.rb +++ b/core/lib/spree/testing_support/factories/inventory_unit_factory.rb @@ -8,7 +8,7 @@ variant order line_item { build(:line_item, order: order, variant: variant) } - state 'on_hand' + state { 'on_hand' } shipment { build(:shipment, state: 'pending', order: order) } # return_authorization end diff --git a/core/lib/spree/testing_support/factories/line_item_factory.rb b/core/lib/spree/testing_support/factories/line_item_factory.rb index 4bd8c4b1117..114c40e0f1a 100644 --- a/core/lib/spree/testing_support/factories/line_item_factory.rb +++ b/core/lib/spree/testing_support/factories/line_item_factory.rb @@ -3,11 +3,11 @@ FactoryBot.define do factory :line_item, class: Spree::LineItem do - quantity 1 + quantity { 1 } price { BigDecimal.new('10.00') } order transient do - product nil + product { nil } end variant do (product || create(:product)).master diff --git a/core/lib/spree/testing_support/factories/option_type_factory.rb b/core/lib/spree/testing_support/factories/option_type_factory.rb index 8008c6228dd..bcd7afb6b29 100644 --- a/core/lib/spree/testing_support/factories/option_type_factory.rb +++ b/core/lib/spree/testing_support/factories/option_type_factory.rb @@ -1,6 +1,6 @@ FactoryBot.define do factory :option_type, class: Spree::OptionType do sequence(:name) { |n| "foo-size-#{n}" } - presentation 'Size' + presentation { 'Size' } end end diff --git a/core/lib/spree/testing_support/factories/option_value_factory.rb b/core/lib/spree/testing_support/factories/option_value_factory.rb index 7a13c6273ba..cb273746cc3 100644 --- a/core/lib/spree/testing_support/factories/option_value_factory.rb +++ b/core/lib/spree/testing_support/factories/option_value_factory.rb @@ -2,7 +2,7 @@ factory :option_value, class: Spree::OptionValue do sequence(:name) { |n| "Size-#{n}" } - presentation 'S' + presentation { 'S' } option_type end end diff --git a/core/lib/spree/testing_support/factories/order_factory.rb b/core/lib/spree/testing_support/factories/order_factory.rb index 6c549645e38..9739326fc9d 100644 --- a/core/lib/spree/testing_support/factories/order_factory.rb +++ b/core/lib/spree/testing_support/factories/order_factory.rb @@ -10,12 +10,12 @@ user bill_address ship_address - completed_at nil + completed_at { nil } email { user.try(:email) } store transient do - line_items_price BigDecimal.new(10) + line_items_price { BigDecimal.new(10) } end factory :order_with_totals do @@ -30,10 +30,10 @@ ship_address transient do - line_items_count 1 + line_items_count { 1 } line_items_attributes { [{}] * line_items_count } - shipment_cost 100 - shipping_method nil + shipment_cost { 100 } + shipping_method { nil } stock_location { create(:stock_location) } end @@ -53,11 +53,11 @@ end factory :order_ready_to_complete do - state 'confirm' - payment_state 'checkout' + state { 'confirm' } + payment_state { 'checkout' } transient do - payment_type :credit_card_payment + payment_type { :credit_card_payment } end after(:create) do |order, evaluator| @@ -72,7 +72,7 @@ end factory :completed_order_with_totals do - state 'complete' + state { 'complete' } after(:create) do |order| order.refresh_shipment_rates @@ -86,11 +86,11 @@ end factory :order_ready_to_ship do - payment_state 'paid' - shipment_state 'ready' + payment_state { 'paid' } + shipment_state { 'ready' } transient do - payment_type :credit_card_payment + payment_type { :credit_card_payment } end after(:create) do |order, evaluator| @@ -104,7 +104,7 @@ factory :shipped_order do transient do - with_cartons true + with_cartons { true } end after(:create) do |order, evaluator| order.shipments.each do |shipment| @@ -129,7 +129,7 @@ factory :completed_order_with_promotion, parent: :order_with_line_items, class: "Spree::Order" do transient do - promotion nil + promotion { nil } end after(:create) do |order, evaluator| diff --git a/core/lib/spree/testing_support/factories/payment_factory.rb b/core/lib/spree/testing_support/factories/payment_factory.rb index 3bf341ac210..fb3d8766b8d 100644 --- a/core/lib/spree/testing_support/factories/payment_factory.rb +++ b/core/lib/spree/testing_support/factories/payment_factory.rb @@ -8,22 +8,22 @@ association(:payment_method, factory: :credit_card_payment_method) source { create(:credit_card, user: order.user) } order - state 'checkout' - response_code '12345' + state { 'checkout' } + response_code { '12345' } trait :failing do - response_code '00000' + response_code { '00000' } association(:source, :failing, { factory: :credit_card }) end factory :payment_with_refund do transient do - refund_amount 5 + refund_amount { 5 } end amount { refund_amount } - state 'completed' + state { 'completed' } refunds { build_list :refund, 1, amount: refund_amount } end diff --git a/core/lib/spree/testing_support/factories/payment_method_factory.rb b/core/lib/spree/testing_support/factories/payment_method_factory.rb index e35b4379ed7..cdec2b97fcf 100644 --- a/core/lib/spree/testing_support/factories/payment_method_factory.rb +++ b/core/lib/spree/testing_support/factories/payment_method_factory.rb @@ -1,23 +1,23 @@ FactoryBot.define do factory :payment_method, aliases: [:credit_card_payment_method], class: Spree::Gateway::Bogus do - name 'Credit Card' + name { 'Credit Card' } end factory :check_payment_method, class: Spree::PaymentMethod::Check do - name 'Check' + name { 'Check' } end # authorize.net was moved to spree_gateway. # Leaving this factory in place with bogus in case anyone is using it. factory :simple_credit_card_payment_method, class: Spree::Gateway::BogusSimple do - name 'Credit Card' + name { 'Credit Card' } end factory :store_credit_payment_method, class: Spree::PaymentMethod::StoreCredit do - name "Store Credit" - description "Store Credit" - active true - display_on 'none' - auto_capture true + name { "Store Credit" } + description { "Store Credit" } + active { true } + display_on { 'none' } + auto_capture { true } end end diff --git a/core/lib/spree/testing_support/factories/price_factory.rb b/core/lib/spree/testing_support/factories/price_factory.rb index f99cd7ccc15..c8250884973 100644 --- a/core/lib/spree/testing_support/factories/price_factory.rb +++ b/core/lib/spree/testing_support/factories/price_factory.rb @@ -3,7 +3,7 @@ FactoryBot.define do factory :price, class: Spree::Price do variant - amount 19.99 - currency 'USD' + amount { 19.99 } + currency { 'USD' } end end diff --git a/core/lib/spree/testing_support/factories/product_factory.rb b/core/lib/spree/testing_support/factories/product_factory.rb index dc89ce2ab5d..db7c6f17976 100644 --- a/core/lib/spree/testing_support/factories/product_factory.rb +++ b/core/lib/spree/testing_support/factories/product_factory.rb @@ -7,20 +7,20 @@ FactoryBot.define do factory :base_product, class: Spree::Product do sequence(:name) { |n| "Product ##{n} - #{Kernel.rand(9999)}" } - description "As seen on TV!" - price 19.99 - cost_price 17.00 + description { "As seen on TV!" } + price { 19.99 } + cost_price { 17.00 } sku { generate(:sku) } available_on { 1.year.ago } - deleted_at nil + deleted_at { nil } shipping_category { |r| Spree::ShippingCategory.first || r.association(:shipping_category) } # ensure stock item will be created for this products master before(:create) { create(:stock_location) if Spree::StockLocation.count == 0 } factory :custom_product do - name 'Custom Product' - price 17.99 + name { 'Custom Product' } + price { 17.99 } tax_category { |r| Spree::TaxCategory.first || r.association(:tax_category) } end diff --git a/core/lib/spree/testing_support/factories/promotion_category_factory.rb b/core/lib/spree/testing_support/factories/promotion_category_factory.rb index e7e4ef8bdf8..b8d067d1f12 100644 --- a/core/lib/spree/testing_support/factories/promotion_category_factory.rb +++ b/core/lib/spree/testing_support/factories/promotion_category_factory.rb @@ -1,5 +1,5 @@ FactoryBot.define do factory :promotion_category, class: Spree::PromotionCategory do - name 'Promotion Category' + name { 'Promotion Category' } end end diff --git a/core/lib/spree/testing_support/factories/promotion_factory.rb b/core/lib/spree/testing_support/factories/promotion_factory.rb index 10cb3dcd1c5..92a0d3e39c8 100644 --- a/core/lib/spree/testing_support/factories/promotion_factory.rb +++ b/core/lib/spree/testing_support/factories/promotion_factory.rb @@ -3,10 +3,10 @@ FactoryBot.define do factory :promotion, class: Spree::Promotion do - name 'Promo' + name { 'Promo' } transient do - code nil + code { nil } end before(:create) do |promotion, evaluator| if evaluator.code @@ -16,7 +16,7 @@ trait :with_line_item_adjustment do transient do - adjustment_rate 10 + adjustment_rate { 10 } end after(:create) do |promotion, evaluator| @@ -29,7 +29,7 @@ trait :with_order_adjustment do transient do - weighted_order_adjustment_amount 10 + weighted_order_adjustment_amount { 10 } end after(:create) do |promotion, evaluator| @@ -44,7 +44,7 @@ trait :with_item_total_rule do transient do - item_total_threshold_amount 10 + item_total_threshold_amount { 10 } end after(:create) do |promotion, evaluator| diff --git a/core/lib/spree/testing_support/factories/property_factory.rb b/core/lib/spree/testing_support/factories/property_factory.rb index 552c6f97389..f775c4eb25e 100644 --- a/core/lib/spree/testing_support/factories/property_factory.rb +++ b/core/lib/spree/testing_support/factories/property_factory.rb @@ -1,6 +1,6 @@ FactoryBot.define do factory :property, class: Spree::Property do - name 'baseball_cap_color' - presentation 'cap color' + name { 'baseball_cap_color' } + presentation { 'cap color' } end end diff --git a/core/lib/spree/testing_support/factories/prototype_factory.rb b/core/lib/spree/testing_support/factories/prototype_factory.rb index 146db1704f9..9dd2e9e38b9 100644 --- a/core/lib/spree/testing_support/factories/prototype_factory.rb +++ b/core/lib/spree/testing_support/factories/prototype_factory.rb @@ -2,7 +2,7 @@ FactoryBot.define do factory :prototype, class: Spree::Prototype do - name 'Baseball Cap' + name { 'Baseball Cap' } properties { [create(:property)] } end end diff --git a/core/lib/spree/testing_support/factories/refund_factory.rb b/core/lib/spree/testing_support/factories/refund_factory.rb index 60f20c91769..f076235c71b 100644 --- a/core/lib/spree/testing_support/factories/refund_factory.rb +++ b/core/lib/spree/testing_support/factories/refund_factory.rb @@ -6,10 +6,10 @@ factory :refund, class: Spree::Refund do transient do - payment_amount 100 + payment_amount { 100 } end - amount 100.00 + amount { 100.00 } transaction_id { generate(:refund_transaction_id) } payment do association(:payment, state: 'completed', amount: payment_amount) diff --git a/core/lib/spree/testing_support/factories/reimbursement_factory.rb b/core/lib/spree/testing_support/factories/reimbursement_factory.rb index b1f7acc7b69..fb55e288438 100644 --- a/core/lib/spree/testing_support/factories/reimbursement_factory.rb +++ b/core/lib/spree/testing_support/factories/reimbursement_factory.rb @@ -3,7 +3,7 @@ FactoryBot.define do factory :reimbursement, class: Spree::Reimbursement do transient do - return_items_count 1 + return_items_count { 1 } end customer_return { create(:customer_return_with_accepted_items, line_items_count: return_items_count) } diff --git a/core/lib/spree/testing_support/factories/reimbursement_type_factory.rb b/core/lib/spree/testing_support/factories/reimbursement_type_factory.rb index 70a329b5ba5..5d6f6a888de 100644 --- a/core/lib/spree/testing_support/factories/reimbursement_type_factory.rb +++ b/core/lib/spree/testing_support/factories/reimbursement_type_factory.rb @@ -1,7 +1,7 @@ FactoryBot.define do factory :reimbursement_type, class: Spree::ReimbursementType do sequence(:name) { |n| "Reimbursement Type #{n}" } - active true - mutable true + active { true } + mutable { true } end end diff --git a/core/lib/spree/testing_support/factories/return_authorization_factory.rb b/core/lib/spree/testing_support/factories/return_authorization_factory.rb index 9592ee9253f..3d032986838 100644 --- a/core/lib/spree/testing_support/factories/return_authorization_factory.rb +++ b/core/lib/spree/testing_support/factories/return_authorization_factory.rb @@ -7,7 +7,7 @@ association(:order, factory: :shipped_order) association(:stock_location, factory: :stock_location) association(:reason, factory: :return_reason) - memo 'Items were broken' + memo { 'Items were broken' } end factory :new_return_authorization, class: Spree::ReturnAuthorization do diff --git a/core/lib/spree/testing_support/factories/role_factory.rb b/core/lib/spree/testing_support/factories/role_factory.rb index a5c3aad5d04..0742c5948f1 100644 --- a/core/lib/spree/testing_support/factories/role_factory.rb +++ b/core/lib/spree/testing_support/factories/role_factory.rb @@ -3,7 +3,7 @@ sequence(:name) { |n| "Role ##{n}" } factory :admin_role do - name 'admin' + name { 'admin' } end end end diff --git a/core/lib/spree/testing_support/factories/shipment_factory.rb b/core/lib/spree/testing_support/factories/shipment_factory.rb index 2c0dc76dcc5..a6708664ab5 100644 --- a/core/lib/spree/testing_support/factories/shipment_factory.rb +++ b/core/lib/spree/testing_support/factories/shipment_factory.rb @@ -5,14 +5,14 @@ FactoryBot.define do factory :shipment, class: Spree::Shipment do - tracking 'U10000' - cost 100.00 - state 'pending' + tracking { 'U10000' } + cost { 100.00 } + state { 'pending' } order stock_location transient do - shipping_method nil + shipping_method { nil } end after(:create) do |shipment, evalulator| diff --git a/core/lib/spree/testing_support/factories/shipping_method_factory.rb b/core/lib/spree/testing_support/factories/shipping_method_factory.rb index e48df272cdd..81a2d936678 100644 --- a/core/lib/spree/testing_support/factories/shipping_method_factory.rb +++ b/core/lib/spree/testing_support/factories/shipping_method_factory.rb @@ -14,16 +14,16 @@ [Spree::Zone.find_by(name: 'GlobalZone') || FactoryBot.create(:global_zone)] end - name 'UPS Ground' - code 'UPS_GROUND' - carrier 'UPS' - service_level '1DAYGROUND' + name { 'UPS Ground' } + code { 'UPS_GROUND' } + carrier { 'UPS' } + service_level { '1DAYGROUND' } calculator { |s| s.association(:shipping_calculator, strategy: :build, preferred_amount: s.cost, preferred_currency: s.currency) } transient do - cost 10.0 - currency 'USD' + cost { 10.0 } + currency { 'USD' } end before(:create) do |shipping_method, _evaluator| @@ -33,7 +33,7 @@ end factory :free_shipping_method, class: Spree::ShippingMethod do - cost nil + cost { nil } association(:calculator, factory: :shipping_no_amount_calculator, strategy: :build) end end diff --git a/core/lib/spree/testing_support/factories/state_factory.rb b/core/lib/spree/testing_support/factories/state_factory.rb index ae552e5c35e..2fcda44c6b5 100644 --- a/core/lib/spree/testing_support/factories/state_factory.rb +++ b/core/lib/spree/testing_support/factories/state_factory.rb @@ -3,8 +3,8 @@ FactoryBot.define do factory :state, class: Spree::State do transient do - country_iso 'US' - state_code 'AL' + country_iso { 'US' } + state_code { 'AL' } carmen_subregion do carmen_country = Carmen::Country.coded(country.iso) diff --git a/core/lib/spree/testing_support/factories/stock_item_factory.rb b/core/lib/spree/testing_support/factories/stock_item_factory.rb index 474bc5b6fe8..2a4cc679915 100644 --- a/core/lib/spree/testing_support/factories/stock_item_factory.rb +++ b/core/lib/spree/testing_support/factories/stock_item_factory.rb @@ -3,7 +3,7 @@ FactoryBot.define do factory :stock_item, class: Spree::StockItem do - backorderable true + backorderable { true } association :stock_location, factory: :stock_location_without_variant_propagation variant diff --git a/core/lib/spree/testing_support/factories/stock_location_factory.rb b/core/lib/spree/testing_support/factories/stock_location_factory.rb index dcf87ec6776..40d40bf9a63 100644 --- a/core/lib/spree/testing_support/factories/stock_location_factory.rb +++ b/core/lib/spree/testing_support/factories/stock_location_factory.rb @@ -4,13 +4,13 @@ FactoryBot.define do factory :stock_location, class: Spree::StockLocation do - name 'NY Warehouse' - address1 '1600 Pennsylvania Ave NW' - city 'Washington' - zipcode '20500' - phone '(202) 456-1111' - active true - backorderable_default true + name { 'NY Warehouse' } + address1 { '1600 Pennsylvania Ave NW' } + city { 'Washington' } + zipcode { '20500' } + phone { '(202) 456-1111' } + active { true } + backorderable_default { true } country { |stock_location| Spree::Country.first || stock_location.association(:country) } state do |stock_location| @@ -21,7 +21,7 @@ end factory :stock_location_without_variant_propagation do - propagate_all_variants false + propagate_all_variants { false } end factory :stock_location_with_items do diff --git a/core/lib/spree/testing_support/factories/stock_movement_factory.rb b/core/lib/spree/testing_support/factories/stock_movement_factory.rb index 8379ec630d9..481e3943628 100644 --- a/core/lib/spree/testing_support/factories/stock_movement_factory.rb +++ b/core/lib/spree/testing_support/factories/stock_movement_factory.rb @@ -2,12 +2,12 @@ FactoryBot.define do factory :stock_movement, class: Spree::StockMovement do - quantity 1 - action 'sold' + quantity { 1 } + action { 'sold' } stock_item end trait :received do - action 'received' + action { 'received' } end end diff --git a/core/lib/spree/testing_support/factories/stock_packer_factory.rb b/core/lib/spree/testing_support/factories/stock_packer_factory.rb index 55a4a23e239..756c6efe4b4 100644 --- a/core/lib/spree/testing_support/factories/stock_packer_factory.rb +++ b/core/lib/spree/testing_support/factories/stock_packer_factory.rb @@ -5,7 +5,7 @@ factory :stock_packer, class: Spree::Stock::Packer do transient do stock_location { build(:stock_location) } - contents [] + contents { [] } end initialize_with { new(stock_location, contents) } diff --git a/core/lib/spree/testing_support/factories/store_credit_category_factory.rb b/core/lib/spree/testing_support/factories/store_credit_category_factory.rb index 426820a7d4f..348f91c2f71 100644 --- a/core/lib/spree/testing_support/factories/store_credit_category_factory.rb +++ b/core/lib/spree/testing_support/factories/store_credit_category_factory.rb @@ -1,5 +1,5 @@ FactoryBot.define do factory :store_credit_category, class: Spree::StoreCreditCategory do - name "Exchange" + name { "Exchange" } end end diff --git a/core/lib/spree/testing_support/factories/store_credit_factory.rb b/core/lib/spree/testing_support/factories/store_credit_factory.rb index 937e1dee304..07095548df8 100644 --- a/core/lib/spree/testing_support/factories/store_credit_factory.rb +++ b/core/lib/spree/testing_support/factories/store_credit_factory.rb @@ -7,8 +7,8 @@ user association :created_by, factory: :user association :category, factory: :store_credit_category - amount 150.00 - currency "USD" + amount { 150.00 } + currency { "USD" } association :credit_type, factory: :primary_credit_type end end diff --git a/core/lib/spree/testing_support/factories/store_credit_type_factory.rb b/core/lib/spree/testing_support/factories/store_credit_type_factory.rb index cb0146dc926..de15c421aa9 100644 --- a/core/lib/spree/testing_support/factories/store_credit_type_factory.rb +++ b/core/lib/spree/testing_support/factories/store_credit_type_factory.rb @@ -1,6 +1,6 @@ FactoryBot.define do factory :primary_credit_type, class: Spree::StoreCreditType do - name Spree::StoreCreditType::DEFAULT_TYPE_NAME + name { Spree::StoreCreditType::DEFAULT_TYPE_NAME } priority { "1" } end diff --git a/core/lib/spree/testing_support/factories/store_credit_update_reason_factory.rb b/core/lib/spree/testing_support/factories/store_credit_update_reason_factory.rb index ce586ba155c..0017f979b0d 100644 --- a/core/lib/spree/testing_support/factories/store_credit_update_reason_factory.rb +++ b/core/lib/spree/testing_support/factories/store_credit_update_reason_factory.rb @@ -1,5 +1,5 @@ FactoryBot.define do factory :store_credit_update_reason, class: Spree::StoreCreditUpdateReason do - name "Input error" + name { "Input error" } end end diff --git a/core/lib/spree/testing_support/factories/store_factory.rb b/core/lib/spree/testing_support/factories/store_factory.rb index b7372bd627e..7b8a4443e2f 100644 --- a/core/lib/spree/testing_support/factories/store_factory.rb +++ b/core/lib/spree/testing_support/factories/store_factory.rb @@ -3,6 +3,6 @@ sequence(:code) { |i| "spree_#{i}" } sequence(:name) { |i| "Spree Test Store #{i}" } sequence(:url) { |i| "www.example#{i}.com" } - mail_from_address 'spree@example.org' + mail_from_address { 'spree@example.org' } end end diff --git a/core/lib/spree/testing_support/factories/tax_rate_factory.rb b/core/lib/spree/testing_support/factories/tax_rate_factory.rb index 435003a6b22..47ffbcc8a08 100644 --- a/core/lib/spree/testing_support/factories/tax_rate_factory.rb +++ b/core/lib/spree/testing_support/factories/tax_rate_factory.rb @@ -5,7 +5,7 @@ FactoryBot.define do factory :tax_rate, class: Spree::TaxRate do zone - amount 0.1 + amount { 0.1 } tax_category association(:calculator, factory: :default_tax_calculator) end diff --git a/core/lib/spree/testing_support/factories/taxon_factory.rb b/core/lib/spree/testing_support/factories/taxon_factory.rb index a938bef8240..5d5614be01a 100644 --- a/core/lib/spree/testing_support/factories/taxon_factory.rb +++ b/core/lib/spree/testing_support/factories/taxon_factory.rb @@ -2,8 +2,8 @@ FactoryBot.define do factory :taxon, class: Spree::Taxon do - name 'Ruby on Rails' + name { 'Ruby on Rails' } taxonomy - parent_id nil + parent_id { nil } end end diff --git a/core/lib/spree/testing_support/factories/taxonomy_factory.rb b/core/lib/spree/testing_support/factories/taxonomy_factory.rb index dc4bfe48554..da4b80bcb3f 100644 --- a/core/lib/spree/testing_support/factories/taxonomy_factory.rb +++ b/core/lib/spree/testing_support/factories/taxonomy_factory.rb @@ -1,5 +1,5 @@ FactoryBot.define do factory :taxonomy, class: Spree::Taxonomy do - name 'Brand' + name { 'Brand' } end end diff --git a/core/lib/spree/testing_support/factories/tracker_factory.rb b/core/lib/spree/testing_support/factories/tracker_factory.rb index 68580b609dc..469bc1f8399 100644 --- a/core/lib/spree/testing_support/factories/tracker_factory.rb +++ b/core/lib/spree/testing_support/factories/tracker_factory.rb @@ -1,6 +1,6 @@ FactoryBot.define do factory :tracker, class: Spree::Tracker do - analytics_id 'A100' - active true + analytics_id { 'A100' } + active { true } end end diff --git a/core/lib/spree/testing_support/factories/user_factory.rb b/core/lib/spree/testing_support/factories/user_factory.rb index e22b8d58b21..d81447419da 100644 --- a/core/lib/spree/testing_support/factories/user_factory.rb +++ b/core/lib/spree/testing_support/factories/user_factory.rb @@ -10,7 +10,7 @@ factory :user, class: Spree.user_class do email { generate(:random_email) } login { email } - password 'secret' + password { 'secret' } password_confirmation { password } authentication_token { generate(:user_authentication_token) } if Spree.user_class.attribute_method? :authentication_token diff --git a/core/lib/spree/testing_support/factories/variant_factory.rb b/core/lib/spree/testing_support/factories/variant_factory.rb index 7b8fa600933..6bc504ce02d 100644 --- a/core/lib/spree/testing_support/factories/variant_factory.rb +++ b/core/lib/spree/testing_support/factories/variant_factory.rb @@ -7,11 +7,11 @@ sequence(:random_float) { BigDecimal.new("#{rand(200)}.#{rand(99)}") } factory :base_variant, class: Spree::Variant do - price 19.99 - cost_price 17.00 + price { 19.99 } + cost_price { 17.00 } sku { generate(:sku) } - is_master 0 - track_inventory true + is_master { 0 } + track_inventory { true } product { |p| p.association(:base_product) } option_values { [create(:option_value)] } @@ -25,14 +25,14 @@ end factory :master_variant do - is_master 1 + is_master { 1 } end factory :on_demand_variant do - track_inventory false + track_inventory { false } factory :on_demand_master_variant do - is_master 1 + is_master { 1 } end end end diff --git a/core/lib/spree/testing_support/factories/variant_property_rule_factory.rb b/core/lib/spree/testing_support/factories/variant_property_rule_factory.rb index 8c5d0fd22e3..3acefc2b973 100644 --- a/core/lib/spree/testing_support/factories/variant_property_rule_factory.rb +++ b/core/lib/spree/testing_support/factories/variant_property_rule_factory.rb @@ -9,7 +9,7 @@ transient do property { create(:property) } option_value { create(:option_value) } - property_value nil + property_value { nil } end after(:build) do |rule, evaluator| diff --git a/core/lib/spree/testing_support/factories/zone_factory.rb b/core/lib/spree/testing_support/factories/zone_factory.rb index f7599d16ef7..9e35ab0aec2 100644 --- a/core/lib/spree/testing_support/factories/zone_factory.rb +++ b/core/lib/spree/testing_support/factories/zone_factory.rb @@ -3,7 +3,7 @@ FactoryBot.define do factory :global_zone, class: Spree::Zone do - name 'GlobalZone' + name { 'GlobalZone' } description { generate(:random_string) } zone_members do |proxy| zone = proxy.instance_eval { @instance }