spree_core 3.6.6 → 3.7.0.rc1

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

@@ -0,0 +1,6 @@
+FactoryBot.define do
+  factory :order_promotion, class: Spree::OrderPromotion do
+    order
+    promotion
+  end
+end

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

@@ -1,14 +1,15 @@
 FactoryBot.define do
   factory :payment, class: Spree::Payment do
-    amount 45.75
+    order
+    amount        { 45.75 }
+    state         { 'checkout' }
+    response_code { '12345' }
+
     association(:payment_method, factory: :credit_card_payment_method)
     association(:source, factory: :credit_card)
-    order
-    state 'checkout'
-    response_code '12345'
 
     factory :payment_with_refund do
-      state 'completed'
+      state { 'completed' }
       after :create do |payment|
         create(:refund, amount: 5, payment: payment)
       end
@@ -16,9 +17,10 @@ FactoryBot.define do
   end
 
   factory :check_payment, class: Spree::Payment do
-    amount 45.75
-    association(:payment_method, factory: :check_payment_method)
+    amount { 45.75 }
     order
+
+    association(:payment_method, factory: :check_payment_method)
   end
 
   factory :store_credit_payment, class: Spree::Payment, parent: :payment do

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

@@ -1,23 +1,23 @@
 FactoryBot.define do
   factory :check_payment_method, class: Spree::PaymentMethod::Check do
-    name 'Check'
+    name { 'Check' }
   end
 
   factory :credit_card_payment_method, class: Spree::Gateway::Bogus do
-    name 'Credit Card'
+    name { 'Credit Card' }
   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
-    type          'Spree::PaymentMethod::StoreCredit'
-    name          'Store Credit'
-    description   'Store Credit'
-    active        true
-    auto_capture  true
+    type          { 'Spree::PaymentMethod::StoreCredit' }
+    name          { 'Store Credit' }
+    description   { 'Store Credit' }
+    active        { true }
+    auto_capture  { true }
   end
 end

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

@@ -1,7 +1,7 @@
 FactoryBot.define do
   factory :price, class: Spree::Price do
     variant
-    amount 19.99
-    currency 'USD'
+    amount   { 19.99 }
+    currency { 'USD' }
   end
 end

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

@@ -1,20 +1,20 @@
 FactoryBot.define do
   factory :base_product, class: Spree::Product do
-    sequence(:name) { |n| "Product ##{n} - #{Kernel.rand(9999)}" }
-    description { generate(:random_description) }
-    price 19.99
-    cost_price 17.00
-    sku { generate(:sku) }
-    available_on { 1.year.ago }
-    deleted_at nil
+    sequence(:name)   { |n| "Product ##{n} - #{Kernel.rand(9999)}" }
+    description       { generate(:random_description) }
+    price             { 19.99 }
+    cost_price        { 17.00 }
+    sku               { generate(:sku) }
+    available_on      { 1.year.ago }
+    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 }
+    before(:create) { create(:stock_location) unless Spree::StockLocation.any? }
 
     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

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

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

@@ -1,10 +1,10 @@
 FactoryBot.define do
   factory :promotion, class: Spree::Promotion do
-    name 'Promo'
+    name { 'Promo' }
 
     trait :with_line_item_adjustment do
       transient do
-        adjustment_rate 10
+        adjustment_rate { 10 }
       end
 
       after(:create) do |promotion, evaluator|
@@ -17,7 +17,7 @@ FactoryBot.define do
 
     trait :with_order_adjustment do
       transient do
-        weighted_order_adjustment_amount 10
+        weighted_order_adjustment_amount { 10 }
       end
 
       after(:create) do |promotion, evaluator|
@@ -32,7 +32,7 @@ FactoryBot.define do
 
     trait :with_item_total_rule do
       transient do
-        item_total_threshold_amount 10
+        item_total_threshold_amount { 10 }
       end
 
       after(:create) do |promotion, evaluator|
@@ -48,4 +48,14 @@ FactoryBot.define do
     end
     factory :promotion_with_item_total_rule, traits: [:with_item_total_rule]
   end
+
+  factory :free_shipping_promotion, class: Spree::Promotion do
+    name { 'Free Shipping Promotion' }
+
+    after(:create) do |promotion|
+      action = Spree::Promotion::Actions::FreeShipping.new
+      action.promotion = promotion
+      action.save
+    end
+  end
 end

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

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

@@ -1,11 +1,11 @@
 FactoryBot.define do
   factory :prototype, class: Spree::Prototype do
-    name 'Baseball Cap'
+    name       { 'Baseball Cap' }
     properties { [create(:property)] }
   end
   factory :prototype_with_option_types, class: Spree::Prototype do
-    name 'Baseball Cap'
-    properties { [create(:property)] }
+    name         { 'Baseball Cap' }
+    properties   { [create(:property)] }
     option_types { [create(:option_type)] }
   end
 end

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

@@ -2,21 +2,21 @@ FactoryBot.define do
   sequence(:refund_transaction_id) { |n| "fake-refund-transaction-#{n}" }
 
   factory :refund, class: Spree::Refund do
-    amount 100.00
+    amount         { 100.00 }
     transaction_id { generate(:refund_transaction_id) }
     association(:payment, state: 'completed')
     association(:reason, factory: :refund_reason)
   end
 
   factory :default_refund_reason, class: Spree::RefundReason do
-    name 'Return processing'
-    active true
-    mutable false
+    name    { 'Return processing' }
+    active  { true }
+    mutable { false }
   end
 
   factory :refund_reason, class: Spree::RefundReason do
     sequence(:name) { |n| "Refund for return ##{n}" }
-    active true
-    mutable false
+    active  { true }
+    mutable { false }
   end
 end

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

@@ -1,7 +1,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) }

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

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

@@ -3,7 +3,8 @@ FactoryBot.define do
     association(:order, factory: :shipped_order)
     association(:stock_location, factory: :stock_location)
     association(:reason, factory: :return_authorization_reason)
-    memo 'Items were broken'
+
+    memo { 'Items were broken' }
   end
 
   factory :new_return_authorization, class: Spree::ReturnAuthorization do
@@ -14,7 +15,7 @@ FactoryBot.define do
 
   factory :return_authorization_reason, class: Spree::ReturnAuthorizationReason do
     sequence(:name) { |n| "Defect ##{n}" }
-    active true
-    mutable false
+    active          { true }
+    mutable         { false }
   end
 end

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

@@ -3,7 +3,7 @@ FactoryBot.define do
     sequence(:name) { |n| "Role ##{n}" }
 
     factory :admin_role do
-      name 'admin'
+      name { 'admin' }
     end
   end
 end

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

@@ -1,8 +1,8 @@
 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
 

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

@@ -1,9 +1,9 @@
 FactoryBot.define do
   factory :base_shipping_method, class: Spree::ShippingMethod do
-    zones { |_a| [Spree::Zone.global] }
-    name 'UPS Ground'
-    code 'UPS_GROUND'
-    display_on 'both'
+    zones      { |_a| [Spree::Zone.global] }
+    name       { 'UPS Ground' }
+    code       { 'UPS_GROUND' }
+    display_on { 'both' }
 
     before(:create) do |shipping_method, _evaluator|
       if shipping_method.shipping_categories.empty?

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

@@ -3,11 +3,8 @@ FactoryBot.define do
     sequence(:name) { |n| "STATE_NAME_#{n}" }
     sequence(:abbr) { |n| "STATE_ABBR_#{n}" }
     country do |country|
-      if usa = Spree::Country.find_by(numcode: 840)
-        country = usa
-      else
-        country.association(:country)
-      end
+      usa = Spree::Country.find_by(numcode: 840)
+      usa.present? ? usa : country.association(:country)
     end
   end
 end

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

@@ -3,7 +3,7 @@ FactoryBot.define do
   factory :stock_packer, class: Spree::Stock::Packer do
     transient do
       stock_location { build(:stock_location) }
-      contents []
+      contents       { [] }
     end
 
     initialize_with { new(stock_location, contents) }
@@ -11,8 +11,8 @@ FactoryBot.define do
 
   factory :stock_package, class: Spree::Stock::Package do
     transient do
-      stock_location { build(:stock_location) }
-      contents       { [] }
+      stock_location    { build(:stock_location) }
+      contents          { [] }
       variants_contents { {} }
     end
 

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

@@ -1,6 +1,6 @@
 FactoryBot.define do
   factory :stock_item, class: Spree::StockItem do
-    backorderable true
+    backorderable { true }
     stock_location
     variant
 

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

@@ -1,12 +1,12 @@
 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                  { FFaker::Name.unique.name }
+    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|

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

@@ -1,11 +1,11 @@
 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

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

@@ -1,9 +1,9 @@
 FactoryBot.define do
   factory :store_credit_category, class: Spree::StoreCreditCategory do
-    name 'Exchange'
+    name { 'Exchange' }
   end
 
   factory :store_credit_gift_card_category, class: Spree::StoreCreditCategory do
-    name Spree::StoreCreditCategory::GIFT_CARD_CATEGORY_NAME
+    name { Spree::StoreCreditCategory::GIFT_CARD_CATEGORY_NAME }
   end
 end

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

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

@@ -1,8 +1,9 @@
 FactoryBot.define do
   factory :store, class: Spree::Store do
-    sequence(:code) { |i| "spree_#{i}" }
-    name 'Spree Test Store'
-    url 'www.example.com'
-    mail_from_address 'spree@example.org'
+    sequence(:code)   { |i| "spree_#{i}" }
+    name              { 'Spree Test Store' }
+    url               { 'www.example.com' }
+    mail_from_address { 'spree@example.org' }
+    default_currency  { 'USD' }
   end
 end

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

@@ -1,8 +1,9 @@
 FactoryBot.define do
   factory :tax_rate, class: Spree::TaxRate do
     zone
-    amount 0.1
     tax_category
+    amount { 0.1 }
+
     association(:calculator, factory: :default_tax_calculator)
   end
 end

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

@@ -4,11 +4,11 @@ FactoryBot.define do
   end
 
   factory :user, class: Spree.user_class do
-    email { generate(:random_email) }
-    login { email }
-    password 'secret'
+    email                 { generate(:random_email) }
+    login                 { email }
+    password              { 'secret' }
     password_confirmation { password }
-    authentication_token { generate(:user_authentication_token) } if Spree.user_class.attribute_method? :authentication_token
+    authentication_token  { generate(:user_authentication_token) } if Spree.user_class.attribute_method? :authentication_token
 
     factory :admin_user do
       spree_roles { [Spree::Role.find_by(name: 'admin') || create(:role, name: 'admin')] }