solidus_core 4.0.0 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 677b2f47102db33dd5b14575dc05d083d724328c5715eb041260fa5eff1888d8
-  data.tar.gz: 80193fd6f6737c2e3d8e5227ef8bbed008bfd98826a26b73be775402615cdd0b
+  metadata.gz: c3e2c6952c5346f716b691621d06c35fa50cdd42a1071b449495be31f2358c15
+  data.tar.gz: cf282e7b402f07c2a33f300fbe61aef661fbb31f5b1a6889887149d2bfcadca1
 SHA512:
-  metadata.gz: 3862a797f6ae51be78ec7115d8becfe0d741f79d84e9f8223661054338f0deba010d438b29ba8bce3d50579490be97054feabf171fe4d0ce3dbddf6cf0e22436
-  data.tar.gz: 707096c5ad49198707ea0ed90dc11dd0a8debcc845d2b52e30f819cd7b9a22fb473894710db1eb618fe4b7344ca9776af3619378677f5b0b849fdd647d7be96a
+  metadata.gz: 8240824eb568d985249690d9a49382a6b25d2d4f7f5c6d8d17d30bfa2fd0cb9af579e5ee01b16828cbacdadad3b9b4524d804ce42aaab08e94b211ce08f8d439
+  data.tar.gz: 20b8afa05c9068af3635aadb658302f0ecee745a50bbb0b6230db6fbec758de6cb594a22ddc147e8c655e9cd1ac8babb827701979bc912836b091273f7d2e1af

data/README.md

@@ -5,7 +5,7 @@ Solidus system depends.
 
 Core models
 -----------
-Solidus implements over 200 [models](https://github.com/solidusio/solidus/tree/master/core/app/models/spree),
+Solidus implements over 200 [models](https://github.com/solidusio/solidus/tree/main/core/app/models/spree),
 and thus a deep inspection of each in this README would be overkill. Instead,
 let's take a quick look at the fundamental models upon which all else depend.
 Currently, these models remain in the Spree namespace as part of the legacy of

data/app/controllers/spree/base_controller.rb

@@ -11,6 +11,4 @@ class Spree::BaseController < ApplicationController
   include Spree::Core::ControllerHelpers::Search
   include Spree::Core::ControllerHelpers::Store
   include Spree::Core::ControllerHelpers::StrongParameters
-
-  respond_to :html
 end

data/app/models/spree/order.rb

@@ -154,6 +154,8 @@ module Spree
       find_by! number: value
     end
 
+    delegate :recalculate, to: :recalculator
+
     delegate :name, to: :bill_address, prefix: true, allow_nil: true
     alias_method :billing_name, :bill_address_name
 
@@ -258,13 +260,11 @@ module Spree
       end || store&.default_cart_tax_location
     end
 
-    def updater
-      @updater ||= Spree::OrderUpdater.new(self)
-    end
-
-    def recalculate
-      updater.update
+    def recalculator
+      @recalculator ||= Spree::Config.order_recalculator_class.new(self)
     end
+    alias_method :updater, :recalculator
+    deprecate updater: :recalculator, deprecator: Spree::Deprecation
 
     def assign_billing_to_shipping_address
       self.ship_address = bill_address if bill_address
@@ -397,7 +397,7 @@ module Spree
 
     def fulfill!
       shipments.each { |shipment| shipment.update_state if shipment.persisted? }
-      updater.update_shipment_state
+      recalculator.update_shipment_state
       save!
     end
 
@@ -502,12 +502,9 @@ module Spree
       recalculate
     end
 
-    # Clean shipments and make order back to address state
-    #
-    # At some point the might need to force the order to transition from address
-    # to delivery again so that proper updated shipments are created.
-    # e.g. customer goes back from payment step and changes order items
-    def ensure_updated_shipments
+    # Clean shipments and make order back to address state (or to whatever state
+    # is set by restart_checkout_flow in case of state machine modifications)
+    def check_shipments_and_restart_checkout
       if !completed? && shipments.all?(&:pending?)
         shipments.destroy_all
         update_column(:shipment_total, 0)
@@ -515,6 +512,9 @@ module Spree
       end
     end
 
+    alias_method :ensure_updated_shipments, :check_shipments_and_restart_checkout
+    deprecate ensure_updated_shipments: :check_shipments_and_restart_checkout, deprecator: Spree::Deprecation
+
     def restart_checkout_flow
       return if state == 'cart'
 
@@ -540,9 +540,7 @@ module Spree
     def canceled_by(user)
       transaction do
         cancel!
-        # rubocop:disable Rails/SkipsModelValidations
         update_column(:canceler_id, user.id)
-        # rubocop:enable Rails/SkipsModelValidations
       end
     end
 
@@ -744,13 +742,13 @@ module Spree
       all_adjustments.each(&:finalize!)
 
       # update payment and shipment(s) states, and save
-      updater.update_payment_state
+      recalculator.update_payment_state
       shipments.each do |shipment|
         shipment.update_state
         shipment.finalize!
       end
 
-      updater.update_shipment_state
+      recalculator.update_shipment_state
       save!
 
       touch :completed_at
@@ -833,9 +831,7 @@ module Spree
       cancel_payments!
 
       send_cancel_email
-      # rubocop:disable Rails/SkipsModelValidations
       update_column(:canceled_at, Time.current)
-      # rubocop:enable Rails/SkipsModelValidations
       recalculate
     end
 

data/app/models/spree/order_contents.rb

@@ -42,7 +42,7 @@ module Spree
           # If we do not update first, then the item total will be wrong and ItemTotal
           # promotion rules would not be triggered.
           reload_totals
-          order.ensure_updated_shipments
+          order.check_shipments_and_restart_checkout
           PromotionHandler::Cart.new(order).activate
         end
         reload_totals
@@ -73,7 +73,7 @@ module Spree
     def after_add_or_remove(line_item, options = {})
       reload_totals
       shipment = options[:shipment]
-      shipment.present? ? shipment.update_amounts : order.ensure_updated_shipments
+      shipment.present? ? shipment.update_amounts : order.check_shipments_and_restart_checkout
       PromotionHandler::Cart.new(order, line_item).activate
       reload_totals
       line_item

data/app/models/spree/order_merger.rb

@@ -13,8 +13,6 @@ module Spree
     #   @return [Spree::Order] The order which items wll be merged into.
     attr_accessor :order
 
-    delegate :updater, to: :order
-
     # Create the OrderMerger
     #
     # @api public
@@ -133,13 +131,13 @@ module Spree
 
     # Save the order totals after merge
     #
-    # It triggers the order updater to ensure that item counts and totals are
+    # It triggers the order recalculator to ensure that item counts and totals are
     # up to date.
     #
     # @api private
     # @return [void]
     def persist_merge
-      updater.update
+      order.recalculate
     end
   end
 end

data/app/models/spree/order_updater.rb

@@ -16,7 +16,7 @@ module Spree
     # This method should never do anything to the Order that results in a save call on the
     # object with callbacks (otherwise you will end up in an infinite recursion as the
     # associations try to save and then in turn try to call +update!+ again.)
-    def update
+    def recalculate
       order.transaction do
         update_item_count
         update_shipment_amounts
@@ -30,6 +30,8 @@ module Spree
         persist_totals
       end
     end
+    alias_method :update, :recalculate
+    deprecate update: :recalculate, deprecator: Spree::Deprecation
 
     # Updates the +shipment_state+ attribute according to the following logic:
     #

data/app/models/spree/refund.rb

@@ -90,7 +90,7 @@ module Spree
     end
 
     def update_order
-      payment.order.updater.update
+      payment.order.recalculate
     end
   end
 end

data/app/models/spree/taxon/paperclip_attachment.rb

@@ -25,6 +25,6 @@ module Spree::Taxon::PaperclipAttachment
     attached_file = send(definition)
     return false unless attached_file.exists?
 
-    attached_file.destroy
+    attached_file.destroy && save
   end
 end

data/app/models/spree/taxon.rb

@@ -22,7 +22,7 @@ module Spree
     validates :meta_keywords, length: { maximum: 255 }
     validates :meta_description, length: { maximum: 255 }
     validates :meta_title, length: { maximum: 255 }
-    validates :taxonomy_id, uniqueness: { message: :can_have_only_one_root }, if: -> { root? }
+    validates :taxonomy_id, uniqueness: { scope: :parent_id, message: :can_have_only_one_root }, if: -> { root? }
 
     after_save :touch_ancestors_and_taxonomy
     after_touch :touch_ancestors_and_taxonomy

data/bin/rails

@@ -0,0 +1,13 @@
+#!/usr/bin/env ruby
+# This command will automatically be run when you run "rails" with Rails gems
+# installed from the root of your application.
+
+ENGINE_ROOT = File.expand_path('..', __dir__)
+ENGINE_PATH = File.expand_path('../lib/spree/core/engine', __dir__)
+
+# Set up gems listed in the Gemfile.
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __dir__)
+require "bundler/setup" if File.exist?(ENV["BUNDLE_GEMFILE"])
+
+require "rails/all"
+require "rails/engine/commands"

data/config/locales/en.yml

@@ -1598,7 +1598,6 @@ en:
     gateway_config_unavailable: Gateway unavailable for environment
     gateway_error: Gateway Error
     general: General
-    general_settings: Store
     google_analytics: Google Analytics
     google_analytics_id: Analytics ID
     group_size: Group size

data/lib/generators/solidus/install/app_templates/frontend/starter.rb

@@ -1 +1 @@
-apply 'https://github.com/solidusio/solidus_starter_frontend/raw/v4.0/template.rb'
+apply 'https://github.com/solidusio/solidus_starter_frontend/raw/v4.1/template.rb'

data/lib/generators/solidus/install/install_generator.rb

@@ -96,7 +96,7 @@ module Solidus
         rake 'active_storage:install'
       else
         say_status :assets, "Paperclip", :green
-        gsub_file 'config/initializers/spree.rb', "ActiveStorageAttachment", "PaperclipAttachment"
+        gsub_file 'config/initializers/spree.rb', "::ActiveStorageAttachment", "::PaperclipAttachment"
       end
     end
 

data/lib/spree/app_configuration.rb

@@ -357,6 +357,14 @@ module Spree
     #   with the same signature as Spree::OrderUpdateAttributes.
     class_name_attribute :order_update_attributes_class, default: 'Spree::OrderUpdateAttributes'
 
+    # Allows providing a different order recalculator.
+    # @!attribute [rw] order_recalculator_class
+    # @see Spree::OrderUpdater
+    # @return [Class] an object that conforms to the API of
+    #   the standard order recalculator class
+    #   Spree::OrderUpdater.
+    class_name_attribute :order_recalculator_class, default: 'Spree::OrderUpdater'
+
     # Allows providing your own Mailer for promotion code batch mailer.
     #
     # @!attribute [rw] promotion_code_batch_mailer_class

data/lib/spree/bus.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'omnes'
 
 module Spree

data/lib/spree/core/importer/order.rb

@@ -40,7 +40,7 @@ module Spree
             end
 
             # Really ensure that the order totals & states are correct
-            order.updater.update
+            order.recalculate
             if shipments_attrs.present?
               order.shipments.each_with_index do |shipment, index|
                 shipment.update_columns(cost: shipments_attrs[index][:cost].to_f) if shipments_attrs[index][:cost].present?

data/lib/spree/core/version.rb

@@ -1,14 +1,14 @@
 # frozen_string_literal: true
 
 module Spree
-  VERSION = "4.0.0"
+  VERSION = "4.1.0"
 
   def self.solidus_version
     VERSION
   end
 
   def self.previous_solidus_minor_version
-    '3.4'
+    '4.0'
   end
 
   def self.solidus_gem_version

data/lib/spree/migration_helpers.rb

@@ -6,9 +6,9 @@ module Spree
       remove_index(table, column) if index_exists?(table, column)
     end
 
-    def safe_add_index(table, column, options = {})
-      if columns_exist?(table, column) && !index_exists?(table, column, options)
-        add_index(table, column, options)
+    def safe_add_index(table, column, **options)
+      if columns_exist?(table, column) && !index_exists?(table, column, **options)
+        add_index(table, column, **options)
       end
     end
 

data/lib/spree/permission_sets/configuration_display.rb

@@ -2,9 +2,27 @@
 
 module Spree
   module PermissionSets
+    # Read-only permissions for e-commerce settings.
+    #
+    # Roles with this permission will be able to view information, also from the admin
+    # panel, about:
+    #
+    # - Tax categories
+    # - Tax rates
+    # - Zones
+    # - Countries
+    # - States
+    # - Payment methods
+    # - Taxonomies
+    # - Shipping methods
+    # - Shipping categories
+    # - Stock locations
+    # - Stock movements
+    # - Refund reasons
+    # - Reimbursement types
+    # - Return reasons
     class ConfigurationDisplay < PermissionSets::Base
       def activate!
-          can [:edit, :admin], :general_settings
           can [:read, :admin], Spree::TaxCategory
           can [:read, :admin], Spree::TaxRate
           can [:read, :admin], Spree::Zone

data/lib/spree/permission_sets/configuration_management.rb

@@ -2,9 +2,26 @@
 
 module Spree
   module PermissionSets
+    # Read and write permissions for e-commerce settings.
+    #
+    # Roles with this permission set will have full control over:
+    #
+    # - Tax categories
+    # - Tax rates
+    # - Zones
+    # - Countries
+    # - States
+    # - Payment methods
+    # - Taxonomies
+    # - Shipping methods
+    # - Shipping categories
+    # - Stock locations
+    # - Stock movements
+    # - Refund reasons
+    # - Reimbursement types
+    # - Return reasons
     class ConfigurationManagement < PermissionSets::Base
       def activate!
-        can :manage, :general_settings
         can :manage, Spree::TaxCategory
         can :manage, Spree::TaxRate
         can :manage, Spree::Zone

data/lib/spree/permission_sets/dashboard_display.rb

@@ -2,6 +2,11 @@
 
 module Spree
   module PermissionSets
+    # Permissions for viewing the admin dashboard.
+    #
+    # Roles with this permission set will be able to view the admin dashboard,
+    # which may or not contain sensitive information depending on
+    # customizations.
     class DashboardDisplay < PermissionSets::Base
       def activate!
           can [:admin, :home], :dashboards

data/lib/spree/permission_sets/default_customer.rb

@@ -2,6 +2,35 @@
 
 module Spree
   module PermissionSets
+    # Permissions for e-commerce customers.
+    #
+    # This permission set is always added to the `:default` role, which in turn
+    # is the default role for all users without any explicit roles.
+    #
+    # Permissions include reading and updating orders when the ability's user
+    # has been assigned as the order's user, unless the order is already
+    # completed. Same is true for guest checkout orders.
+    #
+    # It grants read-only permissions for the following resources typically used
+    # during a checkout process:
+    #
+    # - Zones
+    # - Countries
+    # - States
+    # - Taxons
+    # - Taxonomies
+    # - Products
+    # - Properties
+    # - Product properties
+    # - Variants
+    # - Option types
+    # - Option values
+    # - Stock items
+    # - Stock locations
+    #
+    # Abilities with this role can also create refund authorizations for orders
+    # with the same user, as well as reading and updating the user record and
+    # their associated cards.
     class DefaultCustomer < PermissionSets::Base
       def activate!
         can :read, Country

data/lib/spree/permission_sets/order_display.rb

@@ -2,6 +2,25 @@
 
 module Spree
   module PermissionSets
+    # Read permissions for orders.
+    #
+    # This permission set allows users to view all related information about
+    # orders, also from the admin panel, including:
+    #
+    # - Orders
+    # - Payments
+    # - Shipments
+    # - Adjustments
+    # - Line items
+    # - Return authorizations
+    # - Customer returns
+    # - Order cancellations
+    # - Reimbursements
+    # - Return items
+    # - Refunds
+    #
+    # However, it does not allow any modifications to be made to any of these
+    # resources.
     class OrderDisplay < PermissionSets::Base
       def activate!
         can [:read, :admin, :edit, :cart], Spree::Order

data/lib/spree/permission_sets/order_management.rb

@@ -2,6 +2,24 @@
 
 module Spree
   module PermissionSets
+    # Full permissions for order management.
+    #
+    # This permission set grants full control over all order and related resources,
+    # including:
+    #
+    # - Orders
+    # - Payments
+    # - Shipments
+    # - Adjustments
+    # - Line items
+    # - Return authorizations
+    # - Customer returns
+    # - Order cancellations
+    # - Reimbursements
+    # - Return items
+    # - Refunds
+    #
+    # It also allows reading reimbursement types, but not modifying them.
     class OrderManagement < PermissionSets::Base
       def activate!
         can :read, Spree::ReimbursementType

data/lib/spree/permission_sets/product_display.rb

@@ -2,6 +2,20 @@
 
 module Spree
   module PermissionSets
+    # Read-only permissions for products.
+    #
+    # This permission set allows users to view all related information about
+    # products, also from the admin panel, including:
+    #
+    # - Products
+    # - Images
+    # - Variants
+    # - Option values
+    # - Product properties
+    # - Option types
+    # - Properties
+    # - Taxonomies
+    # - Taxons
     class ProductDisplay < PermissionSets::Base
       def activate!
         can [:read, :admin, :edit], Spree::Product

data/lib/spree/permission_sets/product_management.rb

@@ -2,6 +2,22 @@
 
 module Spree
   module PermissionSets
+    # Full permissions for product management.
+    #
+    # This permission set grants full control over all product and related resources,
+    # including:
+    #
+    # - Products
+    # - Images
+    # - Variants
+    # - Option values
+    # - Product properties
+    # - Option types
+    # - Properties
+    # - Taxonomies
+    # - Taxons
+    # - Classifications
+    # - Prices
     class ProductManagement < PermissionSets::Base
       def activate!
         can :manage, Spree::Classification

data/lib/spree/permission_sets/promotion_display.rb

@@ -2,6 +2,16 @@
 
 module Spree
   module PermissionSets
+    # Read-only permissions for promotions.
+    #
+    # This permission set allows users to view all related information about
+    # promotions, also from the admin panel, including:
+    #
+    # - Promotions
+    # - Promotion rules
+    # - Promotion actions
+    # - Promotion categories
+    # - Promotion codes
     class PromotionDisplay < PermissionSets::Base
       def activate!
         can [:read, :admin, :edit], Spree::Promotion

data/lib/spree/permission_sets/promotion_management.rb

@@ -2,6 +2,16 @@
 
 module Spree
   module PermissionSets
+    # Full permissions for promotion management.
+    #
+    # This permission set grants full control over all promotion and related resources,
+    # including:
+    #
+    # - Promotions
+    # - Promotion rules
+    # - Promotion actions
+    # - Promotion categories
+    # - Promotion codes
     class PromotionManagement < PermissionSets::Base
       def activate!
         can :manage, Spree::Promotion

data/lib/spree/permission_sets/restricted_stock_display.rb

@@ -2,6 +2,11 @@
 
 module Spree
   module PermissionSets
+    # Read permissions for stock limited to allowed locations.
+    #
+    # This permission set allows users to view information about stock items and
+    # locations, both of them limited to locations they have access to.
+    # Permissions are also granted for the admin panel for items.
     class RestrictedStockDisplay < PermissionSets::Base
       def activate!
         can [:read, :admin], Spree::StockItem, stock_location_id: location_ids

data/lib/spree/permission_sets/restricted_stock_management.rb

@@ -2,6 +2,11 @@
 
 module Spree
   module PermissionSets
+    # Full permissions for stock management limited to allowed locations.
+    #
+    # This permission set grants full control over all stock items a user has
+    # access to their locations. Those locations are also readable by the
+    # corresponding ability.
     class RestrictedStockManagement < PermissionSets::Base
       def activate!
         can :manage, Spree::StockItem, stock_location_id: location_ids

data/lib/spree/permission_sets/stock_display.rb

@@ -2,6 +2,10 @@
 
 module Spree
   module PermissionSets
+    # Read-only permissions for stock.
+    #
+    # This permission set allows users to view information about stock items
+    # (also from the admin panel) and stock locations.
     class StockDisplay < PermissionSets::Base
       def activate!
         can [:read, :admin], Spree::StockItem

data/lib/spree/permission_sets/stock_management.rb

@@ -2,6 +2,10 @@
 
 module Spree
   module PermissionSets
+    # Full permissions for stock management.
+    #
+    # This permission set grants full control over all stock items and read
+    # access to locations.
     class StockManagement < PermissionSets::Base
       def activate!
         can :manage, Spree::StockItem

data/lib/spree/permission_sets/super_user.rb

@@ -2,6 +2,11 @@
 
 module Spree
   module PermissionSets
+    # Full permissions for store administration.
+    #
+    # This permission set is always added to users with the `:admin` role.
+    #
+    # It grants permission to perform any read or write action on any resource.
     class SuperUser < PermissionSets::Base
       def activate!
         can :manage, :all

data/lib/spree/permission_sets/user_display.rb

@@ -2,6 +2,10 @@
 
 module Spree
   module PermissionSets
+    # Read-only permissions for users, roles and store credits.
+    #
+    # This permission set allows users to view all related information about
+    # users, roles and store credits, also from the admin panel.
     class UserDisplay < PermissionSets::Base
       def activate!
         can [:read, :admin, :edit, :addresses, :orders, :items], Spree.user_class

data/lib/spree/permission_sets/user_management.rb

@@ -2,6 +2,15 @@
 
 module Spree
   module PermissionSets
+    # Full permissions for user management.
+    #
+    # This permission set grants full control over all user and
+    # related resources, including:
+    #
+    # - Users
+    # - Store credits
+    # - Roles
+    # - API keys
     class UserManagement < PermissionSets::Base
       def activate!
         can [:admin, :read, :create, :update, :save_in_address_book, :remove_from_address_book, :addresses, :orders, :items], Spree.user_class

data/lib/spree/testing_support/dummy_app.rb

@@ -119,7 +119,6 @@ module DummyApp
     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__)
     config.paths['config/routes.rb'] = File.expand_path('dummy_app/routes.rb', __dir__)
 
     ActionMailer::Base.default from: "store@example.com"

data/solidus_core.gemspec

@@ -65,7 +65,7 @@ $ bin/rails g solidus:update
 Please, don't forget to look at the CHANGELOG to see what has changed and
 whether you need to perform other tasks.
 
-https://github.com/solidusio/solidus/blob/master/CHANGELOG.md
+https://github.com/solidusio/solidus/blob/main/CHANGELOG.md
 
 Please report any issues at:
 - https://github.com/solidusio/solidus/issues

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_core
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.1.0
 platform: ruby
 authors:
 - Solidus Team
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-08 00:00:00.000000000 Z
+date: 2023-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -716,6 +716,7 @@ files:
 - app/views/spree/shared/_error_messages.html.erb
 - app/views/spree/test_mailer/test_email.html.erb
 - app/views/spree/test_mailer/test_email.text.erb
+- bin/rails
 - config/i18n-tasks.yml
 - config/initializers/assets.rb
 - config/initializers/friendly_id.rb
@@ -894,15 +895,12 @@ files:
 - lib/spree/testing_support/controller_requests.rb
 - lib/spree/testing_support/dummy_app.rb
 - lib/spree/testing_support/dummy_app/assets/javascripts/spree/backend/all.js
-- lib/spree/testing_support/dummy_app/assets/javascripts/spree/frontend/all.js
 - lib/spree/testing_support/dummy_app/assets/stylesheets/spree/backend/all.css
-- lib/spree/testing_support/dummy_app/assets/stylesheets/spree/frontend/all.css
 - lib/spree/testing_support/dummy_app/database.yml
 - lib/spree/testing_support/dummy_app/mailer_previews/test_mailer_preview.rb
 - lib/spree/testing_support/dummy_app/migrations.rb
 - lib/spree/testing_support/dummy_app/rake_tasks.rb
 - lib/spree/testing_support/dummy_app/routes.rb
-- lib/spree/testing_support/dummy_app/views/layouts/application.html.erb
 - lib/spree/testing_support/extension_rake.rb
 - lib/spree/testing_support/factories/address_factory.rb
 - lib/spree/testing_support/factories/adjustment_factory.rb
@@ -1009,7 +1007,7 @@ post_install_message: |
   Please, don't forget to look at the CHANGELOG to see what has changed and
   whether you need to perform other tasks.
 
-  https://github.com/solidusio/solidus/blob/master/CHANGELOG.md
+  https://github.com/solidusio/solidus/blob/main/CHANGELOG.md
 
   Please report any issues at:
   - https://github.com/solidusio/solidus/issues
@@ -1029,8 +1027,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.23
 requirements: []
-rubygems_version: 3.4.9
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: Essential models, mailers, and classes for the Solidus e-commerce project.
 test_files: []

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

@@ -1,10 +0,0 @@
-// This is a manifest file that'll be compiled into including all the files listed below.
-// 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.
-//
-//= require jquery
-//= require rails-ujs
-//= require spree/frontend
-//= require_tree .

data/lib/spree/testing_support/dummy_app/assets/stylesheets/spree/frontend/all.css

@@ -1,9 +0,0 @@
-/*
- * This is a manifest file that'll automatically include all the stylesheets available in this directory
- * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
- * the top of the compiled file, but it's generally better to create a new file per style scope.
- *
- *= require spree/frontend
- *= require_self
- *= require_tree .
-*/

data/lib/spree/testing_support/dummy_app/views/layouts/application.html.erb

@@ -1 +0,0 @@
-<%= yield %>