solidus_core 2.4.2 → 2.5.0.beta1

data/lib/spree/testing_support/factories/order_factory.rb

@@ -5,7 +5,7 @@ require 'spree/testing_support/factories/user_factory'
 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
@@ -27,6 +27,10 @@ FactoryGirl.define do
           price: evaluator.line_items_price
         )
       end
+
+      after(:create) do |order|
+        order.recalculate
+      end
     end
 
     factory :order_with_line_items do

data/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

data/lib/spree/testing_support/factories/payment_factory.rb

@@ -3,7 +3,7 @@ require 'spree/testing_support/factories/credit_card_factory'
 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, address: order.bill_address) }

data/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::PaymentMethod::BogusCreditCard' do
     name 'Credit Card'
     available_to_admin true

data/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

data/lib/spree/testing_support/factories/product_factory.rb

@@ -4,7 +4,7 @@ require 'spree/testing_support/factories/stock_location_factory'
 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!"

data/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

data/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

data/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

data/lib/spree/testing_support/factories/promotion_code_factory.rb

@@ -1,9 +1,9 @@
 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) }
+    sequence(:value) { |i| "code#{i}" }
   end
 end

data/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'
 

data/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'

data/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

data/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

data/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

data/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

data/lib/spree/testing_support/factories/return_authorization_factory.rb

@@ -2,7 +2,7 @@ require 'spree/testing_support/factories/order_factory'
 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)

data/lib/spree/testing_support/factories/return_item_factory.rb

@@ -2,7 +2,7 @@ require 'spree/testing_support/factories/inventory_unit_factory'
 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)

data/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

data/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}" }
 

data/lib/spree/testing_support/factories/shipment_factory.rb

@@ -2,7 +2,7 @@ require 'spree/testing_support/factories/order_factory'
 require 'spree/testing_support/factories/stock_location_factory'
 require 'spree/testing_support/factories/shipping_method_factory'
 
-FactoryGirl.define do
+FactoryBot.define do
   factory :shipment, class: 'Spree::Shipment' do
     tracking 'U10000'
     cost 100.00
@@ -25,7 +25,6 @@ FactoryGirl.define do
       shipment.order.line_items.each do |line_item|
         line_item.quantity.times do
           shipment.inventory_units.create!(
-            order_id: shipment.order_id,
             variant_id: line_item.variant_id,
             line_item_id: line_item.id
           )

data/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

data/lib/spree/testing_support/factories/shipping_method_factory.rb

@@ -2,7 +2,7 @@ require 'spree/testing_support/factories/calculator_factory'
 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 @@ FactoryGirl.define do
     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'

data/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

data/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'
@@ -9,12 +9,6 @@ FactoryGirl.define do
       carmen_subregion do
         carmen_country = Carmen::Country.coded(country.iso)
 
-        # TODO: This condition can be removed after this carmen update is
-        # available: https://github.com/jim/carmen/pull/177
-        if !carmen_country.subregions?
-          fail("Country #{country.iso} has no subregions")
-        end
-
         carmen_country.subregions.coded(state_code) ||
           carmen_country.subregions.sort_by(&:name).first ||
           fail("Country #{country.iso} has no subregions")

data/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

data/lib/spree/testing_support/factories/stock_location_factory.rb

@@ -2,7 +2,7 @@ require 'spree/testing_support/factories/country_factory'
 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'

data/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'

data/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
 

data/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

data/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 }

data/lib/spree/testing_support/factories/store_credit_factory.rb

@@ -2,7 +2,7 @@ require 'spree/testing_support/factories/store_credit_category_factory'
 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

data/lib/spree/testing_support/factories/store_credit_type_factory.rb

@@ -1,6 +1,6 @@
-FactoryGirl.define do
+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
 

data/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

data/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}" }

data/lib/spree/testing_support/factories/tax_category_factory.rb

@@ -1,9 +1,8 @@
 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)}" }
-    description { generate(:random_string) }
   end
 end

data/lib/spree/testing_support/factories/tax_rate_factory.rb

@@ -2,7 +2,7 @@ require 'spree/testing_support/factories/calculator_factory'
 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

data/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

data/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

data/lib/spree/testing_support/factories/user_factory.rb

@@ -2,17 +2,11 @@ require 'spree/testing_support/sequences'
 require 'spree/testing_support/factories/role_factory'
 require 'spree/testing_support/factories/address_factory'
 
-FactoryGirl.define do
-  sequence :user_authentication_token do |n|
-    "xxxx#{Time.current.to_i}#{rand(1000)}#{n}xxxxxxxxxxxxx"
-  end
-
-  factory :user, class: Spree.user_class do
-    email { generate(:random_email) }
-    login { email } if Spree.user_class.attribute_method? :login
+FactoryBot.define do
+  factory :user, class: Spree::UserClassHandle.new do
+    email { generate(:email) }
     password 'secret'
-    password_confirmation { password } if Spree.user_class.attribute_method? :password_confirmation
-    authentication_token { generate(:user_authentication_token) } if Spree.user_class.attribute_method? :authentication_token
+    password_confirmation { password }
 
     trait :with_api_key do
       after(:create) do |user, _|

data/lib/spree/testing_support/factories/variant_factory.rb

@@ -3,7 +3,7 @@ require 'spree/testing_support/factories/option_value_factory'
 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("#{rand(200)}.#{rand(99)}") }
 
   factory :base_variant, class: 'Spree::Variant' do

data/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