solidus_core 3.0.2 → 3.1.0

data/lib/spree/testing_support/dummy_app.rb

@@ -46,35 +46,53 @@ module DummyApp
   end
 
   class Application < ::Rails::Application
-    config.has_many_inverse = true
-    config.eager_load = false
+    config.load_defaults("#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}")
+    # Make the test environment more production-like:
     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 = 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
+
+    # Make debugging easier:
+    config.consider_all_requests_local = true
     config.action_dispatch.show_exceptions = false
     config.active_support.deprecation = :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
+    # Set the preview path within the dummy app:
     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
 
-    config.storage_path = Rails.root.join('tmp', 'storage')
+    config.active_record.sqlite3.represent_boolean_as_integer = true unless RAILS_6_OR_ABOVE
+    config.active_record.dump_schema_after_migration = false
 
+    # Configure active storage to use storage within tmp folder
     unless ENV['DISABLE_ACTIVE_STORAGE']
       initializer 'solidus.active_storage' do
         config.active_storage.service_configurations = {
           test: {
             service: 'Disk',
-            root: config.storage_path
+            root: Rails.root.join('tmp', 'storage')
           }
         }
         config.active_storage.service = :test
@@ -95,12 +113,8 @@ module DummyApp
     config.paths['db/migrate'] = migration_dirs
     ActiveRecord::Migrator.migrations_paths = migration_dirs
 
-    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.paths["config/database"] = File.expand_path('dummy_app/database.yml', __dir__)
     config.paths['app/views'] = File.expand_path('dummy_app/views', __dir__)
@@ -117,6 +131,7 @@ 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"
 

data/lib/tasks/solidus/delete_prices_with_nil_amount.rake

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+namespace :solidus do
+  desc "Delete Spree::Price records which amount field is NULL"
+  task delete_prices_with_nil_amount: :environment do
+    Spree::Price.where(amount: nil).delete_all
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solidus_core
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.1.0
 platform: ruby
 authors:
 - Solidus Team
@@ -609,7 +609,6 @@ files:
 - app/models/spree/tax/item_tax.rb
 - app/models/spree/tax/order_adjuster.rb
 - app/models/spree/tax/order_tax.rb
-- app/models/spree/tax/shipping_rate_taxer.rb
 - app/models/spree/tax/tax_helpers.rb
 - app/models/spree/tax/tax_location.rb
 - app/models/spree/tax_calculator/default.rb
@@ -705,6 +704,7 @@ files:
 - db/migrate/20200530111458_add_bcc_email_to_spree_stores.rb
 - db/migrate/20201008213609_add_discontinue_on_to_spree_products.rb
 - db/migrate/20210122110141_add_name_to_spree_addresses.rb
+- db/migrate/20210312061050_change_column_null_on_prices.rb
 - db/seeds.rb
 - lib/generators/solidus/install/install_generator.rb
 - lib/generators/solidus/install/templates/config/initializers/spree.rb.tt
@@ -712,6 +712,8 @@ files:
 - lib/generators/solidus/install/templates/vendor/assets/javascripts/spree/frontend/all.js
 - lib/generators/solidus/install/templates/vendor/assets/stylesheets/spree/backend/all.css
 - lib/generators/solidus/install/templates/vendor/assets/stylesheets/spree/frontend/all.css
+- lib/generators/solidus/update/templates/config/initializers/new_solidus_defaults.rb.tt
+- lib/generators/solidus/update/update_generator.rb
 - lib/generators/spree/custom_user/custom_user_generator.rb
 - lib/generators/spree/custom_user/templates/authentication_helpers.rb.tt
 - lib/generators/spree/custom_user/templates/migration.rb.tt
@@ -765,6 +767,7 @@ files:
 - lib/spree/core/stock_configuration.rb
 - lib/spree/core/validators/email.rb
 - lib/spree/core/version.rb
+- lib/spree/core/versioned_value.rb
 - lib/spree/deprecation.rb
 - lib/spree/encryptor.rb
 - lib/spree/event.rb
@@ -804,6 +807,7 @@ files:
 - lib/spree/preferences/persistable.rb
 - lib/spree/preferences/preferable.rb
 - lib/spree/preferences/preferable_class_methods.rb
+- lib/spree/preferences/preference_differentiator.rb
 - lib/spree/preferences/scoped_store.rb
 - lib/spree/preferences/static_model_preferences.rb
 - lib/spree/preferences/statically_configurable.rb
@@ -903,7 +907,7 @@ files:
 - lib/spree/testing_support/url_helpers.rb
 - lib/spree/user_class_handle.rb
 - lib/spree_core.rb
-- lib/tasks/upgrade.rake
+- lib/tasks/solidus/delete_prices_with_nil_amount.rake
 - solidus_core.gemspec
 - vendor/assets/javascripts/jquery.payment.js
 - vendor/assets/javascripts/jsuri.js

data/app/models/spree/tax/shipping_rate_taxer.rb

@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-
-module Spree
-  module Tax
-    # Used to build shipping rate taxes
-    class ShippingRateTaxer
-      # Build shipping rate taxes for a shipping rate
-      # Modifies the passed-in shipping rate with associated shipping rate taxes.
-      # @param [Spree::ShippingRate] shipping_rate The shipping rate to add taxes to.
-      #   This parameter will be modified.
-      # @return [Spree::ShippingRate] The shipping rate with associated tax objects
-      def tax(shipping_rate)
-        taxes = Spree::Config.shipping_rate_tax_calculator_class.new(shipping_rate.order).calculate(shipping_rate)
-        taxes.each do |tax|
-          shipping_rate.taxes.build(
-            amount: tax.amount,
-            tax_rate: tax.tax_rate
-          )
-        end
-        shipping_rate
-      end
-    end
-  end
-end

data/lib/tasks/upgrade.rake

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-namespace :solidus do
-  namespace :upgrade do
-    task three_point_zero: [
-        'railties:install:migrations',
-        'db:migrate'
-      ] do
-      puts "Your Solidus install is ready for Solidus 3.0"
-    end
-  end
-
-  desc "Upgrade to the current Solidus version"
-  task upgrade: 'upgrade:three_point_zero'
-end