RubyGems - spree_core - Versions diffs - 3.2.9 → 3.3.0.rc1 - Mend

spree_core 3.2.9 → 3.3.0.rc1

Files changed (383) hide show

data/lib/spree/testing_support/factories/address_factory.rb CHANGED Viewed

@@ -1,4 +1,4 @@
-FactoryBot.define do
+FactoryGirl.define do
   factory :address, aliases: [:bill_address, :ship_address], class: Spree::Address do
     firstname 'John'
     lastname 'Doe'

data/lib/spree/testing_support/factories/adjustment_factory.rb CHANGED Viewed

@@ -1,4 +1,4 @@
-FactoryBot.define do
+FactoryGirl.define do
   factory :adjustment, class: Spree::Adjustment do
     association(:adjustable, factory: :order)
     amount 100.0

data/lib/spree/testing_support/factories/calculator_factory.rb CHANGED Viewed

@@ -1,4 +1,4 @@
-FactoryBot.define do
+FactoryGirl.define do
   factory :calculator, class: Spree::Calculator::FlatRate do
     after(:create) { |c| c.set_preference(:amount, 10.0) }
   end

data/lib/spree/testing_support/factories/country_factory.rb CHANGED Viewed

@@ -1,4 +1,4 @@
-FactoryBot.define do
+FactoryGirl.define do
   factory :country, class: Spree::Country do
     sequence(:iso_name) { |n| "ISO_NAME_#{n}" }
     sequence(:name) { |n| "NAME_#{n}" }

data/lib/spree/testing_support/factories/credit_card_factory.rb CHANGED Viewed

@@ -1,4 +1,4 @@
-FactoryBot.define do
+FactoryGirl.define do
   factory :credit_card, class: Spree::CreditCard do
     verification_value 123
     month 12

data/lib/spree/testing_support/factories/customer_return_factory.rb CHANGED Viewed

@@ -1,4 +1,4 @@
-FactoryBot.define do
+FactoryGirl.define do
   factory :customer_return, class: Spree::CustomerReturn do
     association(:stock_location, factory: :stock_location)

data/lib/spree/testing_support/factories/image_factory.rb CHANGED Viewed

@@ -1,4 +1,4 @@
-FactoryBot.define do
+FactoryGirl.define do
   factory :image, class: Spree::Image do
     attachment { File.new(Spree::Core::Engine.root + "spec/fixtures" + 'thinking-cat.jpg') }
   end

data/lib/spree/testing_support/factories/inventory_unit_factory.rb CHANGED Viewed

@@ -1,4 +1,4 @@
-FactoryBot.define do
+FactoryGirl.define do
   factory :inventory_unit, class: Spree::InventoryUnit do
     variant
     order

data/lib/spree/testing_support/factories/line_item_factory.rb CHANGED Viewed

@@ -1,4 +1,4 @@
-FactoryBot.define do
+FactoryGirl.define do
   factory :line_item, class: Spree::LineItem do
     quantity 1
     price { BigDecimal.new('10.00') }

data/lib/spree/testing_support/factories/options_factory.rb CHANGED Viewed

@@ -1,4 +1,4 @@
-FactoryBot.define do
+FactoryGirl.define do
   factory :option_value, class: Spree::OptionValue do
     sequence(:name) { |n| "Size-#{n}" }

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

@@ -1,4 +1,4 @@
-FactoryBot.define do
+FactoryGirl.define do
   factory :order, class: Spree::Order do
     user
     bill_address
@@ -62,6 +62,12 @@ FactoryBot.define do
           end
         end
+        factory :completed_order_with_store_credit_payment do
+          after(:create) do |order|
+            create(:store_credit_payment, amount: order.total, order: order)
+          end
+        end
         factory :order_ready_to_ship do
           payment_state 'paid'
           shipment_state 'ready'

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

@@ -1,4 +1,4 @@
-FactoryBot.define do
+FactoryGirl.define do
   factory :payment, class: Spree::Payment do
     amount 45.75
     association(:payment_method, factory: :credit_card_payment_method)

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

@@ -1,4 +1,4 @@
-FactoryBot.define do
+FactoryGirl.define do
   factory :check_payment_method, class: Spree::PaymentMethod::Check do
     name 'Check'
   end

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

@@ -1,4 +1,4 @@
-FactoryBot.define do
+FactoryGirl.define do
   factory :price, class: Spree::Price do
     variant
     amount 19.99

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

@@ -1,4 +1,4 @@
-FactoryBot.define do
+FactoryGirl.define do
   factory :base_product, class: Spree::Product do
     sequence(:name) { |n| "Product ##{n} - #{Kernel.rand(9999)}" }
     description { generate(:random_description) }

data/lib/spree/testing_support/factories/product_option_type_factory.rb CHANGED Viewed

@@ -1,4 +1,4 @@
-FactoryBot.define do
+FactoryGirl.define do
   factory :product_option_type, class: Spree::ProductOptionType do
     product
     option_type

data/lib/spree/testing_support/factories/product_property_factory.rb CHANGED Viewed

@@ -1,4 +1,4 @@
-FactoryBot.define do
+FactoryGirl.define do
   factory :product_property, class: Spree::ProductProperty do
     product
     property

data/lib/spree/testing_support/factories/promotion_category_factory.rb CHANGED Viewed

@@ -1,4 +1,4 @@
-FactoryBot.define do
+FactoryGirl.define do
   factory :promotion_category, class: Spree::PromotionCategory do
     name 'Promotion Category'
   end

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

@@ -1,4 +1,4 @@
-FactoryBot.define do
+FactoryGirl.define do
   factory :promotion, class: Spree::Promotion do
     name 'Promo'

data/lib/spree/testing_support/factories/promotion_rule_factory.rb CHANGED Viewed

@@ -1,4 +1,4 @@
-FactoryBot.define do
+FactoryGirl.define do
   factory :promotion_rule, class: Spree::PromotionRule do
     association :promotion
   end

data/lib/spree/testing_support/factories/property_factory.rb CHANGED Viewed

@@ -1,4 +1,4 @@
-FactoryBot.define do
+FactoryGirl.define do
   factory :property, class: Spree::Property do
     name 'baseball_cap_color'
     presentation 'cap color'

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

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

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

@@ -1,4 +1,4 @@
-FactoryBot.define do
+FactoryGirl.define do
   sequence(:refund_transaction_id) { |n| "fake-refund-transaction-#{n}" }
   factory :refund, class: Spree::Refund do

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

@@ -1,4 +1,4 @@
-FactoryBot.define do
+FactoryGirl.define do
   factory :reimbursement, class: Spree::Reimbursement do
     transient do
       return_items_count 1

data/lib/spree/testing_support/factories/reimbursement_type_factory.rb CHANGED Viewed

@@ -1,4 +1,4 @@
-FactoryBot.define do
+FactoryGirl.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 CHANGED Viewed

@@ -1,4 +1,4 @@
-FactoryBot.define do
+FactoryGirl.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 CHANGED Viewed

@@ -1,4 +1,4 @@
-FactoryBot.define do
+FactoryGirl.define do
   factory :return_item, class: Spree::ReturnItem do
     association(:inventory_unit, factory: :inventory_unit, state: :shipped)
     association(:return_authorization, factory: :return_authorization)

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

@@ -1,4 +1,4 @@
-FactoryBot.define do
+FactoryGirl.define do
   factory :role, class: Spree::Role do
     sequence(:name) { |n| "Role ##{n}" }

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

@@ -1,4 +1,4 @@
-FactoryBot.define do
+FactoryGirl.define do
   factory :shipment, class: Spree::Shipment do
     tracking 'U10000'
     cost 100.00

data/lib/spree/testing_support/factories/shipping_category_factory.rb CHANGED Viewed

@@ -1,4 +1,4 @@
-FactoryBot.define do
+FactoryGirl.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 CHANGED Viewed

@@ -1,8 +1,9 @@
-FactoryBot.define do
+FactoryGirl.define do
   factory :base_shipping_method, class: Spree::ShippingMethod do
     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 CHANGED Viewed

@@ -1,4 +1,4 @@
-FactoryBot.define do
+FactoryGirl.define do
   factory :state, class: Spree::State do
     sequence(:name) { |n| "STATE_NAME_#{n}" }
     sequence(:abbr) { |n| "STATE_ABBR_#{n}" }

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

@@ -1,4 +1,4 @@
-FactoryBot.define do
+FactoryGirl.define do
   # must use build()
   factory :stock_packer, class: Spree::Stock::Packer do
     transient do

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

@@ -1,4 +1,4 @@
-FactoryBot.define do
+FactoryGirl.define do
   factory :stock_item, class: Spree::StockItem do
     backorderable true
     stock_location

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

@@ -1,4 +1,4 @@
-FactoryBot.define do
+FactoryGirl.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 CHANGED Viewed

@@ -1,4 +1,4 @@
-FactoryBot.define do
+FactoryGirl.define do
   factory :stock_movement, class: Spree::StockMovement do
     quantity 1
     action 'sold'

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

@@ -1,4 +1,4 @@
-FactoryBot.define do
+FactoryGirl.define do
   factory :store_credit_category, class: Spree::StoreCreditCategory do
     name "Exchange"
   end

data/lib/spree/testing_support/factories/store_credit_event_factory.rb CHANGED Viewed

@@ -1,4 +1,4 @@
-FactoryBot.define do
+FactoryGirl.define do
   factory :store_credit_auth_event, class: Spree::StoreCreditEvent do
     store_credit       { create(:store_credit) }
     action             { Spree::StoreCredit::AUTHORIZE_ACTION }

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

@@ -1,4 +1,4 @@
-FactoryBot.define do
+FactoryGirl.define do
   sequence(:store_credits_order_number) { |n| "R1000#{n}" }
   factory :store_credit, class: Spree::StoreCredit do

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

@@ -1,4 +1,4 @@
-FactoryBot.define do
+FactoryGirl.define do
   factory :primary_credit_type, class: Spree::StoreCreditType do
     name      Spree::StoreCreditType::DEFAULT_TYPE_NAME
     priority  { '1' }

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

@@ -1,4 +1,4 @@
-FactoryBot.define do
+FactoryGirl.define do
   factory :store, class: Spree::Store do
     sequence(:code) { |i| "spree_#{i}" }
     name 'Spree Test Store'

data/lib/spree/testing_support/factories/tag_factory.rb CHANGED Viewed

@@ -1,4 +1,4 @@
-FactoryBot.define do
+FactoryGirl.define do
   factory :tag, class: Spree::Tag do
     sequence(:name) { |n| "Tag ##{n} - #{Kernel.rand(9999)}" }
   end

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

@@ -1,4 +1,4 @@
-FactoryBot.define do
+FactoryGirl.define do
   factory :tax_category, class: Spree::TaxCategory do
     name { "TaxCategory - #{rand(999999)}" }
     description { generate(:random_string) }

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

@@ -1,4 +1,4 @@
-FactoryBot.define do
+FactoryGirl.define do
   factory :tax_rate, class: Spree::TaxRate do
     zone
     amount 0.1

data/lib/spree/testing_support/factories/taxon_factory.rb CHANGED Viewed

@@ -1,6 +1,6 @@
-FactoryBot.define do
+FactoryGirl.define do
   factory :taxon, class: Spree::Taxon do
-    name 'Ruby on Rails'
+    sequence(:name) { |n| "taxon_#{n}" }
     taxonomy
     parent_id nil
   end

data/lib/spree/testing_support/factories/taxonomy_factory.rb CHANGED Viewed

@@ -1,5 +1,5 @@
-FactoryBot.define do
+FactoryGirl.define do
   factory :taxonomy, class: Spree::Taxonomy do
-    name 'Brand'
+    sequence(:name) { |n| "taxonomy_#{n}" }
   end
 end

data/lib/spree/testing_support/factories/tracker_factory.rb CHANGED Viewed

@@ -1,4 +1,4 @@
-FactoryBot.define do
+FactoryGirl.define do
   factory :tracker, class: Spree::Tracker do
     analytics_id 'A100'
     active true

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

@@ -1,4 +1,4 @@
-FactoryBot.define do
+FactoryGirl.define do
   sequence :user_authentication_token do |n|
     "xxxx#{Time.current.to_i}#{rand(1000)}#{n}xxxxxxxxxxxxx"
   end

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

@@ -1,4 +1,4 @@
-FactoryBot.define do
+FactoryGirl.define do
   sequence(:random_float) { BigDecimal.new("#{rand(200)}.#{rand(99)}") }
   factory :base_variant, class: Spree::Variant do

data/lib/spree/testing_support/factories/zone_factory.rb CHANGED Viewed

@@ -1,4 +1,4 @@
-FactoryBot.define do
+FactoryGirl.define do
   factory :global_zone, class: Spree::Zone do
     name 'GlobalZone'
     description { generate(:random_string) }

data/lib/spree/testing_support/factories/zone_member_factory.rb CHANGED Viewed

@@ -1,4 +1,4 @@
-FactoryBot.define do
+FactoryGirl.define do
   factory :zone_member, class: Spree::ZoneMember do
     zone { |member| member.association(:zone) }
     zoneable { |member| member.association(:zoneable) }

data/lib/spree/testing_support/microdata.rb CHANGED Viewed

@@ -6,6 +6,9 @@ module Spree
         attr_reader :items, :doc
         def initialize(content)
+          ActiveSupport::Deprecation.warn(<<-EOS, caller)
+            Spree::TestingSupport::Microdata will be removed in Spree 3.4
+          EOS
           @doc = Nokogiri::HTML(content)
           @items = extract_items
         end

data/lib/spree/testing_support/order_walkthrough.rb CHANGED Viewed

@@ -2,23 +2,23 @@ class OrderWalkthrough
   def self.up_to(state)
     # A default store must exist to provide store settings
     unless Spree::Store.exists?
-      FactoryBot.create(:store)
+      FactoryGirl.create(:store)
     end
     # A payment method must exist for an order to proceed through the Address state
     unless Spree::PaymentMethod.exists?
-      FactoryBot.create(:check_payment_method)
+      FactoryGirl.create(:check_payment_method)
     end
     # Need to create a valid zone too...
-    zone = FactoryBot.create(:zone)
-    country = FactoryBot.create(:country)
+    zone = FactoryGirl.create(:zone)
+    country = FactoryGirl.create(:country)
     zone.members << Spree::ZoneMember.create(zoneable: country)
-    country.states << FactoryBot.create(:state, country: country)
+    country.states << FactoryGirl.create(:state, country: country)
     # A shipping method must exist for rates to be displayed on checkout page
     unless Spree::ShippingMethod.exists?
-      FactoryBot.create(:shipping_method).tap do |sm|
+      FactoryGirl.create(:shipping_method).tap do |sm|
         sm.calculator.preferred_amount = 10
         sm.calculator.preferred_currency = Spree::Config[:currency]
         sm.calculator.save
@@ -40,13 +40,13 @@ class OrderWalkthrough
   private
   def self.add_line_item!(order)
-    FactoryBot.create(:line_item, order: order)
+    FactoryGirl.create(:line_item, order: order)
     order.reload
   end
   def self.address(order)
-    order.bill_address = FactoryBot.create(:address, country_id: Spree::Zone.global.members.first.zoneable.id)
-    order.ship_address = FactoryBot.create(:address, country_id: Spree::Zone.global.members.first.zoneable.id)
+    order.bill_address = FactoryGirl.create(:address, country_id: Spree::Zone.global.members.first.zoneable.id)
+    order.ship_address = FactoryGirl.create(:address, country_id: Spree::Zone.global.members.first.zoneable.id)
     order.next!
   end