solidus_core 3.0.0 → 4.5.1

data/lib/spree/testing_support/dummy_app/assets/javascripts/spree/backend/all.js

@@ -1,5 +1,5 @@
 // This is a manifest file that'll be compiled into including all the files listed below.
-// Add new JavaScript/Coffee code in separate files in this directory and they'll automatically
+// Add new JavaScript code in separate files in this directory and they'll automatically
 // be included in the compiled file accessible from http://example.com/assets/application.js
 // It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
 // the compiled file.

data/lib/spree/testing_support/dummy_app/assets/stylesheets/solidus_admin/tailwind.css

@@ -0,0 +1 @@
+/* Placeholder for compiled tailwind.css file */

data/lib/spree/testing_support/dummy_app/database.yml

@@ -1,34 +1,45 @@
 <%
-database_prefix = ENV['LIB_NAME'].presence || "solidus"
-%>
-<% case ENV['DB']
-when 'mysql' %>
+  adapter =
+    case ENV['DB']
+    when 'mysql2', 'mysql' then 'mysql2'
+    when 'postgresql', 'postgres' then 'postgresql'
+    when 'sqlite3', 'sqlite', '', nil then 'sqlite3'
+    else raise "Invalid DB specified " + ENV['DB'].inspect
+    end
+
+  db_host =
+    case adapter
+    when 'mysql2' then ENV['DB_MYSQL_HOST'] || ENV['DB_HOST']
+    when 'postgresql' then ENV['DB_POSTGRES_HOST'] || ENV['DB_HOST']
+    else ENV['DB_HOST']
+    end
+
+  db_prefix = ENV['LIB_NAME'].presence || "solidus"
+  db_username = ENV['DB_USERNAME']
+  db_password = ENV['DB_PASSWORD'] %>
+
+default: &default
+  adapter: <%= adapter %>
+  <% unless db_username.blank? %>username: <%= db_username %><% end %>
+  <% unless db_password.blank? %>password: <%= db_password %><% end %>
+  <% unless db_host.blank? %>host: <%= db_host %><% end %>
+  <% if adapter == 'mysql2' %>encoding: utf8<% end %>
+  <% if adapter == 'postgresql' %>min_messages: warning<% end %>
+
+<% if adapter == 'mysql2' %>
 test:
-  adapter: mysql2
-  <% if ENV['CI'] %>
-  username: root
-  password:
-  <% end %>
-  database: <%= database_prefix %>_test
-  encoding: utf8
-  <% unless ENV['DB_HOST'].blank? %>
-  host: <%= ENV['DB_HOST'] %>
-  <% end %>
-<% when 'postgres', 'postgresql' %>
-<% db_host = ENV['DB_HOST'] %>
+  <<: *default
+  database: <%= db_prefix %>_test
+
+<% elsif adapter == 'postgresql' %>
 test:
-  adapter: postgresql
-  database: <%= database_prefix %>_test
-  username: postgres
-  min_messages: warning
-<% unless db_host.blank? %>
-  host: <%= db_host %>
-<% end %>
-<% when 'sqlite', '', nil %>
+  <<: *default
+  database: <%= db_prefix %>_test
+
+<% elsif adapter == 'sqlite3' %>
 test:
-  adapter: sqlite3
-  database: db/<%= database_prefix %>_test.sqlite3
+  <<: *default
+  database: db/<%= db_prefix %>_test.sqlite3
   timeout: 10000
-<% else %>
-  <% raise "Invalid DB specified: #{ENV['DB']}" %>
+
 <% end %>

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

@@ -4,21 +4,6 @@ module DummyApp
   module Migrations
     extend self
 
-    # Ensure database exists
-    def database_exists?
-      ActiveRecord::Base.connection
-    rescue ActiveRecord::NoDatabaseError
-      false
-    else
-      true
-    end
-
-    def needs_migration?
-      return true if !database_exists?
-
-      ActiveRecord::Base.connection.migration_context.needs_migration?
-    end
-
     def auto_migrate
       if needs_migration?
         puts "Configuration changed. Re-running migrations"
@@ -35,6 +20,14 @@ module DummyApp
 
     private
 
+    def needs_migration?
+      ActiveRecord::Migration.check_all_pending!
+    rescue ActiveRecord::PendingMigrationError, ActiveRecord::NoDatabaseError
+      true
+    else
+      false
+    end
+
     def sh(cmd)
       puts cmd
       system cmd

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

@@ -10,8 +10,8 @@ module DummyApp
         require lib_name
         require 'spree/testing_support/dummy_app'
         DummyApp.setup(
-          gem_root: gem_root,
-          lib_name: lib_name,
+          gem_root:,
+          lib_name:,
           auto_migrate: false
         )
       end
@@ -38,14 +38,7 @@ namespace :db do
     # railties:install:migrations and then db:migrate.
     # Migrations should be run one directory at a time
     ActiveRecord::Migrator.migrations_paths.each do |path|
-      if Rails.gem_version >= Gem::Version.new('6.0.0')
-        ActiveRecord::MigrationContext.new(
-          [path],
-          ActiveRecord::SchemaMigration
-        ).migrate
-      else
-        ActiveRecord::MigrationContext.new([path]).migrate
-      end
+      ActiveRecord::MigrationContext.new([path]).migrate
     end
 
     ActiveRecord::Base.clear_cache!

data/lib/spree/testing_support/dummy_app.rb

@@ -13,8 +13,6 @@ Rails.env = 'test'
 
 require 'solidus_core'
 
-RAILS_6_OR_ABOVE = Rails.gem_version >= Gem::Version.new('6.0')
-
 # @private
 class ApplicationController < ActionController::Base
   protect_from_forgery with: :exception
@@ -22,6 +20,7 @@ end
 
 # @private
 class ApplicationRecord < ActiveRecord::Base
+  self.abstract_class = true
 end
 
 # @private
@@ -36,9 +35,18 @@ end
 module DummyApp
   def self.setup(gem_root:, lib_name:, auto_migrate: true)
     ENV["LIB_NAME"] = lib_name
-    DummyApp::Application.config.root = File.join(gem_root, 'spec', 'dummy')
+    root = Pathname(gem_root).join('spec/dummy')
+    root.join("app/assets/config").mkpath
+    root.join("app/assets/config/manifest.js").write("// Intentionally empty\n")
+
+    DummyApp::Application.config.root = root
+    DummyApp::Application.initialize! unless DummyApp::Application.initialized?
 
-    DummyApp::Application.initialize!
+    # Raise on deprecation warnings.
+    # NOTE: This needs to happen after the application is initialized.
+    if ENV['SOLIDUS_RAISE_DEPRECATIONS'].present?
+      Spree.deprecator.behavior = :raise
+    end
 
     if auto_migrate
       DummyApp::Migrations.auto_migrate
@@ -46,38 +54,68 @@ 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.load_defaults("#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}")
+
+    # Make the test environment more production-like:
     config.action_controller.allow_forgery_protection = false
     config.action_controller.default_protect_from_forgery = false
+    config.action_mailer.perform_caching = false
+    config.i18n.fallbacks = true
+
+    # In the test environment, we use the `caching: true` RSpec metadata to
+    # enable caching on select specs. See
+    # core/lib/spree/testing_support/caching.rb. See also
+    # https://github.com/solidusio/solidus/issues/4110
     config.action_controller.perform_caching = false
-    config.action_dispatch.show_exceptions = false
-    config.active_support.deprecation = :stderr
+
+    # It needs to be explicitly set from Rails 7
+    # https://guides.rubyonrails.org/upgrading_ruby_on_rails.html#upgrading-from-rails-6-1-to-rails-7-0-spring
+    config.cache_classes = true
+
+    # Make debugging easier:
+    if Rails.gem_version >= Gem::Version.new('7.1')
+      config.action_controller.raise_on_missing_callback_actions = true
+      config.action_dispatch.show_exceptions = :none
+    else
+      config.action_dispatch.show_exceptions = false
+    end
+    config.consider_all_requests_local = true
+    config.active_support.deprecation = ENV['RAILS_DEPRECATIONS_BEHAVIOR'].presence&.to_sym || :stderr
+    config.log_level = :debug
+
+    # Improve test suite performance:
+    config.eager_load = false
+    config.public_file_server.headers = { 'Cache-Control' => 'public, max-age=3600' }
+    config.cache_store = :memory_store
+
+    # We don't use a web server, so we let Rails serve assets.
+    config.public_file_server.enabled = true
+
+    # We don't want to send email in the test environment.
     config.action_mailer.delivery_method = :test
-    config.active_support.deprecation = :stderr
+
+    # No need to use credentials file in a test environment.
     config.secret_key_base = 'SECRET_TOKEN'
 
-    config.action_mailer.delivery_job = "ActionMailer::MailDeliveryJob" if RAILS_6_OR_ABOVE
-    config.action_mailer.preview_path = File.expand_path('dummy_app/mailer_previews', __dir__)
-    config.active_record.sqlite3.represent_boolean_as_integer = true unless RAILS_6_OR_ABOVE
+    # Set the preview path within the dummy app:
+    if ActionMailer::Base.respond_to? :preview_paths # Rails 7.1+
+      config.action_mailer.preview_paths << File.expand_path('dummy_app/mailer_previews', __dir__)
+    else
+      config.action_mailer.preview_path = File.expand_path('dummy_app/mailer_previews', __dir__)
+    end
 
-    config.storage_path = Rails.root.join('tmp', 'storage')
+    config.active_record.dump_schema_after_migration = false
 
-    unless ENV['DISABLE_ACTIVE_STORAGE']
-      initializer 'solidus.active_storage' do
-        config.active_storage.service_configurations = {
-          test: {
-            service: 'Disk',
-            root: config.storage_path
-          }
+    # Configure active storage to use storage within tmp folder
+    initializer 'solidus.active_storage' do
+      config.active_storage.service_configurations = {
+        test: {
+          service: 'Disk',
+          root: Rails.root.join('tmp', 'storage')
         }
-        config.active_storage.service = :test
-      end
+      }
+      config.active_storage.service = :test
+      config.active_storage.variant_processor = ENV.fetch('ACTIVE_STORAGE_VARIANT_PROCESSOR', :vips).to_sym
     end
 
     # Avoid issues if an old spec/dummy still exists
@@ -93,16 +131,13 @@ module DummyApp
     end
     config.paths['db/migrate'] = migration_dirs
     ActiveRecord::Migrator.migrations_paths = migration_dirs
+    ActiveRecord::Migration.verbose = false
 
-    config.action_controller.include_all_helpers = false
-
-    if config.respond_to?(:assets)
-      config.assets.paths << File.expand_path('dummy_app/assets/javascripts', __dir__)
-      config.assets.paths << File.expand_path('dummy_app/assets/stylesheets', __dir__)
-    end
+    config.assets.paths << File.expand_path('dummy_app/assets/javascripts', __dir__)
+    config.assets.paths << File.expand_path('dummy_app/assets/stylesheets', __dir__)
+    config.assets.css_compressor = nil
 
     config.paths["config/database"] = File.expand_path('dummy_app/database.yml', __dir__)
-    config.paths['app/views'] = File.expand_path('dummy_app/views', __dir__)
     config.paths['config/routes.rb'] = File.expand_path('dummy_app/routes.rb', __dir__)
 
     ActionMailer::Base.default from: "store@example.com"
@@ -116,16 +151,10 @@ ActiveSupport.on_load(:action_controller) do
 end
 
 Spree.user_class = 'Spree::LegacyUser'
+Spree.load_defaults(Spree.solidus_version)
 Spree.config do |config|
-  config.mails_from = "store@example.com"
-
-  if ENV['DISABLE_ACTIVE_STORAGE']
+  if (ENV['DISABLE_ACTIVE_STORAGE'] == 'true')
     config.image_attachment_module = 'Spree::Image::PaperclipAttachment'
     config.taxon_attachment_module = 'Spree::Taxon::PaperclipAttachment'
   end
 end
-
-# Raise on deprecation warnings
-if ENV['SOLIDUS_RAISE_DEPRECATIONS'].present?
-  Spree::Deprecation.behavior = :raise
-end

data/lib/spree/testing_support/extension_rake.rb

@@ -4,8 +4,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'].invoke(args[:user_class])
   end
 end

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

@@ -1,12 +1,5 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support/factory_bot'
-Spree::TestingSupport::FactoryBot.when_cherry_picked do
-  Spree::TestingSupport::FactoryBot.deprecate_cherry_picking
-
-  require 'spree/testing_support/factories/state_factory'
-  require 'spree/testing_support/factories/country_factory'
-end
 FactoryBot.define do
   factory :address, class: 'Spree::Address' do
     transient do
@@ -24,16 +17,19 @@ FactoryBot.define do
     phone { '555-555-0199' }
     alternative_phone { '555-555-0199' }
 
-    state do |address|
-      Spree::State.joins(:country).where('spree_countries.iso = (?)', country_iso_code).find_by(abbr: state_code) ||
-        address.association(:state, country_iso: country_iso_code, state_code: state_code)
-    end
-
     country do |address|
       if address.state
         address.state.country
       else
-        address.association(:country, iso: country_iso_code)
+        Spree::Country.find_by(iso: country_iso_code) ||
+          address.association(:country, strategy: :create, iso: country_iso_code)
+      end
+    end
+
+    after(:build) do |address, evaluator|
+      if address&.country&.states_required? && address.state.nil? && address.state_name.nil?
+        address.state = address.country.states.find_by(abbr: evaluator.state_code) ||
+          create(:state, country_iso: address.country.iso, state_code: evaluator.state_code)
       end
     end
   end

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

@@ -1,16 +1,5 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support/factory_bot'
-Spree::TestingSupport::FactoryBot.when_cherry_picked do
-  Spree::TestingSupport::FactoryBot.deprecate_cherry_picking
-
-  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'
-end
-
 FactoryBot.define do
   factory :adjustment, class: 'Spree::Adjustment' do
     order
@@ -18,7 +7,6 @@ FactoryBot.define do
     amount { 100.0 }
     label { 'Shipping' }
     association(:source, factory: :tax_rate)
-    eligible { true }
 
     after(:build) do |adjustment|
       adjustments = adjustment.adjustable.adjustments
@@ -42,7 +30,7 @@ FactoryBot.define do
             adjustment.source.tax_categories = []
           end
           adjustment.source.save
-          adjustment.recalculate
+          adjustment.update!(amount: adjustment.source.compute_amount(adjustment.adjustable))
         end
       end
     end

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

@@ -1,10 +1,5 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support/factory_bot'
-Spree::TestingSupport::FactoryBot.when_cherry_picked do
-  Spree::TestingSupport::FactoryBot.deprecate_cherry_picking
-end
-
 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,12 +1,7 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support/factory_bot'
-Spree::TestingSupport::FactoryBot.when_cherry_picked do
-  Spree::TestingSupport::FactoryBot.deprecate_cherry_picking
-end
-
 FactoryBot.define do
-  factory :calculator, aliases: [:flat_rate_calculator], class: 'Spree::Calculator::FlatRate' do
+  factory :flat_rate_calculator, aliases: [:calculator], class: 'Spree::Calculator::FlatRate' do
     preferred_amount { 10.0 }
   end
 
@@ -17,6 +12,9 @@ FactoryBot.define do
   factory :default_tax_calculator, class: 'Spree::Calculator::DefaultTax' do
   end
 
+  factory :flat_fee_calculator, class: 'Spree::Calculator::FlatFee' do
+  end
+
   factory :shipping_calculator, class: 'Spree::Calculator::Shipping::FlatRate' do
     preferred_amount { 10.0 }
   end
@@ -24,8 +22,4 @@ FactoryBot.define do
   factory :shipping_no_amount_calculator, class: 'Spree::Calculator::Shipping::FlatRate' do
     preferred_amount { 0 }
   end
-
-  factory :percent_on_item_calculator, class: 'Spree::Calculator::PercentOnLineItem' do
-    preferred_percent { 10 }
-  end
 end

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

@@ -1,13 +1,5 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support/factory_bot'
-Spree::TestingSupport::FactoryBot.when_cherry_picked do
-  Spree::TestingSupport::FactoryBot.deprecate_cherry_picking
-
-  require 'spree/testing_support/factories/shipment_factory'
-  require 'spree/testing_support/factories/inventory_unit_factory'
-end
-
 FactoryBot.define do
   factory :carton, class: 'Spree::Carton' do
     address
@@ -21,8 +13,8 @@ FactoryBot.define do
           # ensure the shipment uses the same stock location as the carton
           shipment: build(
             :shipment,
-            stock_location: stock_location,
-            shipping_method: shipping_method
+            stock_location:,
+            shipping_method:
           )
         )
       ]

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

@@ -1,10 +1,5 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support/factory_bot'
-Spree::TestingSupport::FactoryBot.when_cherry_picked do
-  Spree::TestingSupport::FactoryBot.deprecate_cherry_picking
-end
-
 require 'carmen'
 
 FactoryBot.define do
@@ -20,7 +15,6 @@ FactoryBot.define do
     iso3 { carmen_country.alpha_3_code }
     numcode { carmen_country.numeric_code }
 
-    # FIXME: We should set states required, but it causes failing tests
-    # states_required { carmen_country.subregions? }
+    states_required { carmen_country.subregions? }
   end
 end

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

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

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

@@ -1,14 +1,5 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support/factory_bot'
-Spree::TestingSupport::FactoryBot.when_cherry_picked do
-  Spree::TestingSupport::FactoryBot.deprecate_cherry_picking
-
-  require 'spree/testing_support/factories/stock_location_factory'
-  require 'spree/testing_support/factories/order_factory'
-  require 'spree/testing_support/factories/return_item_factory'
-end
-
 FactoryBot.define do
   factory :customer_return, class: 'Spree::CustomerReturn' do
     association(:stock_location, factory: :stock_location)
@@ -16,13 +7,13 @@ FactoryBot.define do
     transient do
       line_items_count { 1 }
       return_items_count { line_items_count }
-      shipped_order { create :shipped_order, line_items_count: line_items_count }
+      shipped_order { create :shipped_order, line_items_count: }
       return_authorization { create :return_authorization, order: shipped_order }
     end
 
     before(:create) do |customer_return, evaluator|
       evaluator.shipped_order.inventory_units.take(evaluator.return_items_count).each do |inventory_unit|
-        customer_return.return_items << build(:return_item, inventory_unit: inventory_unit, return_authorization: evaluator.return_authorization)
+        customer_return.return_items << build(:return_item, inventory_unit:, return_authorization: evaluator.return_authorization)
       end
     end
 

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

@@ -1,10 +1,5 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support/factory_bot'
-Spree::TestingSupport::FactoryBot.when_cherry_picked do
-  Spree::TestingSupport::FactoryBot.deprecate_cherry_picking
-end
-
 FactoryBot.define do
   factory :image, class: 'Spree::Image' do
     attachment { Spree::Core::Engine.root.join('lib', 'spree', 'testing_support', 'fixtures', 'blank.jpg').open }

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

@@ -1,15 +1,5 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support/factory_bot'
-Spree::TestingSupport::FactoryBot.when_cherry_picked do
-  Spree::TestingSupport::FactoryBot.deprecate_cherry_picking
-
-  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'
-end
-
 FactoryBot.define do
   factory :inventory_unit, class: 'Spree::InventoryUnit' do
     transient do
@@ -17,18 +7,18 @@ FactoryBot.define do
       stock_location { nil }
     end
 
-    variant
+    association :variant, strategy: :create
     line_item do
       if order
-        build(:line_item, variant: variant, order: order)
+        build(:line_item, variant:, order:)
       else
-        build(:line_item, variant: variant)
+        build(:line_item, variant:)
       end
     end
     state { 'on_hand' }
     shipment do
       if stock_location
-        build(:shipment, state: 'pending', order: line_item.order, stock_location: stock_location)
+        build(:shipment, state: 'pending', order: line_item.order, stock_location:)
       else
         build(:shipment, state: 'pending', order: line_item.order)
       end

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

@@ -1,13 +1,5 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support/factory_bot'
-Spree::TestingSupport::FactoryBot.when_cherry_picked do
-  Spree::TestingSupport::FactoryBot.deprecate_cherry_picking
-
-  require 'spree/testing_support/factories/order_factory'
-  require 'spree/testing_support/factories/product_factory'
-end
-
 FactoryBot.define do
   factory :line_item, class: 'Spree::LineItem' do
     quantity { 1 }

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

@@ -1,13 +1,5 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support/factory_bot'
-Spree::TestingSupport::FactoryBot.when_cherry_picked do
-  Spree::TestingSupport::FactoryBot.deprecate_cherry_picking
-
-  require 'spree/testing_support/factories/product_factory'
-  require 'spree/testing_support/factories/option_type_factory'
-end
-
 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,10 +1,5 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support/factory_bot'
-Spree::TestingSupport::FactoryBot.when_cherry_picked do
-  Spree::TestingSupport::FactoryBot.deprecate_cherry_picking
-end
-
 FactoryBot.define do
   factory :option_value, class: 'Spree::OptionValue' do
     sequence(:name) { |n| "Size-#{n}" }