spree_core 4.2.5 → 4.3.0

data/lib/spree/i18n.rb

@@ -20,7 +20,7 @@ module Spree
       locales_from_i18n = I18n.available_locales
       locales =
         if defined?(SpreeI18n)
-          (SpreeI18n::Locale.all << :en).map(&:to_s)
+          (SpreeI18n::Locale.all << :en).map(&:to_sym)
         else
           [Rails.application.config.i18n.default_locale, I18n.locale, :en]
         end

data/lib/spree/money.rb

@@ -5,7 +5,7 @@ Money.rounding_mode = BigDecimal::ROUND_HALF_UP
 
 module Spree
   class Money
-    class <<self
+    class << self
       attr_accessor :default_formatting_rules
     end
 
@@ -16,6 +16,7 @@ module Spree
     }
 
     attr_reader :money
+
     delegate    :cents, :currency, to: :money
 
     def initialize(amount, options = {})

data/lib/spree/permitted_attributes.rb

@@ -2,11 +2,14 @@ module Spree
   module PermittedAttributes
     ATTRIBUTES = [
       :address_attributes,
+      :classification_attributes,
       :checkout_attributes,
       :customer_return_attributes,
       :image_attributes,
       :inventory_unit_attributes,
       :line_item_attributes,
+      :menu_attributes,
+      :menu_item_attributes,
       :option_type_attributes,
       :option_value_attributes,
       :payment_attributes,
@@ -24,7 +27,9 @@ module Spree
       :taxon_attributes,
       :taxonomy_attributes,
       :user_attributes,
-      :variant_attributes
+      :variant_attributes,
+      :cms_page_attributes,
+      :cms_section_attributes
     ]
 
     mattr_reader *ATTRIBUTES
@@ -43,6 +48,14 @@ module Spree
       :user_id, :bill_address_id, :ship_address_id
     ]
 
+    @@classification_attributes = [
+      :position, :taxon_id, :product_id
+    ]
+
+    @@cms_page_attributes = [:title, :meta_title, :content, :meta_description, :visible, :slug, :locale]
+
+    @@cms_section_attributes = [:name, :content, :settings, :fit, :destination]
+
     @@customer_return_attributes = [:stock_location_id, return_items_attributes: [:id, :inventory_unit_id, :return_authorization_id, :returned, :pre_tax_amount, :acceptance_status, :exchange_variant_id, :resellable]]
 
     @@image_attributes = [:alt, :attachment, :position, :viewable_type, :viewable_id]
@@ -51,6 +64,11 @@ module Spree
 
     @@line_item_attributes = [:id, :variant_id, :quantity]
 
+    @@menu_attributes = [:name, :locale, :location]
+
+    @@menu_item_attributes = [:name, :subtite, :destination, :new_window, :item_type,
+                              :linked_resource_type, :linked_resource_id, :code, :menu_id]
+
     @@option_type_attributes = [:name, :presentation, :option_values_attributes]
 
     @@option_value_attributes = [:name, :presentation]
@@ -101,7 +119,7 @@ module Spree
                           :customer_support_email, :facebook, :twitter, :instagram,
                           :description, :address, :contact_phone, :supported_locales,
                           :default_locale, :default_country_id, :supported_currencies,
-                          :new_order_notifications_email, :mailer_logo, :checkout_zone_id, :seo_robots]
+                          :new_order_notifications_email, :mailer_logo, :favicon_image, :checkout_zone_id, :seo_robots]
 
     @@store_credit_attributes = %i[amount currency category_id memo]
 
@@ -113,7 +131,7 @@ module Spree
     ]
 
     # TODO: Should probably use something like Spree.user_class.attributes
-    @@user_attributes = [:email, :password, :password_confirmation]
+    @@user_attributes = [:email, :bill_address_id, :ship_address_id, :password, :password_confirmation]
 
     @@variant_attributes = [
       :name, :presentation, :cost_price, :discontinue_on, :lock_version,

data/lib/spree/testing_support/authorization_helpers.rb

@@ -37,10 +37,13 @@ module Spree
             ability_class.register_ability(ability)
           end
 
+          let(:admin_token) { Doorkeeper::AccessToken.create!(scopes: 'admin read write').token }
+
           before do
-            allow(Spree.user_class).to receive(:find_by).
-              with(hash_including(:spree_api_key)).
-              and_return(Spree.user_class.new)
+            allow(Spree.user_class).to receive(:find_by).and_return(Spree.user_class.new)
+            if defined?(Spree::Admin)
+              allow_any_instance_of(Spree::Admin::BaseController).to receive(:admin_oauth_token).and_return(admin_token)
+            end
           end
         end
 

data/lib/spree/testing_support/capybara_config.rb

@@ -22,5 +22,7 @@ else
     driver.browser.save_screenshot(path)
   end
 end
-Capybara.default_max_wait_time = 45
+Capybara.default_max_wait_time = ENV.fetch('CAPYBARA_MAX_WAIT_TIME', 45).to_i
 Capybara.server = :puma
+
+Capybara.always_include_port = true

data/lib/spree/testing_support/common_rake.rb

@@ -8,14 +8,25 @@ require 'generators/spree/dummy_model/dummy_model_generator'
 desc 'Generates a dummy app for testing'
 namespace :common do
   task :test_app, :user_class do |_t, args|
-    args.with_defaults(user_class: 'Spree::LegacyUser')
+    args.with_defaults(user_class: 'Spree::LegacyUser', install_storefront: 'false', install_admin: 'false')
     require ENV['LIB_NAME'].to_s
 
     ENV['RAILS_ENV'] = 'test'
     Rails.env = 'test'
 
     Spree::DummyGenerator.start ["--lib_name=#{ENV['LIB_NAME']}", '--quiet']
-    Spree::InstallGenerator.start ["--lib_name=#{ENV['LIB_NAME']}", '--auto-accept', '--migrate=false', '--seed=false', '--sample=false', '--quiet', '--copy_storefront=false', '--install_storefront=false', "--user_class=#{args[:user_class]}"]
+    Spree::InstallGenerator.start [
+      "--lib_name=#{ENV['LIB_NAME']}",
+      '--auto-accept',
+      '--migrate=false',
+      '--seed=false',
+      '--sample=false',
+      '--quiet',
+      '--copy_storefront=false',
+      "--install_storefront=#{args[:install_storefront]}",
+      "--install_admin=#{args[:install_admin]}",
+      "--user_class=#{args[:user_class]}"
+    ]
 
     puts 'Setting up dummy database...'
     system("bundle exec rake db:drop db:create > #{File::NULL}")
@@ -30,8 +41,10 @@ namespace :common do
       puts 'Skipping installation no generator to run...'
     end
 
-    puts 'Precompiling assets...'
-    system("bundle exec rake assets:precompile > #{File::NULL}")
+    unless ['spree/api', 'spree/core', 'spree/sample'].include?(ENV['LIB_NAME'])
+      puts 'Precompiling assets...'
+      system("bundle exec rake assets:precompile > #{File::NULL}")
+    end
   end
 
   task :seed do |_t|

data/lib/spree/testing_support/extension_rake.rb

@@ -2,8 +2,8 @@ require 'spree/testing_support/common_rake'
 
 desc 'Generates a dummy app for testing an extension'
 namespace :extension do
-  task :test_app, [:user_class] do |_t, _args|
+  task :test_app, [:user_class] do |_t, args|
     Spree::DummyGeneratorHelper.inject_extension_requirements = true
-    Rake::Task['common:test_app'].invoke
+    Rake::Task['common:test_app'].execute(args.with_defaults(install_admin: true, install_storefront: true))
   end
 end

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

@@ -3,7 +3,7 @@ FactoryBot.define do
     firstname         { 'John' }
     lastname          { 'Doe' }
     company           { 'Company' }
-    address1          { '10 Lovely Street' }
+    sequence(:address1) { |n| "#{n} Lovely Street" }
     address2          { 'Northwest' }
     city              { 'Herndon' }
     zipcode           { '35005' }

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

@@ -0,0 +1,8 @@
+FactoryBot.define do
+  factory :classification, class: Spree::Classification do
+    product
+    taxon
+
+    position { 1 }
+  end
+end

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

@@ -0,0 +1,20 @@
+FactoryBot.define do
+  factory :base_cms_page, class: Spree::CmsPage do
+    title { generate(:random_string) }
+    locale { 'en' }
+
+    store
+
+    factory :cms_homepage do
+      type { 'Spree::Cms::Pages::Homepage' }
+    end
+
+    factory :cms_standard_page do
+      type { 'Spree::Cms::Pages::StandardPage' }
+    end
+
+    factory :cms_feature_page do
+      type { 'Spree::Cms::Pages::FeaturePage' }
+    end
+  end
+end

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

@@ -0,0 +1,31 @@
+FactoryBot.define do
+  factory :cms_section, class: Spree::CmsSection do
+    name { generate(:random_string) }
+
+    association :cms_page, factory: :base_cms_page
+
+    factory :cms_hero_image_section do
+      type { 'Spree::Cms::Sections::HeroImage' }
+    end
+
+    factory :cms_featured_article_section do
+      type { 'Spree::Cms::Sections::FeaturedArticle' }
+    end
+
+    factory :cms_product_carousel_section do
+      type { 'Spree::Cms::Sections::ProductCarousel' }
+    end
+
+    factory :cms_image_gallery_section do
+      type { 'Spree::Cms::Sections::ImageGallery' }
+    end
+
+    factory :cms_side_by_side_images_section do
+      type { 'Spree::Cms::Sections::SideBySideImages' }
+    end
+
+    factory :cms_rich_text_content_section do
+      type { 'Spree::Cms::Sections::RichTextContent' }
+    end
+  end
+end

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

@@ -1,29 +1,36 @@
 FactoryBot.define do
-  factory :customer_return, class: Spree::CustomerReturn do
+  # for the case when you want to supply existing return items instead of generating some
+  factory :customer_return_without_return_items, class: Spree::CustomerReturn do
     association(:stock_location, factory: :stock_location)
 
-    transient do
-      line_items_count   { 1 }
-      return_items_count { line_items_count }
+    before(:create) do |customer_return, _evaluator|
+      if customer_return.store.nil?
+        default_store = Spree::Store.default.persisted? ? Spree::Store.default : nil
+        store = default_store || create(:store)
+
+        customer_return.store = store
+      end
     end
 
-    before(:create) do |customer_return, evaluator|
-      shipped_order = create(:shipped_order, line_items_count: evaluator.line_items_count)
+    factory :customer_return, class: Spree::CustomerReturn do
+      transient do
+        line_items_count   { 1 }
+        return_items_count { line_items_count }
+      end
+
+      before(:create) do |customer_return, evaluator|
+        shipped_order = create(:shipped_order, line_items_count: evaluator.line_items_count, store: customer_return.store)
 
-      shipped_order.inventory_units.take(evaluator.return_items_count).each do |inventory_unit|
-        customer_return.return_items << build(:return_item, inventory_unit: inventory_unit)
+        shipped_order.inventory_units.take(evaluator.return_items_count).each do |inventory_unit|
+          customer_return.return_items << build(:return_item, inventory_unit: inventory_unit)
+        end
       end
-    end
 
-    factory :customer_return_with_accepted_items do
-      after(:create) do |customer_return|
-        customer_return.return_items.each(&:accept!)
+      factory :customer_return_with_accepted_items do
+        after(:create) do |customer_return|
+          customer_return.return_items.each(&:accept!)
+        end
       end
     end
   end
-
-  # for the case when you want to supply existing return items instead of generating some
-  factory :customer_return_without_return_items, class: Spree::CustomerReturn do
-    association(:stock_location, factory: :stock_location)
-  end
 end

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

@@ -0,0 +1,7 @@
+FactoryBot.define do
+  factory :icon, class: Spree::Icon do
+    before(:create) do |icon|
+      icon.attachment.attach(io: File.new(Spree::Core::Engine.root + 'spec/fixtures' + 'thinking-cat.jpg'), filename: 'thinking-cat.jpg')
+    end
+  end
+end

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

@@ -4,8 +4,12 @@ FactoryBot.define do
     quantity { 1 }
     price    { BigDecimal('10.00') }
     currency { order.currency }
-    transient do
-      association :product
+    product do
+      if order&.store&.present?
+        create(:product, stores: [order.store])
+      else
+        create(:product)
+      end
     end
     variant { product.master }
   end

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

@@ -0,0 +1,16 @@
+FactoryBot.define do
+  factory :menu, class: Spree::Menu do
+    name { generate(:random_string) }
+    locale { 'en' }
+    location { 'Header' }
+
+    before(:create) do |menu|
+      if menu.store.nil?
+        default_store = Spree::Store.default.persisted? ? Spree::Store.default : nil
+        store = default_store || create(:store)
+
+        menu.store = store
+      end
+    end
+  end
+end

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

@@ -0,0 +1,10 @@
+FactoryBot.define do
+  factory :menu_item, class: Spree::MenuItem do
+    sequence(:name) { |n| "Link no. #{n} To Somewhere" }
+    item_type { 'Link' }
+    linked_resource_type { 'URL' }
+
+    menu
+    icon
+  end
+end

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

@@ -5,6 +5,11 @@ FactoryBot.define do
     option_type
   end
 
+  factory :option_value_variant, class: Spree::OptionValueVariant do
+    option_value
+    variant
+  end
+
   factory :option_type, class: Spree::OptionType do
     sequence(:name) { |n| "foo-size-#{n}" }
     presentation    { 'Size' }

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

@@ -2,13 +2,22 @@ FactoryBot.define do
   factory :order, class: Spree::Order do
     user
     bill_address
-    store
     completed_at { nil }
-    email        { user.email }
+    email        { user&.email }
     currency     { 'USD' }
 
     transient do
       line_items_price { BigDecimal(10) }
+      attach_to_default_store { true }
+    end
+
+    before(:create) do |order|
+      unless order.store.present?
+        default_store = Spree::Store.default.persisted? ? Spree::Store.default : nil
+        store = default_store || create(:store)
+
+        order.store = store
+      end
     end
 
     factory :order_with_totals do

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

@@ -1,5 +1,6 @@
 FactoryBot.define do
   factory :payment_method, class: Spree::PaymentMethod do
+    type { 'Spree::PaymentMethod' }
     name { 'Test' }
 
     before(:create) do |payment_method|
@@ -7,26 +8,29 @@ FactoryBot.define do
         default_store = Spree::Store.default.persisted? ? Spree::Store.default : nil
         store = default_store || create(:store)
 
-        payment_method.stores << [store]
+        payment_method.stores << store
       end
     end
   end
 
   factory :check_payment_method, parent: :payment_method, class: Spree::PaymentMethod::Check do
+    type { 'Spree::PaymentMethod::Check' }
     name { 'Check' }
   end
 
   factory :credit_card_payment_method, parent: :payment_method, class: Spree::Gateway::Bogus do
+    type { 'Spree::Gateway::Bogus' }
     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, parent: :payment_method, class: Spree::Gateway::BogusSimple do
+    type { 'Spree::Gateway::BogusSimple' }
     name { 'Credit Card' }
   end
 
-  factory :store_credit_payment_method, class: Spree::PaymentMethod::StoreCredit do
+  factory :store_credit_payment_method, parent: :payment_method, class: Spree::PaymentMethod::StoreCredit do
     type          { 'Spree::PaymentMethod::StoreCredit' }
     name          { 'Store Credit' }
     description   { 'Store Credit' }

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

@@ -10,7 +10,17 @@ FactoryBot.define do
     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) unless Spree::StockLocation.any? }
+    # also attach this product to the default store if no stores are passed in
+    before(:create) do |product|
+      create(:stock_location) unless Spree::StockLocation.any?
+
+      if product.stores.empty?
+        default_store = Spree::Store.default.persisted? ? Spree::Store.default : nil
+        store = default_store || create(:store)
+
+        product.stores << [store]
+      end
+    end
 
     factory :custom_product do
       name  { 'Custom Product' }
@@ -26,6 +36,12 @@ FactoryBot.define do
         after :create do |product|
           product.master.stock_items.first.adjust_count_on_hand(10)
         end
+
+        trait :without_backorder do
+          after :create do |product|
+            product.master.stock_items.update_all(backorderable: false)
+          end
+        end
       end
 
       factory :product_with_option_types do