solidus_core 2.10.3 → 2.11.4

data/lib/spree/testing_support/authorization_helpers.rb

@@ -65,4 +65,5 @@ RSpec.configure do |config|
   config.extend Spree::TestingSupport::AuthorizationHelpers::Controller, type: :controller
   config.extend Spree::TestingSupport::AuthorizationHelpers::Request, type: :feature
   config.extend Spree::TestingSupport::AuthorizationHelpers::Request, type: :request
+  config.extend Spree::TestingSupport::AuthorizationHelpers::Request, type: :system
 end

data/lib/spree/testing_support/blacklist_urls.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Spree
+  module TestingSupport
+    module BlacklistUrls
+      def setup_url_blacklist(browser)
+        if browser.respond_to?(:url_blacklist)
+          browser.url_blacklist = ['http://fonts.googleapis.com']
+        end
+      end
+    end
+  end
+end
+
+RSpec.configure do |config|
+  config.before(:each, type: :feature) do
+    setup_url_blacklist(page.driver.browser)
+  end
+
+  config.before(:each, type: :system) do
+    setup_url_blacklist(page.driver.browser)
+  end
+end

data/lib/spree/testing_support/capybara_ext.rb

@@ -162,3 +162,6 @@ CapybaraExt = ActiveSupport::Deprecation::DeprecatedConstantProxy.new('CapybaraE
 RSpec.configure do |c|
   c.include Spree::TestingSupport::CapybaraExt
 end
+
+# A workaround for https://github.com/rspec/rspec-rails/issues/1897
+Capybara.server = :puma, { Silent: true }

data/lib/spree/testing_support/common_rake.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-unless defined?(Spree::InstallGenerator)
-  require 'generators/spree/install/install_generator'
+unless defined?(Solidus::InstallGenerator)
+  require 'generators/solidus/install/install_generator'
 end
 
 require 'generators/spree/dummy/dummy_generator'
@@ -14,7 +14,7 @@ namespace :common do
     ENV["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", "--user_class=#{args[:user_class]}"]
+    Solidus::InstallGenerator.start ["--lib_name=#{ENV['LIB_NAME']}", "--auto-accept", "--with-authentication=false", "--payment-method=none", "--migrate=false", "--seed=false", "--sample=false", "--quiet", "--user_class=#{args[:user_class]}"]
 
     puts "Setting up dummy database..."
 

data/lib/spree/testing_support/dummy_app.rb

@@ -12,14 +12,10 @@ Rails.env = 'test'
 
 require 'solidus_core'
 
-RAILS_52_OR_ABOVE = Gem::Version.new(Rails.version) >= Gem::Version.new('5.2')
-RAILS_6_OR_ABOVE = Gem::Version.new(Rails.version) >= Gem::Version.new('6.0')
+RAILS_6_OR_ABOVE = Rails.gem_version >= Gem::Version.new('6.0')
 
 # @private
 class ApplicationController < ActionController::Base
-  unless RAILS_52_OR_ABOVE
-    protect_from_forgery with: :exception
-  end
 end
 
 # @private
@@ -48,25 +44,36 @@ module DummyApp
   end
 
   class Application < ::Rails::Application
-    config.eager_load                                 = false
-    config.cache_classes                              = true
-    config.cache_store                                = :memory_store
-    config.serve_static_assets                        = true
-    config.public_file_server.headers                 = { 'Cache-Control' => 'public, max-age=3600' }
-    config.whiny_nils                                 = true
-    config.consider_all_requests_local                = true
+    config.eager_load = false
+    config.cache_classes = true
+    config.cache_store = :memory_store
+    config.serve_static_assets = true
+    config.public_file_server.headers = { 'Cache-Control' => 'public, max-age=3600' }
+    config.whiny_nils = true
+    config.consider_all_requests_local = true
     config.action_controller.allow_forgery_protection = true
-    config.action_controller.perform_caching          = false
-    config.action_dispatch.show_exceptions            = false
-    config.active_support.deprecation                 = :stderr
-    config.action_mailer.delivery_method              = :test
-    config.active_support.deprecation                 = :stderr
-    config.secret_key_base                            = 'SECRET_TOKEN'
-
-    if RAILS_52_OR_ABOVE
-      config.action_controller.default_protect_from_forgery = true
-      unless RAILS_6_OR_ABOVE
-        config.active_record.sqlite3.represent_boolean_as_integer = true
+    config.action_controller.default_protect_from_forgery = true
+    config.action_controller.perform_caching = false
+    config.action_dispatch.show_exceptions = false
+    config.active_support.deprecation = :stderr
+    config.action_mailer.delivery_method = :test
+    config.active_support.deprecation = :stderr
+    config.secret_key_base = 'SECRET_TOKEN'
+
+    config.action_mailer.delivery_job = "ActionMailer::MailDeliveryJob" if RAILS_6_OR_ABOVE
+    config.active_record.sqlite3.represent_boolean_as_integer = true unless RAILS_6_OR_ABOVE
+
+    config.storage_path = Rails.root.join('tmp', 'storage')
+
+    if ENV['ENABLE_ACTIVE_STORAGE']
+      initializer 'solidus.active_storage' do
+        config.active_storage.service_configurations = {
+          test: {
+            service: 'Disk',
+            root: config.storage_path
+          }
+        }
+        config.active_storage.service = :test
       end
     end
 
@@ -107,7 +114,21 @@ end
 
 Spree.user_class = 'Spree::LegacyUser'
 Spree.config do |config|
+  config.use_legacy_address_state_validator = false
   config.mails_from = "store@example.com"
+  config.raise_with_invalid_currency = false
+  config.redirect_back_on_unauthorized = true
+  config.run_order_validations_on_order_updater = true
+  config.use_combined_first_and_last_name_in_address = true
+  config.use_legacy_order_state_machine = false
+  config.use_custom_cancancan_actions = false
+  config.consider_actionless_promotion_active = false
+  config.use_legacy_store_credit_reimbursement_category_name = false
+
+  if ENV['ENABLE_ACTIVE_STORAGE']
+    config.image_attachment_module = 'Spree::Image::ActiveStorageAttachment'
+    config.taxon_attachment_module = 'Spree::Taxon::ActiveStorageAttachment'
+  end
 end
 
 # Raise on deprecation warnings

data/lib/spree/testing_support/dummy_app/migrations.rb

@@ -15,12 +15,8 @@ module DummyApp
 
     def needs_migration?
       return true if !database_exists?
-      if ActiveRecord::Base.connection.respond_to?(:migration_context)
-        # Rails >= 5.2
-        ActiveRecord::Base.connection.migration_context.needs_migration?
-      else
-        ActiveRecord::Migrator.needs_migration?
-      end
+
+      ActiveRecord::Base.connection.migration_context.needs_migration?
     end
 
     def auto_migrate
@@ -31,6 +27,9 @@ module DummyApp
         ActiveRecord::Base.remove_connection
 
         sh 'rake db:reset VERBOSE=false'
+        if ENV['ENABLE_ACTIVE_STORAGE']
+          sh 'rake active_storage:install db:migrate VERBOSE=false'
+        end
 
         # We have a brand new database, so we must re-establish our connection
         ActiveRecord::Base.establish_connection

data/lib/spree/testing_support/dummy_app/rake_tasks.rb

@@ -43,10 +43,8 @@ namespace :db do
           [path],
           ActiveRecord::SchemaMigration
         ).migrate
-      elsif Rails.gem_version >= Gem::Version.new('5.2.0')
-        ActiveRecord::MigrationContext.new([path]).migrate
       else
-        ActiveRecord::Migrator.migrate(path)
+        ActiveRecord::MigrationContext.new([path]).migrate
       end
     end
 

data/lib/spree/testing_support/factories.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'factory_bot'
+require 'spree/testing_support'
 
-Dir["#{File.dirname(__FILE__)}/factories/**"].each do |f|
-  require File.expand_path(f)
-end
+Spree::TestingSupport.load_all_factories

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support/factories/state_factory'
-require 'spree/testing_support/factories/country_factory'
+require 'spree/testing_support'
+Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
 
 FactoryBot.define do
   factory :address, class: 'Spree::Address' do
@@ -11,8 +11,7 @@ FactoryBot.define do
       state_code { 'AL' }
     end
 
-    firstname { 'John' }
-    lastname { nil }
+    name { 'John Von Doe' }
     company { 'Company' }
     address1 { '10 Lovely Street' }
     address2 { 'Northwest' }

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

@@ -1,10 +1,7 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support/factories/line_item_factory'
-require 'spree/testing_support/factories/order_factory'
-require 'spree/testing_support/factories/tax_category_factory'
-require 'spree/testing_support/factories/tax_rate_factory'
-require 'spree/testing_support/factories/zone_factory'
+require 'spree/testing_support'
+Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
 
 FactoryBot.define do
   factory :adjustment, class: 'Spree::Adjustment' do

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

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require 'spree/testing_support'
+Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
+
 FactoryBot.define do
   factory :adjustment_reason, class: 'Spree::AdjustmentReason' do
     sequence(:name) { |n| "Refund for return ##{n}" }

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

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require 'spree/testing_support'
+Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
+
 FactoryBot.define do
   factory :calculator, aliases: [:flat_rate_calculator], class: 'Spree::Calculator::FlatRate' do
     preferred_amount { 10.0 }

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support/factories/shipment_factory'
-require 'spree/testing_support/factories/inventory_unit_factory'
+require 'spree/testing_support'
+Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
 
 FactoryBot.define do
   factory :carton, class: 'Spree::Carton' do

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

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require 'spree/testing_support'
+Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
+
 require 'carmen'
 
 FactoryBot.define do

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

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require 'spree/testing_support'
+Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
+
 FactoryBot.define do
   factory :credit_card, class: 'Spree::CreditCard' do
     verification_value { 123 }

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

@@ -1,8 +1,7 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support/factories/stock_location_factory'
-require 'spree/testing_support/factories/order_factory'
-require 'spree/testing_support/factories/return_item_factory'
+require 'spree/testing_support'
+Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
 
 FactoryBot.define do
   factory :customer_return, class: 'Spree::CustomerReturn' do

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

@@ -1,7 +1,10 @@
 # frozen_string_literal: true
 
+require 'spree/testing_support'
+Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
+
 FactoryBot.define do
   factory :image, class: 'Spree::Image' do
-    attachment { File.new(Spree::Core::Engine.root + 'spec/fixtures/thinking-cat.jpg') }
+    attachment { Spree::Core::Engine.root.join('lib', 'spree', 'testing_support', 'fixtures', 'blank.jpg').open }
   end
 end

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

@@ -1,9 +1,7 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support/factories/line_item_factory'
-require 'spree/testing_support/factories/variant_factory'
-require 'spree/testing_support/factories/order_factory'
-require 'spree/testing_support/factories/shipment_factory'
+require 'spree/testing_support'
+Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
 
 FactoryBot.define do
   factory :inventory_unit, class: 'Spree::InventoryUnit' do

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support/factories/order_factory'
-require 'spree/testing_support/factories/product_factory'
+require 'spree/testing_support'
+Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
 
 FactoryBot.define do
   factory :line_item, class: 'Spree::LineItem' do

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

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require 'spree/testing_support'
+Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
+
 FactoryBot.define do
   factory :option_type, class: 'Spree::OptionType' do
     sequence(:name) { |n| "foo-size-#{n}" }

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

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require 'spree/testing_support'
+Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
+
 FactoryBot.define do
   factory :option_value, class: 'Spree::OptionValue' do
     sequence(:name) { |n| "Size-#{n}" }

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

@@ -1,11 +1,7 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support/factories/address_factory'
-require 'spree/testing_support/factories/shipment_factory'
-require 'spree/testing_support/factories/store_factory'
-require 'spree/testing_support/factories/user_factory'
-require 'spree/testing_support/factories/line_item_factory'
-require 'spree/testing_support/factories/payment_factory'
+require 'spree/testing_support'
+Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
 
 FactoryBot.define do
   factory :order, class: 'Spree::Order' do

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support/factories/order_factory'
-require 'spree/testing_support/factories/promotion_factory'
+require 'spree/testing_support'
+Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
 
 FactoryBot.define do
   factory :order_promotion, class: 'Spree::OrderPromotion' do

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

@@ -1,9 +1,7 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support/factories/payment_method_factory'
-require 'spree/testing_support/factories/credit_card_factory'
-require 'spree/testing_support/factories/order_factory'
-require 'spree/testing_support/factories/store_credit_factory'
+require 'spree/testing_support'
+Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
 
 FactoryBot.define do
   factory :payment, aliases: [:credit_card_payment], class: 'Spree::Payment' do

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

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require 'spree/testing_support'
+Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
+
 FactoryBot.define do
   factory :payment_method, aliases: [:credit_card_payment_method], class: 'Spree::PaymentMethod::BogusCreditCard' do
     name { 'Credit Card' }

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

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support/factories/variant_factory'
+require 'spree/testing_support'
+Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
 
 FactoryBot.define do
   factory :price, class: 'Spree::Price' do

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

@@ -1,10 +1,7 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support/sequences'
-require 'spree/testing_support/factories/shipping_category_factory'
-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'
+require 'spree/testing_support'
+Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
 
 FactoryBot.define do
   factory :base_product, class: 'Spree::Product' do

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support/factories/product_factory'
-require 'spree/testing_support/factories/option_type_factory'
+require 'spree/testing_support'
+Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
 
 FactoryBot.define do
   factory :product_option_type, class: 'Spree::ProductOptionType' do

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support/factories/product_factory'
-require 'spree/testing_support/factories/property_factory'
+require 'spree/testing_support'
+Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
 
 FactoryBot.define do
   factory :product_property, class: 'Spree::ProductProperty' do

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

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require 'spree/testing_support'
+Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
+
 FactoryBot.define do
   factory :promotion_category, class: 'Spree::PromotionCategory' do
     name { 'Promotion Category' }