Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.
Ruby b2b-commercee-commerceecommerceecommerce-apiecommerce-frameworkecommerce-platformheadlessheadless-commerceheadless-ecommercemarketplacemulti-tenantmulti-vendormulti-vendor-ecommerceopen-sourcespree-commerce
cleanu/remove outdated code (#14468)
Damian Legawiecc22fe1db98ef
diff --git a/spree/core/app/controllers/spree/base_controller.rb b/spree/core/app/controllers/spree/base_controller.rbdeleted file mode 100644index 40500b5a61..0000000000--- a/spree/core/app/controllers/spree/base_controller.rb+++ /dev/null@@ -1,11 +0,0 @@-require 'cancan'-require_dependency 'spree/core/controller_helpers/strong_parameters'--class Spree::BaseController < ApplicationController- include Spree::Core::ControllerHelpers::Auth- include Spree::Core::ControllerHelpers::Store- include Spree::Core::ControllerHelpers::StrongParameters- include Spree::Core::ControllerHelpers::Locale- include Spree::Core::ControllerHelpers::Currency- include Spree::Core::ControllerHelpers::Turbo-enddiff --git a/spree/core/app/models/spree/base.rb b/spree/core/app/models/spree/base.rbindex 1a998b5ed9..73fe5ae28c 100644--- a/spree/core/app/models/spree/base.rb+++ b/spree/core/app/models/spree/base.rb@@ -136,7 +136,10 @@ class Spree::Base < ApplicationRecordtype.to_s.demodulize.underscoreend+ # @deprecated Legacy Tom Select helper for the removed Rails admin. No replacement.def self.to_tom_select_json+ Spree::Deprecation.warn('Spree::Base.to_tom_select_json is deprecated and will be removed in Spree 6.1.')+pluck(:name, :id).map do |name, id|{id: id,diff --git a/spree/core/app/models/spree/option_value.rb b/spree/core/app/models/spree/option_value.rbindex 9f7f3cb95b..e9cdc5b83a 100644--- a/spree/core/app/models/spree/option_value.rb+++ b/spree/core/app/models/spree/option_value.rb@@ -67,8 +67,11 @@ module Spreedelegate :name, :presentation, to: :option_type, prefix: true, allow_nil: true# Using map here instead of pluck, as these values are translatable via Mobility gem+ # @deprecated Legacy Tom Select helper for the removed Rails admin. No replacement.# @return [Array<Hash>]def self.to_tom_select_json+ Spree::Deprecation.warn('Spree::OptionValue.to_tom_select_json is deprecated and will be removed in Spree 6.1.')+all.map do |ov|{id: ov.name,@@ -78,8 +81,11 @@ module Spreeend# Returns the presentation with the option type presentation, eg. "Color: Red"+ # @deprecated No replacement, build the label in the presentation layer instead.# @return [String]def display_presentation+ Spree::Deprecation.warn('Spree::OptionValue#display_presentation is deprecated and will be removed in Spree 6.1.')+@display_presentation ||= "#{option_type.presentation}: #{presentation}"enddiff --git a/spree/core/lib/spree/core.rb b/spree/core/lib/spree/core.rbindex 5b979c29b2..2a19e9abbb 100644--- a/spree/core/lib/spree/core.rb+++ b/spree/core/lib/spree/core.rb@@ -733,14 +733,8 @@ require 'spree/analytics'require 'spree/events'require 'spree/store_scope_guard'-require 'spree/core/partials'-require 'spree/core/controller_helpers/auth'-require 'spree/core/controller_helpers/order'require 'spree/core/controller_helpers/store'require 'spree/core/controller_helpers/strong_parameters'-require 'spree/core/controller_helpers/locale'-require 'spree/core/controller_helpers/currency'-require 'spree/core/controller_helpers/turbo'require 'spree/core/preferences/store'require 'spree/core/preferences/scoped_store'diff --git a/spree/core/lib/spree/core/components.rb b/spree/core/lib/spree/core/components.rbdeleted file mode 100644index abfb084f57..0000000000--- a/spree/core/lib/spree/core/components.rb+++ /dev/null@@ -1,17 +0,0 @@-module Spree- module Core- class Engine < ::Rails::Engine- def self.api_available?- @@api_available ||= ::Rails::Engine.subclasses.map(&:instance).map { |e| e.class.to_s }.include?('Spree::Api::Engine')- end-- def self.emails_available?- @@emails_available ||= ::Rails::Engine.subclasses.map(&:instance).map { |e| e.class.to_s }.include?('Spree::Emails::Engine')- end-- def self.sample_available?- @@sample_available ||= ::Rails::Engine.subclasses.map(&:instance).map { |e| e.class.to_s }.include?('SpreeSample::Engine')- end- end- end-enddiff --git a/spree/core/lib/spree/core/controller_helpers/auth.rb b/spree/core/lib/spree/core/controller_helpers/auth.rbdeleted file mode 100644index cdc3dd9929..0000000000--- a/spree/core/lib/spree/core/controller_helpers/auth.rb+++ /dev/null@@ -1,50 +0,0 @@-module Spree- module Core- module ControllerHelpers- module Auth- extend ActiveSupport::Concern-- included do- if defined?(helper_method)- helper_method :try_spree_current_user- end-- rescue_from CanCan::AccessDenied do |_exception|- redirect_unauthorized_access- end- end-- # Needs to be overridden so that we use Spree's Ability rather than anyone else's.- def current_ability- @current_ability ||= Spree.ability_class.new(try_spree_current_user, { store: current_store })- end-- # Works out of the box for the default auth; override for custom auth systems.- def store_location(location = nil)- return if try_spree_current_user-- location ||= request.fullpath- session_key = store_location_session_key-- session[session_key] = location- end-- def store_location_session_key- "#{Spree.customer_class.model_name.singular_route_key.to_sym}_return_to"- end-- # proxy method to *possible* spree_current_user method- # The host app (via authentication_helpers.rb) or an auth extension provides spree_current_user- def try_spree_current_user- # Provided by the host app, per authentication_helpers.rb- if respond_to?(:spree_current_user)- spree_current_user- # Fallback name used by some auth integrations- elsif respond_to?(:current_spree_user)- current_spree_user- end- end- end- end- end-enddiff --git a/spree/core/lib/spree/core/controller_helpers/currency.rb b/spree/core/lib/spree/core/controller_helpers/currency.rbdeleted file mode 100644index 62d48da746..0000000000--- a/spree/core/lib/spree/core/controller_helpers/currency.rb+++ /dev/null@@ -1,59 +0,0 @@-module Spree- module Core- module ControllerHelpers- module Currency- extend ActiveSupport::Concern-- included do- if defined?(helper_method)- helper_method :supported_currencies- helper_method :current_currency- helper_method :supported_currency?- helper_method :currency_param- end- end-- # Returns the currently selected currency.- # @return [String] the currently selected currency, eg. `USD`- def current_currency- @current_currency ||= begin- currency = if defined?(session) && session.key?(:currency) && supported_currency?(session[:currency])- session[:currency]- elsif params[:currency].present? && supported_currency?(params[:currency])- params[:currency]- elsif current_store.present?- current_store.default_currency- else- Spree::Store.default.default_currency- end&.upcase- Spree::Current.currency = currency- currency- end- end-- # Returns the list of supported currencies for the current store.- # @return [Array<Money::Currency>] the list of supported currencies- def supported_currencies- @supported_currencies ||= current_store&.supported_currencies_list- end-- # Checks if the given currency is supported.- # @param currency_iso_code [String] the ISO code of the currency, eg. `USD`- # @return [Boolean] `true` if the currency is supported, `false` otherwise- def supported_currency?(currency_iso_code)- return false if supported_currencies.nil?-- supported_currencies.map(&:iso_code).include?(currency_iso_code.upcase)- end-- # Returns the currency parameter from the request.- # @return [String] the currency parameter, eg. `USD`- def currency_param- return if current_currency == current_store.default_currency-- current_currency- end- end- end- end-enddiff --git a/spree/core/lib/spree/core/controller_helpers/locale.rb b/spree/core/lib/spree/core/controller_helpers/locale.rbdeleted file mode 100644index 048f8bbd64..0000000000--- a/spree/core/lib/spree/core/controller_helpers/locale.rb+++ /dev/null@@ -1,99 +0,0 @@-module Spree- module Core- module ControllerHelpers- module Locale- extend ActiveSupport::Concern-- included do- before_action :set_locale- before_action :set_fallback_locale-- if defined?(helper_method)- helper_method :supported_locales- helper_method :supported_locales_for_all_stores- helper_method :current_locale- helper_method :supported_locale?- helper_method :available_locales- helper_method :locale_param- end- end-- def set_locale- # Request-local content locale — the fallback for storeless hosts- # lives in the Spree::Current#content_locale reader; never write the- # process-global I18n.default_locale, which all threads share.- Spree::Current.content_locale = current_store&.default_locale- I18n.locale = current_locale- end-- def set_fallback_locale- return unless respond_to?(:current_store) && current_store.present?-- Spree::Locales::SetFallbackLocaleForStore.new.call(store: current_store)- end-- def default_locale- @default_locale ||= current_store&.default_locale || Rails.application.config.i18n.default_locale || I18n.default_locale- end-- def current_locale- @current_locale ||= if user_locale?- try_spree_current_user.selected_locale- elsif params_locale?- params[:locale]- elsif config_locale?- config_locale- else- default_locale- end- end-- def config_locale?- respond_to?(:config_locale, true) && config_locale.present?- end-- def params_locale?- params[:locale].present? && supported_locale?(params[:locale])- end-- def user_locale?- Spree::Config.use_user_locale && try_spree_current_user && supported_locale?(try_spree_current_user.selected_locale)- end-- def supported_locales- @supported_locales ||= current_store&.supported_locales_list- end-- def supported_locale?(locale_code)- return false if supported_locales.nil?-- supported_locales.include?(locale_code&.to_s)- end-- def supported_locales_for_all_stores- @supported_locales_for_all_stores ||= Spree.available_locales- end-- def available_locales- Spree::Store.available_locales- end-- def locale_param- return if I18n.locale.to_s == current_store.default_locale || current_store.default_locale.nil?-- I18n.locale.to_s- end-- def find_with_fallback_default_locale(&block)- result = begin- block.call- rescue ActiveRecord::RecordNotFound => _e- nil- end-- result || Mobility.with_locale(current_store.default_locale) { block.call }- end- end- end- end-enddiff --git a/spree/core/lib/spree/core/controller_helpers/order.rb b/spree/core/lib/spree/core/controller_helpers/order.rbdeleted file mode 100644index db530f0c11..0000000000--- a/spree/core/lib/spree/core/controller_helpers/order.rb+++ /dev/null@@ -1,185 +0,0 @@-module Spree- module Core- module ControllerHelpers- module Order- extend ActiveSupport::Concern-- included do- if defined?(helper_method)- helper_method :current_order- end- end-- def order_token- @order_token ||= cookies.signed[:token] || params[:order_token]- end-- # The current incomplete cart from the token — the checkout owner- # since the cart/order split. The name stays for compatibility;- # Wave 6 renames the storefront surface to current_cart.- def current_order(options = {})- options[:create_order_if_necessary] ||= false- options[:includes] ||= false-- if @current_order- @current_order.last_ip_address = ip_address- return @current_order- end-- @current_order = find_order_by_token_or_user(options, false)-- if options[:create_order_if_necessary] && (@current_order.nil? || @current_order.completed?)- result = Spree::Carts::Create.call(params: {- store: current_store,- currency: current_currency,- user: try_spree_current_user- })- @current_order = result.value- @current_order.update_columns(last_ip_address: ip_address)-- create_token_cookie(@current_order.token)- end-- # There is some edge case where the cart doesn't have a token.- # but can't reproduce it. So let's generate one on the fly in that case.- @current_order.regenerate_token if @current_order && @current_order.token.blank?-- create_token_cookie(@current_order&.token || current_order_params[:token] || params[:token]) if create_cookie_from_token?-- @current_order- end- alias current_cart current_order-- def associate_user- @order ||= current_order- if try_spree_current_user && @order- @order.associate_user!(try_spree_current_user) if @order.user.blank? || @order.email.blank?- end- end-- def set_current_order- return unless try_spree_current_user && current_order-- orders_scope = user_orders_scope-- orders_to_merge = orders_scope.limit(10)- order_ids_to_delete = orders_scope.ids - orders_to_merge.ids-- orders_scope_exists = orders_scope.exists?-- if orders_scope.exists?- ActiveRecord::Base.connected_to(role: :writing) do- orders_to_merge.find_each do |order|- current_order.merge!(order, try_spree_current_user)- end-- Spree::Order.where(id: order_ids_to_delete).find_each do |order|- Rails.logger.error("Failed to destroy order #{order.id} while merging") unless order.destroy- end- end- end-- orders_scope_exists- end-- def ip_address- request.remote_ip- end-- private-- def user_orders_scope- Spree::Cart.where(customer_id: try_spree_current_user.id).- incomplete.- where.not(id: current_order.id).- where(store_id: current_store.id)- end-- def create_cookie_from_token?- cookies.signed[:token].blank? &&- (current_order_params[:token].present? || params[:token].present?)- end-- def checkout_complete_path?- request.path == spree.checkout_complete_path(current_order_params[:token] || params[:token])- end-- def create_token_cookie(token)- cookies.signed[:token] = {- value: token,- expires: 90.days.from_now,- secure: Rails.configuration.force_ssl || Rails.application.config.ssl_options[:secure_cookies],- domain: cookie_domain_without_port,- httponly: true- }- end-- def cookie_domain_without_port- domain = current_store.url_or_custom_domain- return nil if domain.blank?-- # Remove port from domain (e.g., "localhost:3000" -> "localhost")- # Cookies don't support port numbers in the domain attribute- domain.split(':').first- end-- def last_incomplete_order(includes = {})- @last_incomplete_order ||= try_spree_current_user.last_incomplete_spree_order(current_store, includes: includes)- end-- def current_order_params- @current_order_params ||= { currency: current_currency, token: order_token, user_id: try_spree_current_user.try(:id) }- end-- def find_order_by_token_or_user(options = {}, with_adjustments = false)- return nil if try_spree_current_user.nil? && order_token.blank?-- options[:lock] ||= false-- includes = options[:includes] ? order_includes : {}-- # Find any incomplete carts for the token- incomplete_carts = current_store.carts.incomplete.includes(includes)-- token_order_params = current_order_params.except(:user_id)- cart = if with_adjustments- incomplete_carts.includes(:discounts, :fees).lock(options[:lock]).find_by(token_order_params)- else- incomplete_carts.lock(options[:lock]).find_by(token_order_params)- end-- # Find any incomplete carts for the current user- cart = last_incomplete_cart(includes) if cart.nil? && try_spree_current_user-- cart- end-- def last_incomplete_cart(includes = {})- @last_incomplete_cart ||= Spree::Cart.where(customer_id: try_spree_current_user.id, store_id: current_store.id).- incomplete.- order(created_at: :desc).- includes(includes).- first- end-- def order_includes- variant_includes = [- :images,- :prices,- :stock_levels,- :stock_locations,- { option_values: :option_type },- { stock_levels: :stock_location },- { product: :default_variant }- ]-- {- line_items: {- variant: variant_includes- }- }- end- end- end- end-enddiff --git a/spree/core/lib/spree/core/controller_helpers/turbo.rb b/spree/core/lib/spree/core/controller_helpers/turbo.rbdeleted file mode 100644index e3b1a3aa90..0000000000--- a/spree/core/lib/spree/core/controller_helpers/turbo.rb+++ /dev/null@@ -1,19 +0,0 @@-module Spree- module Core- module ControllerHelpers- module Turbo- extend ActiveSupport::Concern-- included do- if defined?(helper_method)- helper_method :turbo_frame_request?, :turbo_stream_request?- end- end-- def turbo_stream_request?- request.format.turbo_stream?- end- end- end- end-enddiff --git a/spree/core/lib/spree/core/engine.rb b/spree/core/lib/spree/core/engine.rbindex 0aa3fc8a67..86f594463f 100644--- a/spree/core/lib/spree/core/engine.rb+++ b/spree/core/lib/spree/core/engine.rb@@ -610,4 +610,3 @@ module Spreeendrequire 'spree/core/routes'-require 'spree/core/components'diff --git a/spree/core/lib/spree/core/partials.rb b/spree/core/lib/spree/core/partials.rbdeleted file mode 100644index c7b1204b65..0000000000--- a/spree/core/lib/spree/core/partials.rb+++ /dev/null@@ -1,42 +0,0 @@-# Ability to define partial injection points for Admin and Storefront-module Spree- module Core- class Partials- def initialize(config, environment)- @config = config- @environment = environment- define_dynamic_methods- end-- attr_reader :config, :environment-- def partial_members- environment.members.select { |member| member.to_s.end_with?('_partials') }- end-- def keys- partial_members.map { |member| member.to_s.sub(/_partials$/, '') }- end-- private-- def define_dynamic_methods- # Get all members that end with _partials from the Environment- partial_members.each do |member|- # Strip the _partials suffix for the method name- method_name = member.to_s.sub(/_partials$/, '')-- # Define getter method on singleton class- singleton_class.define_method(method_name) do- config.send(member)- end-- # Define setter method on singleton class- singleton_class.define_method("#{method_name}=") do |value|- config.send("#{member}=", value)- end- end- end- end- end-enddiff --git a/spree/core/lib/spree/testing_support/caching.rb b/spree/core/lib/spree/testing_support/caching.rbdeleted file mode 100644index 96a0297952..0000000000--- a/spree/core/lib/spree/testing_support/caching.rb+++ /dev/null@@ -1,47 +0,0 @@-# module Spree-# module TestingSupport-# module Caching- # def cache_writes- # @cache_write_events- # end-- # def assert_written_to_cache(key)- # unless @cache_write_events.detect { |event| event[:key].starts_with?(key) }- # raise %Q{Expected to find #{key} in the cache, but didn't.-- # Cache writes:- # #{@cache_write_events.join("\n")}- # }- # end- # end-- # def clear_cache_events- # @cache_read_events = []- # @cache_write_events = []- # end- # end- # end-# end--# RSpec.configure do |config|- # config.include Spree::TestingSupport::Caching, caching: true-- # config.before(:each, caching: true) do- # ActionController::Base.perform_caching = true-- # ActiveSupport::Notifications.subscribe('read_fragment.action_controller') do |_event, _start_time, _finish_time, _, details|- # @cache_read_events ||= []- # @cache_read_events << details- # end-- # ActiveSupport::Notifications.subscribe('write_fragment.action_controller') do |_event, _start_time, _finish_time, _, details|- # @cache_write_events ||= []- # @cache_write_events << details- # end- # end-- # config.after(:each, caching: true) do- # ActionController::Base.perform_caching = false- # Rails.cache.clear- # end-# enddiff --git a/spree/core/spec/lib/spree/core/controller_helpers/auth_spec.rb b/spree/core/spec/lib/spree/core/controller_helpers/auth_spec.rbdeleted file mode 100644index 1184fdf24e..0000000000--- a/spree/core/spec/lib/spree/core/controller_helpers/auth_spec.rb+++ /dev/null@@ -1,64 +0,0 @@-require 'spec_helper'-require 'spree/testing_support/url_helpers'--class FakesController < ApplicationController- include ActionController::Cookies- include Spree::Core::ControllerHelpers::Auth- def index- render plain: 'index'- end-end--describe Spree::Core::ControllerHelpers::Auth, type: :controller do- controller(FakesController) {}- include Spree::TestingSupport::UrlHelpers-- let(:store) { @default_store }-- before do- allow(controller).to receive(:current_store).and_return(store)- end-- describe '#current_ability' do- it 'returns Spree::Ability instance' do- expect(controller.current_ability.class).to eq Spree::Ability- end- end-- describe '#store_location' do- it 'sets session return url' do- allow(controller).to receive_messages(request: double(fullpath: '/redirect'))- controller.store_location- expect(session[:customer_return_to]).to eq '/redirect'- end- end-- describe '#try_spree_current_user' do- it 'calls spree_current_user when defined' do- expect(controller).to receive(:spree_current_user)- controller.try_spree_current_user- end-- it 'returns nil when no user is set' do- expect(controller.try_spree_current_user).to eq nil- end-- context 'when spree_current_user is not defined' do- before do- allow(controller).to receive(:respond_to?).and_call_original- allow(controller).to receive(:respond_to?).with(:spree_current_user).and_return(false)- end-- it 'calls current_spree_user as fallback' do- allow(controller).to receive(:respond_to?).with(:current_spree_user).and_return(true)- expect(controller).to receive(:current_spree_user)- controller.try_spree_current_user- end-- it 'returns nil when neither method is defined' do- allow(controller).to receive(:respond_to?).with(:current_spree_user).and_return(false)- expect(controller.try_spree_current_user).to eq nil- end- end- end-enddiff --git a/spree/core/spec/lib/spree/core/controller_helpers/currency_spec.rb b/spree/core/spec/lib/spree/core/controller_helpers/currency_spec.rbdeleted file mode 100644index 65c8f8afd8..0000000000--- a/spree/core/spec/lib/spree/core/controller_helpers/currency_spec.rb+++ /dev/null@@ -1,50 +0,0 @@-require 'spec_helper'--class FakesController < ApplicationController- include Spree::Core::ControllerHelpers::Auth- include Spree::Core::ControllerHelpers::Order- include Spree::Core::ControllerHelpers::Store- include Spree::Core::ControllerHelpers::Currency-end--describe Spree::Core::ControllerHelpers::Currency, type: :controller do- controller(FakesController) {}-- describe '#current_currency' do- let!(:store) { create :store, default: true, default_currency: 'GBP' }-- it 'returns current store default currency' do- expect(controller.current_currency).to eq('GBP')- end-- it 'sets Spree::Current.currency' do- controller.current_currency- expect(Spree::Current.currency).to eq('GBP')- end- end-- describe '#supported_currencies' do- let(:currency) { 'EUR' }- let!(:store) { create :store, default: true, supported_currencies: currency }-- it 'returns supported currencies' do- expect(controller.supported_currencies).to include(::Money::Currency.find(currency))- end- end-- describe '#currency_param' do- let!(:store) { create :store, default: true, default_currency: 'EUR', supported_currencies: 'EUR,GBP' }-- context 'same as store default locale' do- before { controller.params = { currency: 'EUR' } }-- it { expect(controller.currency_param).to eq(nil) }- end-- context 'different than store locale' do- before { controller.params = { currency: 'GBP' } }-- it { expect(controller.currency_param).to eq('GBP') }- end- end-enddiff --git a/spree/core/spec/lib/spree/core/controller_helpers/locale_spec.rb b/spree/core/spec/lib/spree/core/controller_helpers/locale_spec.rbdeleted file mode 100644index f6f47ead79..0000000000--- a/spree/core/spec/lib/spree/core/controller_helpers/locale_spec.rb+++ /dev/null@@ -1,140 +0,0 @@-require 'spec_helper'--class FakesController < ApplicationController- include Spree::Core::ControllerHelpers::Auth- include Spree::Core::ControllerHelpers::Order- include Spree::Core::ControllerHelpers::Store- include Spree::Core::ControllerHelpers::Locale-end--class FakesControllerWithLocale < FakesController- def config_locale- 'en'- end-end--describe Spree::Core::ControllerHelpers::Locale, type: :controller do- controller(FakesController) {}-- let(:user) { build(:user, selected_locale: 'pl') }-- before { allow(controller).to receive(:spree_current_user).and_return(user) }-- describe '#current_locale' do- context 'taking locale from user and store with locale set' do- before { allow(Spree::Config).to receive(:use_user_locale).and_return(true) }-- let!(:store) { create :store, default: true, default_locale: 'fr', supported_locales: 'fr,de,pl' }-- it 'returns locale set within user' do- expect(controller.current_locale.to_s).to eq('pl')- end- end-- context 'not taking locale from user' do- before { allow(Spree::Config).to receive(:use_user_locale).and_return(false) }-- context 'store with locale set' do- let!(:store) { create :store, default: true, default_locale: 'fr', supported_locales: 'fr,de' }-- it 'returns current store default locale' do- expect(controller.current_locale.to_s).to eq('fr')- end-- it 'return supported locale when passed as param' do- controller.params = { locale: 'de' }- expect(controller.current_locale.to_s).to eq('de')- end- end-- context 'config_locale present' do- controller(FakesControllerWithLocale) {}-- let!(:store) { create :store, default: true, default_locale: 'fr' }-- it 'returns config_locale if present' do- expect(controller.current_locale.to_s).to eq('en')- end- end-- context 'store without locale set' do- let!(:store) { create :store, default: true, default_locale: nil }-- context 'without I18n.default_locale set' do- it 'fallbacks to english' do- expect(controller.current_locale.to_s).to eq('en')- end- end-- context 'with I18n.default_locale set' do- before do- allow(I18n).to receive(:default_locale).and_return(:de)- end-- it 'still resolves through the bootstrap market locale' do- # Every store owns a default market in 6.0, so the application- # locale fallback no longer participates.- expect(controller.current_locale.to_s).to eq('en')- end- end- end- end- end-- describe '#supported_locales' do- let!(:store) { create :store, default: true, default_locale: 'de', supported_locales: 'de, pl' }-- it 'returns supported currencies' do- expect(controller.supported_locales.to_s).to include('de')- end-- it 'returns supported locales' do- expect(controller.supported_locales.to_s).to include('pl')- end- end-- describe '#locale_param' do- let!(:store) { create :store, default: true, default_locale: 'en', supported_locales: 'en,de,fr' }-- context 'same as store default locale' do- before do- allow(I18n).to receive(:locale).and_return(:en)- end-- it { expect(controller.locale_param).to eq(nil) }- end-- context 'different than store locale' do- before do- allow(I18n).to receive(:locale).and_return(:de)- end-- it { expect(controller.locale_param).to eq('de') }- end- end-- describe '#set_locale' do- subject(:set_locale) { controller.set_locale }-- let!(:store) { create :store, default: true, default_locale: 'de', supported_locales: 'en,pl,de' }-- before do- I18n.locale = :en- end-- after do- I18n.locale = :en- end-- it 'sets the current locale and records the content locale request-locally' do- set_locale-- expect(I18n.locale).to eq(:pl)- expect(Spree::Current.content_locale).to eq('de')- end-- it 'never mutates the process-global I18n.default_locale, which all threads share' do- expect { set_locale }.not_to change(I18n, :default_locale)- end- end-enddiff --git a/spree/core/spec/lib/spree/core/controller_helpers/order_spec.rb b/spree/core/spec/lib/spree/core/controller_helpers/order_spec.rbdeleted file mode 100644index 6dd1b03d9c..0000000000--- a/spree/core/spec/lib/spree/core/controller_helpers/order_spec.rb+++ /dev/null@@ -1,197 +0,0 @@-require 'spec_helper'--class FakesController < ApplicationController- include ActionController::Cookies- include Spree::Core::ControllerHelpers::Store- include Spree::Core::ControllerHelpers::Order- include Spree::Core::ControllerHelpers::Currency- include Spree::Core::ControllerHelpers::Locale-end--class ActionDispatch::Cookies::SignedKeyRotatingCookieJar- def fetch_set_cookies- @parent_jar.fetch_set_cookies- end-end--class ActionDispatch::Cookies::CookieJar- def fetch_set_cookies- @set_cookies- end-end--describe Spree::Core::ControllerHelpers::Order, type: :controller do- controller(FakesController) {}-- let(:user) { create(:user) }- let(:order) { create(:order, user: user, store: store) }- let!(:store) { @default_store }-- describe '#current_order' do- before do- allow(controller).to receive_messages(current_store: store)- allow(controller).to receive_messages(try_spree_current_user: user)- end-- context 'create_order_if_necessary option is false' do- let!(:cart) { create :cart, customer: user, store: store }-- it 'returns the current cart' do- expect(controller.current_order).to eq cart- end- end-- context 'create_order_if_necessary option is true' do- it 'creates new order' do- expect do- controller.current_order(create_order_if_necessary: true)- end.to change(Spree::Cart, :count).to(1)- end- end-- describe 'creating a token cookie' do- let!(:store) { create(:store, default: true, name: 'Test Cookie Store') }-- let(:token_cookie) { request.cookie_jar.signed[:token] }- let(:token_cookie_domain) { request.cookie_jar.signed.fetch_set_cookies.dig('token', :domain) }-- context 'for a cart with token' do- before do- allow(controller).to receive(:current_order_params).and_return(- token: 'token-123',- currency: 'USD',- user_id: user.id- )- end-- it 'creates a new token cookie' do- controller.current_order-- expect(token_cookie).to be_present- expect(token_cookie_domain).to eq(store.url)- end-- end-- context 'for a cart without token' do- before do- allow(controller).to receive(:current_order_params).and_return(- token: nil,- currency: 'USD',- user_id: user.id- )- end-- it 'does nothing' do- controller.current_order- expect(token_cookie).to be_nil- end- end-- context 'with a checkout token' do- before do- allow(controller).to receive(:params).and_return(token: 'token-123')- end-- it 'creates a new token cookie' do- controller.current_order-- expect(token_cookie).to be_present- expect(token_cookie_domain).to eq(store.url)- end-- end-- context 'for a checkout without token' do- before do- allow(controller).to receive(:params).and_return(token: nil)- end-- it 'does nothing' do- controller.current_order- expect(token_cookie).to be_nil- end- end- end- end-- describe '#associate_user' do- before do- allow(controller).to receive_messages(current_order: order, try_spree_current_user: user)- end-- context "user is blank" do- let(:order) { create(:order, user: nil, store: store) }-- it 'calls Spree::Order#associate_user! method' do- expect_any_instance_of(Spree::Order).to receive(:associate_user!)- controller.associate_user- end- end-- context "user isn't blank" do- let(:order) { create(:order, user: user, store: store) }-- it 'does not calls Spree::Order#associate_user! method' do- expect_any_instance_of(Spree::Order).not_to receive(:associate_user!)- controller.associate_user- end- end- end-- describe '#set_current_order' do- let(:current_cart) { create(:cart, customer: user, store: store) }-- before { allow(controller).to receive_messages(try_spree_current_user: user) }-- context 'user has some incomplete orders other than current one' do- before do- allow(controller).to receive_messages(current_order: current_cart, last_incomplete_order: incomplete_order, cookies: double(signed: { token: 'token' }))- end-- context 'within the same store' do- let!(:incomplete_order) { create(:cart, customer: user, store: current_cart.store) }-- it 'merges the other cart' do- expect(current_cart).to receive(:merge!).with(incomplete_order, user)- controller.set_current_order- end- end-- context 'within different store' do- let!(:incomplete_order) { create(:order, user: user, store: create(:store)) }-- it 'does not call Spree::Order#merge!' do- expect(order).not_to receive(:merge!)- controller.set_current_order- end- end- end-- context 'user has no incomplete orders other than current one' do- it 'does not call Spree::Order#merge!' do- expect(order).not_to receive(:merge!)- controller.set_current_order- end- end- end-- describe '#current_currency' do- it 'returns current currency' do- expect(controller.current_currency).to eq 'USD'- end- end-- describe '#ip_address' do- it 'returns remote ip' do- expect(controller.ip_address).to eq request.remote_ip- end- end-- describe '#create_token_cookie' do- it 'creates a new token cookie' do- controller.send(:create_token_cookie, 'token-123')- expect(request.cookie_jar.signed[:token]).to eq 'token-123'- end- end-enddiff --git a/spree/core/spec/lib/spree/core/controller_helpers/store_spec.rb b/spree/core/spec/lib/spree/core/controller_helpers/store_spec.rbindex 21a86a022f..909f181820 100644--- a/spree/core/spec/lib/spree/core/controller_helpers/store_spec.rb+++ b/spree/core/spec/lib/spree/core/controller_helpers/store_spec.rb@@ -1,12 +1,7 @@require 'spec_helper'class FakesController < ApplicationController- include Spree::Core::ControllerHelpers::Auth- include Spree::Core::ControllerHelpers::Orderinclude Spree::Core::ControllerHelpers::Store- include Spree::Core::ControllerHelpers::Currency-- before_action :set_current_orderenddescribe Spree::Core::ControllerHelpers::Store, type: :controller dodiff --git a/spree/core/spec/lib/spree/core/partials_spec.rb b/spree/core/spec/lib/spree/core/partials_spec.rbdeleted file mode 100644index cddf53903c..0000000000--- a/spree/core/spec/lib/spree/core/partials_spec.rb+++ /dev/null@@ -1,103 +0,0 @@-require 'spec_helper'--RSpec.describe Spree::Core::Partials do- let(:environment) do- Struct.new(- :product_form_partials,- :dashboard_analytics_partials,- :order_page_sidebar_partials,- :admin_users_actions_partials,- :navigation # Not a _partials attribute- )- end- let(:config) { environment.new }- let(:partials) { described_class.new(config, environment) }-- describe '#initialize' do- it 'accepts config and environment parameters' do- expect { described_class.new(config, environment) }.not_to raise_error- end-- it 'sets config and environment' do- expect(partials.config).to eq(config)- expect(partials.environment).to eq(environment)- end- end-- describe '#partial_members' do- it 'returns only members ending with _partials' do- members = partials.partial_members- expect(members).to include(:product_form_partials)- expect(members).to include(:dashboard_analytics_partials)- expect(members).to include(:order_page_sidebar_partials)- expect(members).to include(:admin_users_actions_partials)- expect(members).not_to include(:navigation)- end- end-- describe '#keys' do- it 'returns partial member names without _partials suffix' do- keys = partials.keys- expect(keys).to include('product_form')- expect(keys).to include('dashboard_analytics')- expect(keys).to include('order_page_sidebar')- expect(keys).to include('admin_users_actions')- expect(keys).not_to include('navigation')- end- end-- describe 'dynamically defined methods' do- it 'defines getter methods for all _partials attributes' do- expect(partials).to respond_to(:product_form)- expect(partials).to respond_to(:order_page_sidebar)- expect(partials).to respond_to(:dashboard_analytics)- expect(partials).to respond_to(:admin_users_actions)- end-- it 'defines setter methods for all _partials attributes' do- expect(partials).to respond_to(:product_form=)- expect(partials).to respond_to(:order_page_sidebar=)- expect(partials).to respond_to(:dashboard_analytics=)- expect(partials).to respond_to(:admin_users_actions=)- end-- it 'does not define methods for non-partials attributes' do- # :navigation is in Environment but doesn't end with _partials- expect(partials).not_to respond_to(:navigation)- end- end-- describe 'getter methods' do- it 'calls the config with the full _partials attribute name' do- config.product_form_partials = ['partial1', 'partial2']-- result = partials.product_form-- expect(result).to eq(['partial1', 'partial2'])- end-- it 'works with different partial types' do- config.dashboard_analytics_partials = ['analytics']- config.order_page_sidebar_partials = ['sidebar']-- expect(partials.dashboard_analytics).to eq(['analytics'])- expect(partials.order_page_sidebar).to eq(['sidebar'])- end- end-- describe 'setter methods' do- it 'sets the config with the full _partials attribute name' do- partials.product_form = ['custom_partial']-- expect(config.product_form_partials).to eq(['custom_partial'])- end-- it 'works with different partial types' do- partials.dashboard_analytics = ['new_analytics']- partials.order_page_sidebar = ['new_sidebar']-- expect(config.dashboard_analytics_partials).to eq(['new_analytics'])- expect(config.order_page_sidebar_partials).to eq(['new_sidebar'])- end- end-enddiff --git a/spree/core/spec/models/spree/option_value_spec.rb b/spree/core/spec/models/spree/option_value_spec.rbindex 737ba59298..50c720d57e 100644--- a/spree/core/spec/models/spree/option_value_spec.rb+++ b/spree/core/spec/models/spree/option_value_spec.rb@@ -44,25 +44,6 @@ describe Spree::OptionValue, type: :model doendend- describe '#display_presentation' do- let(:option_value) { build(:option_value, name: 'red', presentation: 'Red', option_type: option_type) }- let(:option_type) { create(:option_type, name: 'Color', presentation: 'Color') }-- it 'returns the presentation with the option type presentation' do- expect(option_value.display_presentation).to eq('Color: Red')- end- end-- describe '.to_tom_select_json' do- let!(:option_value) { create(:option_value, name: 'red', presentation: 'Red') }- let!(:option_value2) { create(:option_value, name: 'blue', presentation: 'Blue') }- let!(:option_value3) { create(:option_value, name: 'green', presentation: 'Green') }-- it 'returns the option values in the correct format' do- expect(Spree::OptionValue.to_tom_select_json).to match_array([{ id: 'red', name: 'Red' }, { id: 'blue', name: 'Blue' }, { id: 'green', name: 'Green' }])- end- end-describe 'color_code validation' doit 'accepts valid 6-digit hex color' dooption_value = build(:option_value, color_code: '#FF0000')diff --git a/spree/core/app/helpers/spree/base_helper.rb b/spree/emails/app/helpers/spree/base_helper.rbsimilarity index 79%rename from spree/core/app/helpers/spree/base_helper.rbrename to spree/emails/app/helpers/spree/base_helper.rbindex c87357a99c..c03cf42c25 100644--- a/spree/core/app/helpers/spree/base_helper.rb+++ b/spree/emails/app/helpers/spree/base_helper.rb@@ -1,7 +1,7 @@module Spreemodule BaseHelper# returns the URL of an object on the storefront- # @param resource [Spree::Product, Spree::Category, Spree::Page] the resource to get the URL for+ # @param resource [Spree::Product, Spree::Category] the resource to get the URL for# @param options [Hash] the options for the URL# @option options [String] :locale the locale of the resource, defaults to I18n.locale# @option options [String] :store the store of the resource, defaults to current_store@@ -10,8 +10,6 @@ module Spree# @option options [String] :variant_id the variant ID of the resource, usually the ID of the variant (only used for products)# @return [String] the URL of the resourcedef spree_storefront_resource_url(resource, options = {})- options.merge!(locale: locale_param) if defined?(locale_param) && locale_param.present?-store = options[:store] || current_storebase_url = if options[:relative]@@ -37,10 +35,6 @@ module Spree"#{base_url + localize}/products/#{resource.slug}#{params}"elsif resource.is_a?(Spree::Category)"#{base_url + localize}/t/#{resource.permalink}"- elsif defined?(Spree::Page) && (resource.is_a?(Spree::Page) || resource.is_a?(Spree::Policy))- "#{base_url + localize}#{resource.page_builder_url}"- elsif defined?(Spree::PageLink) && resource.is_a?(Spree::PageLink)- resource.linkable_urlelsif localize.blank?base_urlelsediff --git a/spree/core/app/helpers/spree/fulfillment_helper.rb b/spree/emails/app/helpers/spree/fulfillment_helper.rbsimilarity index 100%rename from spree/core/app/helpers/spree/fulfillment_helper.rbrename to spree/emails/app/helpers/spree/fulfillment_helper.rbdiff --git a/spree/core/spec/helpers/base_helper_spec.rb b/spree/emails/spec/helpers/spree/base_helper_spec.rbsimilarity index 73%rename from spree/core/spec/helpers/base_helper_spec.rbrename to spree/emails/spec/helpers/spree/base_helper_spec.rbindex 2be23ed043..84bfa84176 100644--- a/spree/core/spec/helpers/base_helper_spec.rb+++ b/spree/emails/spec/helpers/spree/base_helper_spec.rb@@ -17,28 +17,15 @@ describe Spree::BaseHelper, type: :helper dobefore doallow(helper).to receive(:current_store).and_return(store)- allow(helper).to receive(:locale_param)endcontext 'for Product URL' doit { expect(helper.spree_storefront_resource_url(product)).to eq("http://www.example.com/products/#{product.slug}") }context 'when a locale is passed' do- before do- allow(helper).to receive(:current_store).and_return(store)- end-it { expect(helper.spree_storefront_resource_url(product, locale: :de)).to eq("http://www.example.com/de/products/#{product.slug}") }end- context 'when locale_param is present' do- before do- allow(helper).to receive(:locale_param).and_return(:fr)- end-- it { expect(helper.spree_storefront_resource_url(product)).to eq("http://www.example.com/fr/products/#{product.slug}") }- end-context 'when preview_id is not present' doit 'returns the product url' doexpect(spree_storefront_resource_url(product)).to eq("http://#{current_store.url}/products/#{product.slug}")@@ -58,21 +45,12 @@ describe Spree::BaseHelper, type: :helper doendend- context 'for Taxon URL' do+ context 'for Category URL' doit { expect(helper.spree_storefront_resource_url(category)).to eq("http://www.example.com/t/#{category.permalink}") }context 'when a locale is passed' doit { expect(helper.spree_storefront_resource_url(category, locale: :de)).to eq("http://www.example.com/de/t/#{category.permalink}") }end-- context 'when locale_param is present' do- before do- allow(helper).to receive(:locale_param).and_return(:fr)- end-- it { expect(helper.spree_storefront_resource_url(category)).to eq("http://www.example.com/fr/t/#{category.permalink}") }- endendend-enddiff --git a/spree/lib/generators/spree/install/install_generator.rb b/spree/lib/generators/spree/install/install_generator.rbindex b86c6ac99e..6749cde80b 100644--- a/spree/lib/generators/spree/install/install_generator.rb+++ b/spree/lib/generators/spree/install/install_generator.rb@@ -107,20 +107,18 @@ module Spreeenddef load_sample_data- return unless Spree::Core::Engine.sample_available?-if @load_sample_data# Sample-data imports need an admin as their owner. Without explicit# credentials the seed mints none (first-run setup does), so loading# now would raise mid-install.if admin_account_available?say_status :loading, 'sample data'- rake 'spree_sample:load'+ rake 'spree:load_sample_data'elsesay_status :skipping, 'sample data (needs an admin account — finish setup, then run bin/rails spree:load_sample_data)'endelse- say_status :skipping, 'sample data (you can always run rake spree_sample:load)'+ say_status :skipping, 'sample data (you can always run bin/rails spree:load_sample_data)'endend