From 5eabcfe54410344ce189bfa3839cbd57ee3b2e7f Mon Sep 17 00:00:00 2001
From: Martin Meyerhoff <mamhoff@gmail.com>
Date: Mon, 22 Jan 2024 17:50:01 +0100
Subject: [PATCH 01/19] Use routing proxy in locale selection

Without this, engines that want to display the Solidus menu bar will get
an error.
---
 backend/app/views/spree/admin/shared/_locale_selection.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/app/views/spree/admin/shared/_locale_selection.html.erb b/backend/app/views/spree/admin/shared/_locale_selection.html.erb
index e9dc4bbcfab..5f3515801ea 100644
--- a/backend/app/views/spree/admin/shared/_locale_selection.html.erb
+++ b/backend/app/views/spree/admin/shared/_locale_selection.html.erb
@@ -3,7 +3,7 @@
 }.sort %>
 
 <% if available_locale_options_for_select.size > 1 %>
-  <%= form_tag(admin_set_locale_path(format: :html), method: :put, style: "width: 100%;") do %>
+  <%= form_tag(spree.admin_set_locale_path(format: :html), method: :put, style: "width: 100%;") do %>
     <label class="admin-navbar-selection admin-locale-selection">
       <i class="fa fa-globe fa-fw" title="<%= I18n.t('spree.choose_dashboard_locale') %>"></i>
       <select class="custom-select fullwidth" onchange="this.form.requestSubmit()">

From 49af69980ebd522c5f97e4e2f6e8ea9ab5cd1c59 Mon Sep 17 00:00:00 2001
From: Martin Meyerhoff <mamhoff@gmail.com>
Date: Sat, 27 Jan 2024 13:35:43 +0100
Subject: [PATCH 02/19] Deprecate Spree::Adjustment#recalculate

We've already deprecated Spree::Adjustment#calculate_eligibility, and
we've removed all the code paths that call
Spree::Adjustment#recalculate. Let's deprecate it.
---
 core/app/models/spree/adjustment.rb       | 1 +
 core/spec/models/spree/adjustment_spec.rb | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/core/app/models/spree/adjustment.rb b/core/app/models/spree/adjustment.rb
index 3ec22c90a9e..7f60ad02d8c 100644
--- a/core/app/models/spree/adjustment.rb
+++ b/core/app/models/spree/adjustment.rb
@@ -122,6 +122,7 @@ def recalculate
       end
       amount
     end
+    deprecate :recalculate, deprecator: Spree.deprecator
 
     # Calculates based on attached promotion (if this is a promotion
     # adjustment) whether this promotion is still eligible.
diff --git a/core/spec/models/spree/adjustment_spec.rb b/core/spec/models/spree/adjustment_spec.rb
index f8701b7e486..7254c69db34 100644
--- a/core/spec/models/spree/adjustment_spec.rb
+++ b/core/spec/models/spree/adjustment_spec.rb
@@ -92,6 +92,12 @@
     let(:order) { create(:order_with_line_items, line_items_price: 100) }
     let(:line_item) { order.line_items.to_a.first }
 
+    around do |example|
+      Spree.deprecator.silence do
+        example.run
+      end
+    end
+
     context "when adjustment is finalized" do
       let(:finalized) { true }
 

From 7ff5b8ca06d188dc7c4b071928ecc28833add414 Mon Sep 17 00:00:00 2001
From: Martin Meyerhoff <mamhoff@gmail.com>
Date: Sat, 27 Jan 2024 14:20:03 +0100
Subject: [PATCH 03/19] Adjustment factory: Don't use #recalculate

---
 core/lib/spree/testing_support/factories/adjustment_factory.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/lib/spree/testing_support/factories/adjustment_factory.rb b/core/lib/spree/testing_support/factories/adjustment_factory.rb
index 683634ce3da..810b7efe3c1 100644
--- a/core/lib/spree/testing_support/factories/adjustment_factory.rb
+++ b/core/lib/spree/testing_support/factories/adjustment_factory.rb
@@ -31,7 +31,7 @@
             adjustment.source.tax_categories = []
           end
           adjustment.source.save
-          adjustment.recalculate
+          adjustment.update!(amount: adjustment.source.compute_amount(adjustment.adjustable))
         end
       end
     end

From d9971f3302a4f98386edbe29767a423a13b0e4fd Mon Sep 17 00:00:00 2001
From: Martin Meyerhoff <mamhoff@gmail.com>
Date: Sat, 27 Jan 2024 14:13:08 +0100
Subject: [PATCH 04/19] Remove promotion from cancellations spec

This promotion isn't necessary for testing the rounding here. We can
just use a manual adjustment.
---
 core/spec/models/spree/order_cancellations_spec.rb | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/core/spec/models/spree/order_cancellations_spec.rb b/core/spec/models/spree/order_cancellations_spec.rb
index 20554304889..08d7bd8145e 100644
--- a/core/spec/models/spree/order_cancellations_spec.rb
+++ b/core/spec/models/spree/order_cancellations_spec.rb
@@ -149,8 +149,6 @@
       let(:line_item) { order.line_items.to_a.first }
       let(:inventory_unit_1) { line_item.inventory_units[0] }
       let(:inventory_unit_2) { line_item.inventory_units[1] }
-      let(:promotion) { create(:promotion, :with_line_item_adjustment) }
-      let(:promotion_action) { promotion.actions[0] }
 
       before do
         order.contents.add(line_item.variant)
@@ -160,7 +158,7 @@
           order: order,
           amount: 0.01,
           label: 'some promo',
-          source: promotion_action,
+          source: nil,
           finalized: true,
         )
         order.recalculate

From 4015a308a48ea54e3dc11f52ca42a6a33947d08e Mon Sep 17 00:00:00 2001
From: Martin Meyerhoff <mamhoff@gmail.com>
Date: Sat, 27 Jan 2024 12:59:35 +0100
Subject: [PATCH 05/19] Extract shared examples for order factory

We want to move the order_with_promotion factory.
---
 .../shared_examples/order_factory.rb          | 141 ++++++++++++++++++
 .../factories/order_factory_spec.rb           | 141 +-----------------
 2 files changed, 142 insertions(+), 140 deletions(-)
 create mode 100644 core/lib/spree/testing_support/shared_examples/order_factory.rb

diff --git a/core/lib/spree/testing_support/shared_examples/order_factory.rb b/core/lib/spree/testing_support/shared_examples/order_factory.rb
new file mode 100644
index 00000000000..8c647544e47
--- /dev/null
+++ b/core/lib/spree/testing_support/shared_examples/order_factory.rb
@@ -0,0 +1,141 @@
+# frozen_string_literal: true
+
+RSpec.shared_examples "shipping methods are assigned" do
+  context "given a shipping method" do
+    let(:shipping_method) { create(:shipping_method) }
+
+    it "assigns the shipping method when created" do
+      expect(
+        create(
+          factory,
+          shipping_method: shipping_method
+        ).shipments.map(&:shipping_method)
+      ).to all(eq(shipping_method))
+    end
+
+    it "assigns the shipping method when built" do
+      expect(
+        build(
+          factory,
+          shipping_method: shipping_method
+        ).shipments.map(&:shipping_method)
+      ).to all(eq(shipping_method))
+    end
+  end
+end
+
+RSpec.shared_examples "an order with line items factory" do |expected_order_state, expected_inventory_unit_state|
+  # This factory cannot be built correctly because Shipment#set_up_inventory
+  # requires records to be saved.
+  context "when created" do
+    let(:stock_location) { create(:stock_location) }
+    let(:first_variant) { create(:variant) }
+    let(:second_variant) { create(:variant) }
+    let(:shipping_method) { create(:shipping_method) }
+    let(:order) do
+      create(
+        factory,
+        stock_location: stock_location,
+        line_items_attributes: [
+          { variant: first_variant, quantity: 1, price: 1 },
+          { variant: second_variant, quantity: 2, price: 2 }
+        ],
+        shipment_cost: 3,
+        shipping_method: shipping_method
+      )
+    end
+
+    it "has the expected attributes" do
+      aggregate_failures "for line items" do
+        expect(order.line_items.count).to eq 2
+        expect(order.line_items[0]).to have_attributes(
+          quantity: 1,
+          price: 1.0
+        )
+        expect(order.line_items[1]).to have_attributes(
+          price: 2.0,
+          quantity: 2
+        )
+      end
+
+      aggregate_failures "for shipments" do
+        expect(order.shipments.count).to eq 1
+        expect(order.shipments[0]).to have_attributes(
+          amount: 3.0,
+          stock_location: stock_location
+        )
+
+        expect(order.shipments[0].shipping_method).to eq(shipping_method)
+
+        # Explicitly order by line item id, because otherwise these can be in
+        # an arbitrary order.
+        inventory_units = order.shipments[0].inventory_units.sort_by(&:line_item_id)
+
+        expect(inventory_units.count).to eq(3)
+        expect(inventory_units[0]).to have_attributes(
+          order: order,
+          shipment: order.shipments[0],
+          line_item: order.line_items[0],
+          variant: order.line_items[0].variant,
+          state: expected_inventory_unit_state
+        )
+        expect(inventory_units[1]).to have_attributes(
+          order: order,
+          shipment: order.shipments[0],
+          line_item: order.line_items[1],
+          variant: order.line_items[1].variant,
+          state: expected_inventory_unit_state
+        )
+        expect(inventory_units[2]).to have_attributes(
+          order: order,
+          shipment: order.shipments[0],
+          line_item: order.line_items[1],
+          variant: order.line_items[1].variant,
+          state: expected_inventory_unit_state
+        )
+      end
+
+      expect(order).to have_attributes(
+        item_total: 5.0,
+        ship_total: 3.0,
+        total: 8.0,
+        state: expected_order_state
+      )
+    end
+  end
+
+  context 'when shipments should be taxed' do
+    let!(:ship_address) { create(:address) }
+    let!(:tax_zone) { create(:global_zone) } # will include the above address
+    let!(:tax_rate) { create(:tax_rate, amount: 0.10, zone: tax_zone, tax_categories: [tax_category]) }
+
+    let(:tax_category) { create(:tax_category) }
+    let(:shipping_method) { create(:shipping_method, tax_category: tax_category, zones: [tax_zone]) }
+
+    it 'shipments get a tax adjustment' do
+      order = create(factory, ship_address: ship_address, shipping_method: shipping_method)
+      shipment = order.shipments[0]
+
+      expect(shipment.additional_tax_total).to be > 0
+    end
+  end
+end
+
+RSpec.shared_examples 'supplied completed_at is respected' do
+  context 'when passed a completed_at timestamp' do
+    let(:completed_at) { 2.days.ago }
+    let(:order) { create(factory, completed_at: completed_at) }
+
+    it 'respects the timestamp' do
+      expect(order.completed_at).to be_within(5.seconds).of(completed_at)
+    end
+  end
+
+  context 'when no completed_at timestamp is passed' do
+    let(:order) { create(factory) }
+
+    it 'defaults to the current time' do
+      expect(order.completed_at).to be_within(2.seconds).of(Time.current)
+    end
+  end
+end
diff --git a/core/spec/lib/spree/core/testing_support/factories/order_factory_spec.rb b/core/spec/lib/spree/core/testing_support/factories/order_factory_spec.rb
index 52b3f677924..5ca5bca1923 100644
--- a/core/spec/lib/spree/core/testing_support/factories/order_factory_spec.rb
+++ b/core/spec/lib/spree/core/testing_support/factories/order_factory_spec.rb
@@ -1,146 +1,7 @@
 # frozen_string_literal: true
 
 require 'rails_helper'
-
-RSpec.shared_examples "shipping methods are assigned" do
-  context "given a shipping method" do
-    let(:shipping_method) { create(:shipping_method) }
-
-    it "assigns the shipping method when created" do
-      expect(
-        create(
-          factory,
-          shipping_method: shipping_method
-        ).shipments.map(&:shipping_method)
-      ).to all(eq(shipping_method))
-    end
-
-    it "assigns the shipping method when built" do
-      expect(
-        build(
-          factory,
-          shipping_method: shipping_method
-        ).shipments.map(&:shipping_method)
-      ).to all(eq(shipping_method))
-    end
-  end
-end
-
-RSpec.shared_examples "an order with line items factory" do |expected_order_state, expected_inventory_unit_state|
-  # This factory cannot be built correctly because Shipment#set_up_inventory
-  # requires records to be saved.
-  context "when created" do
-    let(:stock_location) { create(:stock_location) }
-    let(:first_variant) { create(:variant) }
-    let(:second_variant) { create(:variant) }
-    let(:shipping_method) { create(:shipping_method) }
-    let(:order) do
-      create(
-        factory,
-        stock_location: stock_location,
-        line_items_attributes: [
-          { variant: first_variant, quantity: 1, price: 1 },
-          { variant: second_variant, quantity: 2, price: 2 }
-        ],
-        shipment_cost: 3,
-        shipping_method: shipping_method
-      )
-    end
-
-    it "has the expected attributes" do
-      aggregate_failures "for line items" do
-        expect(order.line_items.count).to eq 2
-        expect(order.line_items[0]).to have_attributes(
-          quantity: 1,
-          price: 1.0
-        )
-        expect(order.line_items[1]).to have_attributes(
-          price: 2.0,
-          quantity: 2
-        )
-      end
-
-      aggregate_failures "for shipments" do
-        expect(order.shipments.count).to eq 1
-        expect(order.shipments[0]).to have_attributes(
-          amount: 3.0,
-          stock_location: stock_location
-        )
-
-        expect(order.shipments[0].shipping_method).to eq(shipping_method)
-
-        # Explicitly order by line item id, because otherwise these can be in
-        # an arbitrary order.
-        inventory_units = order.shipments[0].inventory_units.sort_by(&:line_item_id)
-
-        expect(inventory_units.count).to eq(3)
-        expect(inventory_units[0]).to have_attributes(
-          order: order,
-          shipment: order.shipments[0],
-          line_item: order.line_items[0],
-          variant: order.line_items[0].variant,
-          state: expected_inventory_unit_state
-        )
-        expect(inventory_units[1]).to have_attributes(
-          order: order,
-          shipment: order.shipments[0],
-          line_item: order.line_items[1],
-          variant: order.line_items[1].variant,
-          state: expected_inventory_unit_state
-        )
-        expect(inventory_units[2]).to have_attributes(
-          order: order,
-          shipment: order.shipments[0],
-          line_item: order.line_items[1],
-          variant: order.line_items[1].variant,
-          state: expected_inventory_unit_state
-        )
-      end
-
-      expect(order).to have_attributes(
-        item_total: 5.0,
-        ship_total: 3.0,
-        total: 8.0,
-        state: expected_order_state
-      )
-    end
-  end
-
-  context 'when shipments should be taxed' do
-    let!(:ship_address) { create(:address) }
-    let!(:tax_zone) { create(:global_zone) } # will include the above address
-    let!(:tax_rate) { create(:tax_rate, amount: 0.10, zone: tax_zone, tax_categories: [tax_category]) }
-
-    let(:tax_category) { create(:tax_category) }
-    let(:shipping_method) { create(:shipping_method, tax_category: tax_category, zones: [tax_zone]) }
-
-    it 'shipments get a tax adjustment' do
-      order = create(factory, ship_address: ship_address, shipping_method: shipping_method)
-      shipment = order.shipments[0]
-
-      expect(shipment.additional_tax_total).to be > 0
-    end
-  end
-end
-
-RSpec.shared_examples 'supplied completed_at is respected' do
-  context 'when passed a completed_at timestamp' do
-    let(:completed_at) { 2.days.ago }
-    let(:order) { create(factory, completed_at: completed_at) }
-
-    it 'respects the timestamp' do
-      expect(order.completed_at).to be_within(5.seconds).of(completed_at)
-    end
-  end
-
-  context 'when no completed_at timestamp is passed' do
-    let(:order) { create(factory) }
-
-    it 'defaults to the current time' do
-      expect(order.completed_at).to be_within(2.seconds).of(Time.current)
-    end
-  end
-end
+require "spree/testing_support/shared_examples/order_factory"
 
 RSpec.describe 'order factory' do
   let(:factory_class) { Spree::Order }

From b61f3c83679c0612458527dc5d65666b770be8b0 Mon Sep 17 00:00:00 2001
From: Martin Meyerhoff <mamhoff@gmail.com>
Date: Fri, 26 Jan 2024 22:43:24 +0100
Subject: [PATCH 06/19] Make calculator shared examples requirable

---
 .../spree/testing_support/shared_examples/calculator.rb}        | 0
 core/spec/models/spree/calculator/default_tax_spec.rb           | 2 +-
 core/spec/models/spree/calculator/distributed_amount_spec.rb    | 2 +-
 core/spec/models/spree/calculator/flat_fee_spec.rb              | 2 +-
 .../models/spree/calculator/flat_percent_item_total_spec.rb     | 2 +-
 core/spec/models/spree/calculator/flat_rate_spec.rb             | 2 +-
 core/spec/models/spree/calculator/flexi_rate_spec.rb            | 2 +-
 core/spec/models/spree/calculator/percent_on_line_item_spec.rb  | 2 +-
 .../spree/calculator/refunds/default_refund_amount_spec.rb      | 2 +-
 .../spree/calculator/shipping/flat_percent_item_total_spec.rb   | 2 +-
 core/spec/models/spree/calculator/shipping/flat_rate_spec.rb    | 2 +-
 core/spec/models/spree/calculator/shipping/flexi_rate_spec.rb   | 2 +-
 core/spec/models/spree/calculator/shipping/per_item_spec.rb     | 2 +-
 core/spec/models/spree/calculator/shipping/price_sack_spec.rb   | 2 +-
 core/spec/models/spree/calculator/tiered_flat_rate_spec.rb      | 2 +-
 core/spec/models/spree/calculator/tiered_percent_spec.rb        | 2 +-
 16 files changed, 15 insertions(+), 15 deletions(-)
 rename core/{spec/shared_examples/calculator_shared_examples.rb => lib/spree/testing_support/shared_examples/calculator.rb} (100%)

diff --git a/core/spec/shared_examples/calculator_shared_examples.rb b/core/lib/spree/testing_support/shared_examples/calculator.rb
similarity index 100%
rename from core/spec/shared_examples/calculator_shared_examples.rb
rename to core/lib/spree/testing_support/shared_examples/calculator.rb
diff --git a/core/spec/models/spree/calculator/default_tax_spec.rb b/core/spec/models/spree/calculator/default_tax_spec.rb
index ea7bc93593a..35352d9d13c 100644
--- a/core/spec/models/spree/calculator/default_tax_spec.rb
+++ b/core/spec/models/spree/calculator/default_tax_spec.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'rails_helper'
-require 'shared_examples/calculator_shared_examples'
+require 'spree/testing_support/shared_examples/calculator'
 
 RSpec.describe Spree::Calculator::DefaultTax, type: :model do
   let(:address) { create(:address) }
diff --git a/core/spec/models/spree/calculator/distributed_amount_spec.rb b/core/spec/models/spree/calculator/distributed_amount_spec.rb
index 17f9eee82fc..ffba048490c 100644
--- a/core/spec/models/spree/calculator/distributed_amount_spec.rb
+++ b/core/spec/models/spree/calculator/distributed_amount_spec.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'rails_helper'
-require 'shared_examples/calculator_shared_examples'
+require 'spree/testing_support/shared_examples/calculator'
 
 RSpec.describe Spree::Calculator::DistributedAmount, type: :model do
   context 'applied to an order' do
diff --git a/core/spec/models/spree/calculator/flat_fee_spec.rb b/core/spec/models/spree/calculator/flat_fee_spec.rb
index 187aeb70582..97f1b64c649 100644
--- a/core/spec/models/spree/calculator/flat_fee_spec.rb
+++ b/core/spec/models/spree/calculator/flat_fee_spec.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require "rails_helper"
-require "shared_examples/calculator_shared_examples"
+require 'spree/testing_support/shared_examples/calculator'
 
 RSpec.describe Spree::Calculator::FlatFee, type: :model do
   let(:tax_rate) { build(:tax_rate, amount: 42) }
diff --git a/core/spec/models/spree/calculator/flat_percent_item_total_spec.rb b/core/spec/models/spree/calculator/flat_percent_item_total_spec.rb
index 3c4565a5714..dad78a5df3f 100644
--- a/core/spec/models/spree/calculator/flat_percent_item_total_spec.rb
+++ b/core/spec/models/spree/calculator/flat_percent_item_total_spec.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'rails_helper'
-require 'shared_examples/calculator_shared_examples'
+require 'spree/testing_support/shared_examples/calculator'
 
 RSpec.describe Spree::Calculator::FlatPercentItemTotal, type: :model do
   let(:calculator) { Spree::Calculator::FlatPercentItemTotal.new }
diff --git a/core/spec/models/spree/calculator/flat_rate_spec.rb b/core/spec/models/spree/calculator/flat_rate_spec.rb
index 8b986aaa087..5e7b4fe91ae 100644
--- a/core/spec/models/spree/calculator/flat_rate_spec.rb
+++ b/core/spec/models/spree/calculator/flat_rate_spec.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'rails_helper'
-require 'shared_examples/calculator_shared_examples'
+require 'spree/testing_support/shared_examples/calculator'
 
 RSpec.describe Spree::Calculator::FlatRate, type: :model do
   let(:calculator) { Spree::Calculator::FlatRate.new }
diff --git a/core/spec/models/spree/calculator/flexi_rate_spec.rb b/core/spec/models/spree/calculator/flexi_rate_spec.rb
index 64d0a6394d7..8d1beb573bb 100644
--- a/core/spec/models/spree/calculator/flexi_rate_spec.rb
+++ b/core/spec/models/spree/calculator/flexi_rate_spec.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'rails_helper'
-require 'shared_examples/calculator_shared_examples'
+require 'spree/testing_support/shared_examples/calculator'
 
 RSpec.describe Spree::Calculator::FlexiRate, type: :model do
   let(:calculator) do
diff --git a/core/spec/models/spree/calculator/percent_on_line_item_spec.rb b/core/spec/models/spree/calculator/percent_on_line_item_spec.rb
index 7d98485c0c9..da73cf2180e 100644
--- a/core/spec/models/spree/calculator/percent_on_line_item_spec.rb
+++ b/core/spec/models/spree/calculator/percent_on_line_item_spec.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'rails_helper'
-require 'shared_examples/calculator_shared_examples'
+require 'spree/testing_support/shared_examples/calculator'
 
 module Spree
   RSpec.describe Calculator::PercentOnLineItem, type: :model do
diff --git a/core/spec/models/spree/calculator/refunds/default_refund_amount_spec.rb b/core/spec/models/spree/calculator/refunds/default_refund_amount_spec.rb
index f5d9c88e969..9a07fa5d40d 100644
--- a/core/spec/models/spree/calculator/refunds/default_refund_amount_spec.rb
+++ b/core/spec/models/spree/calculator/refunds/default_refund_amount_spec.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'rails_helper'
-require 'shared_examples/calculator_shared_examples'
+require 'spree/testing_support/shared_examples/calculator'
 
 RSpec.describe Spree::Calculator::Returns::DefaultRefundAmount, type: :model do
   let(:line_item_quantity) { 3 }
diff --git a/core/spec/models/spree/calculator/shipping/flat_percent_item_total_spec.rb b/core/spec/models/spree/calculator/shipping/flat_percent_item_total_spec.rb
index 35055b29f38..71ae6b69cb3 100644
--- a/core/spec/models/spree/calculator/shipping/flat_percent_item_total_spec.rb
+++ b/core/spec/models/spree/calculator/shipping/flat_percent_item_total_spec.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'rails_helper'
-require 'shared_examples/calculator_shared_examples'
+require 'spree/testing_support/shared_examples/calculator'
 
 module Spree
   module Calculator::Shipping
diff --git a/core/spec/models/spree/calculator/shipping/flat_rate_spec.rb b/core/spec/models/spree/calculator/shipping/flat_rate_spec.rb
index f82c849dabf..1bc3b3d410e 100644
--- a/core/spec/models/spree/calculator/shipping/flat_rate_spec.rb
+++ b/core/spec/models/spree/calculator/shipping/flat_rate_spec.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'rails_helper'
-require 'shared_examples/calculator_shared_examples'
+require 'spree/testing_support/shared_examples/calculator'
 
 module Spree
   module Calculator::Shipping
diff --git a/core/spec/models/spree/calculator/shipping/flexi_rate_spec.rb b/core/spec/models/spree/calculator/shipping/flexi_rate_spec.rb
index 6fc397b7ea4..1238ced88be 100644
--- a/core/spec/models/spree/calculator/shipping/flexi_rate_spec.rb
+++ b/core/spec/models/spree/calculator/shipping/flexi_rate_spec.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'rails_helper'
-require 'shared_examples/calculator_shared_examples'
+require 'spree/testing_support/shared_examples/calculator'
 
 module Spree
   module Calculator::Shipping
diff --git a/core/spec/models/spree/calculator/shipping/per_item_spec.rb b/core/spec/models/spree/calculator/shipping/per_item_spec.rb
index de3b7b42475..c85ae73ca46 100644
--- a/core/spec/models/spree/calculator/shipping/per_item_spec.rb
+++ b/core/spec/models/spree/calculator/shipping/per_item_spec.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'rails_helper'
-require 'shared_examples/calculator_shared_examples'
+require 'spree/testing_support/shared_examples/calculator'
 
 module Spree
   module Calculator::Shipping
diff --git a/core/spec/models/spree/calculator/shipping/price_sack_spec.rb b/core/spec/models/spree/calculator/shipping/price_sack_spec.rb
index b7df6b3c250..2150a85af9c 100644
--- a/core/spec/models/spree/calculator/shipping/price_sack_spec.rb
+++ b/core/spec/models/spree/calculator/shipping/price_sack_spec.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'rails_helper'
-require 'shared_examples/calculator_shared_examples'
+require 'spree/testing_support/shared_examples/calculator'
 
 RSpec.describe Spree::Calculator::Shipping::PriceSack, type: :model do
   let(:calculator) do
diff --git a/core/spec/models/spree/calculator/tiered_flat_rate_spec.rb b/core/spec/models/spree/calculator/tiered_flat_rate_spec.rb
index e81e9647cc1..36af4d70b78 100644
--- a/core/spec/models/spree/calculator/tiered_flat_rate_spec.rb
+++ b/core/spec/models/spree/calculator/tiered_flat_rate_spec.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'rails_helper'
-require 'shared_examples/calculator_shared_examples'
+require 'spree/testing_support/shared_examples/calculator'
 
 RSpec.describe Spree::Calculator::TieredFlatRate, type: :model do
   let(:calculator) { Spree::Calculator::TieredFlatRate.new }
diff --git a/core/spec/models/spree/calculator/tiered_percent_spec.rb b/core/spec/models/spree/calculator/tiered_percent_spec.rb
index 410c7c1b29a..00b747c3e7b 100644
--- a/core/spec/models/spree/calculator/tiered_percent_spec.rb
+++ b/core/spec/models/spree/calculator/tiered_percent_spec.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'rails_helper'
-require 'shared_examples/calculator_shared_examples'
+require 'spree/testing_support/shared_examples/calculator'
 
 RSpec.describe Spree::Calculator::TieredPercent, type: :model do
   let(:calculator) { Spree::Calculator::TieredPercent.new }

From fc95b158b3a8c083736baf3c70972149ffb057db Mon Sep 17 00:00:00 2001
From: Martin Meyerhoff <mamhoff@gmail.com>
Date: Fri, 26 Jan 2024 23:30:05 +0100
Subject: [PATCH 07/19] Make DummyAbility require-able

We need this ability across several gems in the future.
---
 .../{spec/support => lib/spree/testing_support}/dummy_ability.rb | 0
 core/spec/lib/spree/core/role_configuration_spec.rb              | 1 +
 core/spec/models/spree/permission_sets/configuration_display.rb  | 1 +
 .../spree/permission_sets/configuration_management_spec.rb       | 1 +
 core/spec/models/spree/permission_sets/dashboard_display_spec.rb | 1 +
 core/spec/models/spree/permission_sets/order_display_spec.rb     | 1 +
 core/spec/models/spree/permission_sets/order_management_spec.rb  | 1 +
 core/spec/models/spree/permission_sets/product_display_spec.rb   | 1 +
 .../spec/models/spree/permission_sets/product_management_spec.rb | 1 +
 core/spec/models/spree/permission_sets/promotion_display_spec.rb | 1 +
 .../models/spree/permission_sets/promotion_management_spec.rb    | 1 +
 core/spec/models/spree/permission_sets/stock_display_spec.rb     | 1 +
 core/spec/models/spree/permission_sets/stock_management_spec.rb  | 1 +
 core/spec/models/spree/permission_sets/user_display_spec.rb      | 1 +
 core/spec/models/spree/permission_sets/user_management_spec.rb   | 1 +
 15 files changed, 14 insertions(+)
 rename core/{spec/support => lib/spree/testing_support}/dummy_ability.rb (100%)

diff --git a/core/spec/support/dummy_ability.rb b/core/lib/spree/testing_support/dummy_ability.rb
similarity index 100%
rename from core/spec/support/dummy_ability.rb
rename to core/lib/spree/testing_support/dummy_ability.rb
diff --git a/core/spec/lib/spree/core/role_configuration_spec.rb b/core/spec/lib/spree/core/role_configuration_spec.rb
index 2fbf8665065..cf3e5da3802 100644
--- a/core/spec/lib/spree/core/role_configuration_spec.rb
+++ b/core/spec/lib/spree/core/role_configuration_spec.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'rails_helper'
+require 'spree/testing_support/dummy_ability'
 
 RSpec.describe Spree::RoleConfiguration do
   class DummyPermissionSet < Spree::PermissionSets::Base
diff --git a/core/spec/models/spree/permission_sets/configuration_display.rb b/core/spec/models/spree/permission_sets/configuration_display.rb
index b9eab408a19..0489d1f8825 100644
--- a/core/spec/models/spree/permission_sets/configuration_display.rb
+++ b/core/spec/models/spree/permission_sets/configuration_display.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'rails_helper'
+require 'spree/testing_support/dummy_ability'
 
 RSpec.describe Spree::PermissionSets::ConfigurationDisplay do
   let(:ability) { DummyAbility.new }
diff --git a/core/spec/models/spree/permission_sets/configuration_management_spec.rb b/core/spec/models/spree/permission_sets/configuration_management_spec.rb
index e067aa84c53..fdb26475b1c 100644
--- a/core/spec/models/spree/permission_sets/configuration_management_spec.rb
+++ b/core/spec/models/spree/permission_sets/configuration_management_spec.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'rails_helper'
+require 'spree/testing_support/dummy_ability'
 
 RSpec.describe Spree::PermissionSets::ConfigurationManagement do
   let(:ability) { DummyAbility.new }
diff --git a/core/spec/models/spree/permission_sets/dashboard_display_spec.rb b/core/spec/models/spree/permission_sets/dashboard_display_spec.rb
index b6945e6be7c..e60279eec6d 100644
--- a/core/spec/models/spree/permission_sets/dashboard_display_spec.rb
+++ b/core/spec/models/spree/permission_sets/dashboard_display_spec.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'rails_helper'
+require 'spree/testing_support/dummy_ability'
 
 RSpec.describe Spree::PermissionSets::DashboardDisplay do
   let(:ability) { DummyAbility.new }
diff --git a/core/spec/models/spree/permission_sets/order_display_spec.rb b/core/spec/models/spree/permission_sets/order_display_spec.rb
index 92793eb672e..c6b799ae055 100644
--- a/core/spec/models/spree/permission_sets/order_display_spec.rb
+++ b/core/spec/models/spree/permission_sets/order_display_spec.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'rails_helper'
+require 'spree/testing_support/dummy_ability'
 
 RSpec.describe Spree::PermissionSets::OrderDisplay do
   let(:ability) { DummyAbility.new }
diff --git a/core/spec/models/spree/permission_sets/order_management_spec.rb b/core/spec/models/spree/permission_sets/order_management_spec.rb
index 9084102ecd8..11a9bcf4cdb 100644
--- a/core/spec/models/spree/permission_sets/order_management_spec.rb
+++ b/core/spec/models/spree/permission_sets/order_management_spec.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'rails_helper'
+require 'spree/testing_support/dummy_ability'
 
 RSpec.describe Spree::PermissionSets::OrderManagement do
   let(:ability) { DummyAbility.new }
diff --git a/core/spec/models/spree/permission_sets/product_display_spec.rb b/core/spec/models/spree/permission_sets/product_display_spec.rb
index e2dc0afb67d..45080f8e176 100644
--- a/core/spec/models/spree/permission_sets/product_display_spec.rb
+++ b/core/spec/models/spree/permission_sets/product_display_spec.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'rails_helper'
+require 'spree/testing_support/dummy_ability'
 
 RSpec.describe Spree::PermissionSets::ProductDisplay do
   let(:ability) { DummyAbility.new }
diff --git a/core/spec/models/spree/permission_sets/product_management_spec.rb b/core/spec/models/spree/permission_sets/product_management_spec.rb
index 74266bec9d8..9c533c04fe2 100644
--- a/core/spec/models/spree/permission_sets/product_management_spec.rb
+++ b/core/spec/models/spree/permission_sets/product_management_spec.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'rails_helper'
+require 'spree/testing_support/dummy_ability'
 
 RSpec.describe Spree::PermissionSets::ProductManagement do
   let(:ability) { DummyAbility.new }
diff --git a/core/spec/models/spree/permission_sets/promotion_display_spec.rb b/core/spec/models/spree/permission_sets/promotion_display_spec.rb
index 4b67fd784e0..053e61ed857 100644
--- a/core/spec/models/spree/permission_sets/promotion_display_spec.rb
+++ b/core/spec/models/spree/permission_sets/promotion_display_spec.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'rails_helper'
+require 'spree/testing_support/dummy_ability'
 
 RSpec.describe Spree::PermissionSets::PromotionDisplay do
   let(:ability) { DummyAbility.new }
diff --git a/core/spec/models/spree/permission_sets/promotion_management_spec.rb b/core/spec/models/spree/permission_sets/promotion_management_spec.rb
index 96786aec30b..b1829e33e7c 100644
--- a/core/spec/models/spree/permission_sets/promotion_management_spec.rb
+++ b/core/spec/models/spree/permission_sets/promotion_management_spec.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'rails_helper'
+require 'spree/testing_support/dummy_ability'
 
 RSpec.describe Spree::PermissionSets::PromotionManagement do
   let(:ability) { DummyAbility.new }
diff --git a/core/spec/models/spree/permission_sets/stock_display_spec.rb b/core/spec/models/spree/permission_sets/stock_display_spec.rb
index 94a1f8e78fd..e5515b3f121 100644
--- a/core/spec/models/spree/permission_sets/stock_display_spec.rb
+++ b/core/spec/models/spree/permission_sets/stock_display_spec.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'rails_helper'
+require 'spree/testing_support/dummy_ability'
 
 RSpec.describe Spree::PermissionSets::StockDisplay do
   let(:ability) { DummyAbility.new }
diff --git a/core/spec/models/spree/permission_sets/stock_management_spec.rb b/core/spec/models/spree/permission_sets/stock_management_spec.rb
index cf23875fecb..97eec759977 100644
--- a/core/spec/models/spree/permission_sets/stock_management_spec.rb
+++ b/core/spec/models/spree/permission_sets/stock_management_spec.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'rails_helper'
+require 'spree/testing_support/dummy_ability'
 
 RSpec.describe Spree::PermissionSets::StockManagement do
   let(:ability) { DummyAbility.new }
diff --git a/core/spec/models/spree/permission_sets/user_display_spec.rb b/core/spec/models/spree/permission_sets/user_display_spec.rb
index bb5691502dd..3adc806e4b5 100644
--- a/core/spec/models/spree/permission_sets/user_display_spec.rb
+++ b/core/spec/models/spree/permission_sets/user_display_spec.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'rails_helper'
+require 'spree/testing_support/dummy_ability'
 
 RSpec.describe Spree::PermissionSets::UserDisplay do
   let(:ability) { DummyAbility.new }
diff --git a/core/spec/models/spree/permission_sets/user_management_spec.rb b/core/spec/models/spree/permission_sets/user_management_spec.rb
index 27c0f27eb0d..d148b8c4ed5 100644
--- a/core/spec/models/spree/permission_sets/user_management_spec.rb
+++ b/core/spec/models/spree/permission_sets/user_management_spec.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'rails_helper'
+require 'spree/testing_support/dummy_ability'
 
 RSpec.describe Spree::PermissionSets::UserManagement do
   let(:ability) { DummyAbility.new }

From 8823049fe138c9b6261e2e776646f0cc9eade236 Mon Sep 17 00:00:00 2001
From: Martin Meyerhoff <mamhoff@gmail.com>
Date: Fri, 26 Jan 2024 19:33:09 +0100
Subject: [PATCH 08/19] Extract "working factories" into lib/

This allows to check for working factories outside the core gem.
---
 .../spree/testing_support/shared_examples/working_factory.rb}    | 0
 .../spree/core/testing_support/factories/address_factory_spec.rb | 1 +
 .../core/testing_support/factories/adjustment_factory_spec.rb    | 1 +
 .../testing_support/factories/adjustment_reason_factory_spec.rb  | 1 +
 .../core/testing_support/factories/calculator_factory_spec.rb    | 1 +
 .../spree/core/testing_support/factories/carton_factory_spec.rb  | 1 +
 .../spree/core/testing_support/factories/country_factory_spec.rb | 1 +
 .../core/testing_support/factories/credit_card_factory_spec.rb   | 1 +
 .../testing_support/factories/customer_return_factory_spec.rb    | 1 +
 .../spree/core/testing_support/factories/image_factory_spec.rb   | 1 +
 .../testing_support/factories/inventory_unit_factory_spec.rb     | 1 +
 .../core/testing_support/factories/line_item_factory_spec.rb     | 1 +
 .../core/testing_support/factories/option_type_factory_spec.rb   | 1 +
 .../core/testing_support/factories/option_value_factory_spec.rb  | 1 +
 .../spree/core/testing_support/factories/order_factory_spec.rb   | 1 +
 .../testing_support/factories/order_promotion_factory_spec.rb    | 1 +
 .../spree/core/testing_support/factories/payment_factory_spec.rb | 1 +
 .../testing_support/factories/payment_method_factory_spec.rb     | 1 +
 .../spree/core/testing_support/factories/price_factory_spec.rb   | 1 +
 .../spree/core/testing_support/factories/product_factory_spec.rb | 1 +
 .../factories/product_option_type_factory_spec.rb                | 1 +
 .../testing_support/factories/product_property_factory_spec.rb   | 1 +
 .../testing_support/factories/promotion_category_factory_spec.rb | 1 +
 .../testing_support/factories/promotion_code_factory_spec.rb     | 1 +
 .../core/testing_support/factories/promotion_factory_spec.rb     | 1 +
 .../core/testing_support/factories/property_factory_spec.rb      | 1 +
 .../spree/core/testing_support/factories/refund_factory_spec.rb  | 1 +
 .../core/testing_support/factories/refund_reason_factory_spec.rb | 1 +
 .../core/testing_support/factories/reimbursement_factory_spec.rb | 1 +
 .../testing_support/factories/reimbursement_type_factory_spec.rb | 1 +
 .../factories/return_authorization_factory_spec.rb               | 1 +
 .../core/testing_support/factories/return_item_factory_spec.rb   | 1 +
 .../core/testing_support/factories/return_reason_factory_spec.rb | 1 +
 .../spree/core/testing_support/factories/role_factory_spec.rb    | 1 +
 .../core/testing_support/factories/shipment_factory_spec.rb      | 1 +
 .../testing_support/factories/shipping_category_factory_spec.rb  | 1 +
 .../testing_support/factories/shipping_method_factory_spec.rb    | 1 +
 .../core/testing_support/factories/shipping_rate_factory_spec.rb | 1 +
 .../spree/core/testing_support/factories/state_factory_spec.rb   | 1 +
 .../core/testing_support/factories/stock_item_factory_spec.rb    | 1 +
 .../testing_support/factories/stock_location_factory_spec.rb     | 1 +
 .../testing_support/factories/stock_movement_factory_spec.rb     | 1 +
 .../core/testing_support/factories/stock_package_factory_spec.rb | 1 +
 .../factories/store_credit_category_factory_spec.rb              | 1 +
 .../testing_support/factories/store_credit_event_factory_spec.rb | 1 +
 .../core/testing_support/factories/store_credit_factory_spec.rb  | 1 +
 .../factories/store_credit_reason_factory_spec.rb                | 1 +
 .../testing_support/factories/store_credit_type_factory_spec.rb  | 1 +
 .../spree/core/testing_support/factories/store_factory_spec.rb   | 1 +
 .../core/testing_support/factories/tax_category_factory_spec.rb  | 1 +
 .../core/testing_support/factories/tax_rate_factory_spec.rb      | 1 +
 .../spree/core/testing_support/factories/taxon_factory_spec.rb   | 1 +
 .../core/testing_support/factories/taxonomy_factory_spec.rb      | 1 +
 .../spree/core/testing_support/factories/user_factory_spec.rb    | 1 +
 .../spree/core/testing_support/factories/variant_factory_spec.rb | 1 +
 .../factories/variant_property_rule_condition_factory_spec.rb    | 1 +
 .../factories/variant_property_rule_factory_spec.rb              | 1 +
 .../factories/variant_property_rule_value_factory_spec.rb        | 1 +
 .../spree/core/testing_support/factories/zone_factory_spec.rb    | 1 +
 59 files changed, 58 insertions(+)
 rename core/{spec/support/concerns/working_factories.rb => lib/spree/testing_support/shared_examples/working_factory.rb} (100%)

diff --git a/core/spec/support/concerns/working_factories.rb b/core/lib/spree/testing_support/shared_examples/working_factory.rb
similarity index 100%
rename from core/spec/support/concerns/working_factories.rb
rename to core/lib/spree/testing_support/shared_examples/working_factory.rb
diff --git a/core/spec/lib/spree/core/testing_support/factories/address_factory_spec.rb b/core/spec/lib/spree/core/testing_support/factories/address_factory_spec.rb
index f5a0d93a429..5530f8cbcb5 100644
--- a/core/spec/lib/spree/core/testing_support/factories/address_factory_spec.rb
+++ b/core/spec/lib/spree/core/testing_support/factories/address_factory_spec.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'rails_helper'
+require 'spree/testing_support/shared_examples/working_factory'
 
 RSpec.describe 'address factory' do
   let(:factory_class) { Spree::Address }
diff --git a/core/spec/lib/spree/core/testing_support/factories/adjustment_factory_spec.rb b/core/spec/lib/spree/core/testing_support/factories/adjustment_factory_spec.rb
index 18f35e114a8..3a1a0992481 100644
--- a/core/spec/lib/spree/core/testing_support/factories/adjustment_factory_spec.rb
+++ b/core/spec/lib/spree/core/testing_support/factories/adjustment_factory_spec.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'rails_helper'
+require 'spree/testing_support/shared_examples/working_factory'
 
 RSpec.describe 'adjustment factory' do
   let(:factory_class) { Spree::Adjustment }
diff --git a/core/spec/lib/spree/core/testing_support/factories/adjustment_reason_factory_spec.rb b/core/spec/lib/spree/core/testing_support/factories/adjustment_reason_factory_spec.rb
index 22680aef0d2..50964b3c7f8 100644
--- a/core/spec/lib/spree/core/testing_support/factories/adjustment_reason_factory_spec.rb
+++ b/core/spec/lib/spree/core/testing_support/factories/adjustment_reason_factory_spec.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'rails_helper'
+require 'spree/testing_support/shared_examples/working_factory'
 
 RSpec.describe 'adjustment reason factory' do
   let(:factory_class) { Spree::AdjustmentReason }
diff --git a/core/spec/lib/spree/core/testing_support/factories/calculator_factory_spec.rb b/core/spec/lib/spree/core/testing_support/factories/calculator_factory_spec.rb
index 8099edb0d03..7efaa94dc24 100644
--- a/core/spec/lib/spree/core/testing_support/factories/calculator_factory_spec.rb
+++ b/core/spec/lib/spree/core/testing_support/factories/calculator_factory_spec.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'rails_helper'
+require 'spree/testing_support/shared_examples/working_factory'
 
 RSpec.describe 'calculator factory' do
   let(:factory_class) { Spree::Calculator }
diff --git a/core/spec/lib/spree/core/testing_support/factories/carton_factory_spec.rb b/core/spec/lib/spree/core/testing_support/factories/carton_factory_spec.rb
index 53ef5125ee9..95800abf294 100644
--- a/core/spec/lib/spree/core/testing_support/factories/carton_factory_spec.rb
+++ b/core/spec/lib/spree/core/testing_support/factories/carton_factory_spec.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'rails_helper'
+require 'spree/testing_support/shared_examples/working_factory'
 
 RSpec.describe 'carton factory' do
   let(:factory_class) { Spree::Carton }
diff --git a/core/spec/lib/spree/core/testing_support/factories/country_factory_spec.rb b/core/spec/lib/spree/core/testing_support/factories/country_factory_spec.rb
index aabfb20c43f..7e92e44e592 100644
--- a/core/spec/lib/spree/core/testing_support/factories/country_factory_spec.rb
+++ b/core/spec/lib/spree/core/testing_support/factories/country_factory_spec.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'rails_helper'
+require 'spree/testing_support/shared_examples/working_factory'
 
 RSpec.describe 'country factory' do
   let(:factory_class) { Spree::Country }
diff --git a/core/spec/lib/spree/core/testing_support/factories/credit_card_factory_spec.rb b/core/spec/lib/spree/core/testing_support/factories/credit_card_factory_spec.rb
index f8acb76040b..9f888a9565e 100644
--- a/core/spec/lib/spree/core/testing_support/factories/credit_card_factory_spec.rb
+++ b/core/spec/lib/spree/core/testing_support/factories/credit_card_factory_spec.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'rails_helper'
+require 'spree/testing_support/shared_examples/working_factory'
 
 RSpec.describe 'credit card factory' do
   let(:factory_class) { Spree::CreditCard }
diff --git a/core/spec/lib/spree/core/testing_support/factories/customer_return_factory_spec.rb b/core/spec/lib/spree/core/testing_support/factories/customer_return_factory_spec.rb
index c91f2a51594..e5270316d0d 100644
--- a/core/spec/lib/spree/core/testing_support/factories/customer_return_factory_spec.rb
+++ b/core/spec/lib/spree/core/testing_support/factories/customer_return_factory_spec.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'rails_helper'
+require 'spree/testing_support/shared_examples/working_factory'
 
 RSpec.describe 'customer return factory' do
   let(:factory_class) { Spree::CustomerReturn }
diff --git a/core/spec/lib/spree/core/testing_support/factories/image_factory_spec.rb b/core/spec/lib/spree/core/testing_support/factories/image_factory_spec.rb
index d21cdc417b0..6eeac767d91 100644
--- a/core/spec/lib/spree/core/testing_support/factories/image_factory_spec.rb
+++ b/core/spec/lib/spree/core/testing_support/factories/image_factory_spec.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'rails_helper'
+require 'spree/testing_support/shared_examples/working_factory'
 
 RSpec.describe 'image factory' do
   let(:factory_class) { Spree::Image }
diff --git a/core/spec/lib/spree/core/testing_support/factories/inventory_unit_factory_spec.rb b/core/spec/lib/spree/core/testing_support/factories/inventory_unit_factory_spec.rb
index db24a6d12fc..e86dbf190e3 100644
--- a/core/spec/lib/spree/core/testing_support/factories/inventory_unit_factory_spec.rb
+++ b/core/spec/lib/spree/core/testing_support/factories/inventory_unit_factory_spec.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'rails_helper'
+require 'spree/testing_support/shared_examples/working_factory'
 
 RSpec.describe 'inventory unit factory' do
   let(:factory_class) { Spree::InventoryUnit }
diff --git a/core/spec/lib/spree/core/testing_support/factories/line_item_factory_spec.rb b/core/spec/lib/spree/core/testing_support/factories/line_item_factory_spec.rb
index f2883639c64..5d33112d999 100644
--- a/core/spec/lib/spree/core/testing_support/factories/line_item_factory_spec.rb
+++ b/core/spec/lib/spree/core/testing_support/factories/line_item_factory_spec.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'rails_helper'
+require 'spree/testing_support/shared_examples/working_factory'
 
 RSpec.describe 'line item factory' do
   let(:factory_class) { Spree::LineItem }
diff --git a/core/spec/lib/spree/core/testing_support/factories/option_type_factory_spec.rb b/core/spec/lib/spree/core/testing_support/factories/option_type_factory_spec.rb
index 15ba10f9f9e..e0604bd2e01 100644
--- a/core/spec/lib/spree/core/testing_support/factories/option_type_factory_spec.rb
+++ b/core/spec/lib/spree/core/testing_support/factories/option_type_factory_spec.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'rails_helper'
+require 'spree/testing_support/shared_examples/working_factory'
 
 RSpec.describe 'option type factory' do
   let(:factory_class) { Spree::OptionType }
diff --git a/core/spec/lib/spree/core/testing_support/factories/option_value_factory_spec.rb b/core/spec/lib/spree/core/testing_support/factories/option_value_factory_spec.rb
index 0f33cb32e61..a3d5d9a7f44 100644
--- a/core/spec/lib/spree/core/testing_support/factories/option_value_factory_spec.rb
+++ b/core/spec/lib/spree/core/testing_support/factories/option_value_factory_spec.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'rails_helper'
+require 'spree/testing_support/shared_examples/working_factory'
 
 RSpec.describe 'option value factory' do
   let(:factory_class) { Spree::OptionValue }
diff --git a/core/spec/lib/spree/core/testing_support/factories/order_factory_spec.rb b/core/spec/lib/spree/core/testing_support/factories/order_factory_spec.rb
index 5ca5bca1923..b0190bc7f45 100644
--- a/core/spec/lib/spree/core/testing_support/factories/order_factory_spec.rb
+++ b/core/spec/lib/spree/core/testing_support/factories/order_factory_spec.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'rails_helper'
+require 'spree/testing_support/shared_examples/working_factory'
 require "spree/testing_support/shared_examples/order_factory"
 
 RSpec.describe 'order factory' do
diff --git a/core/spec/lib/spree/core/testing_support/factories/order_promotion_factory_spec.rb b/core/spec/lib/spree/core/testing_support/factories/order_promotion_factory_spec.rb
index 193f2abc6de..15cf1e891d8 100644
--- a/core/spec/lib/spree/core/testing_support/factories/order_promotion_factory_spec.rb
+++ b/core/spec/lib/spree/core/testing_support/factories/order_promotion_factory_spec.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'rails_helper'
+require 'spree/testing_support/shared_examples/working_factory'
 
 RSpec.describe 'order promotion factory' do
   let(:factory_class) { Spree::OrderPromotion }
diff --git a/core/spec/lib/spree/core/testing_support/factories/payment_factory_spec.rb b/core/spec/lib/spree/core/testing_support/factories/payment_factory_spec.rb
index b89a863a9a1..cd8117a9b56 100644
--- a/core/spec/lib/spree/core/testing_support/factories/payment_factory_spec.rb
+++ b/core/spec/lib/spree/core/testing_support/factories/payment_factory_spec.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'rails_helper'
+require 'spree/testing_support/shared_examples/working_factory'
 
 RSpec.describe 'payment factory' do
   let(:factory_class) { Spree::Payment }
diff --git a/core/spec/lib/spree/core/testing_support/factories/payment_method_factory_spec.rb b/core/spec/lib/spree/core/testing_support/factories/payment_method_factory_spec.rb
index ff008d55269..a4092addbd9 100644
--- a/core/spec/lib/spree/core/testing_support/factories/payment_method_factory_spec.rb
+++ b/core/spec/lib/spree/core/testing_support/factories/payment_method_factory_spec.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'rails_helper'
+require 'spree/testing_support/shared_examples/working_factory'
 
 RSpec.describe 'payment method factory' do
   let(:factory_class) { Spree::PaymentMethod }
diff --git a/core/spec/lib/spree/core/testing_support/factories/price_factory_spec.rb b/core/spec/lib/spree/core/testing_support/factories/price_factory_spec.rb
index 77ea9a4248c..1726a5dae3d 100644
--- a/core/spec/lib/spree/core/testing_support/factories/price_factory_spec.rb
+++ b/core/spec/lib/spree/core/testing_support/factories/price_factory_spec.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'rails_helper'
+require 'spree/testing_support/shared_examples/working_factory'
 
 RSpec.describe 'price factory' do
   let(:factory_class) { Spree::Price }
diff --git a/core/spec/lib/spree/core/testing_support/factories/product_factory_spec.rb b/core/spec/lib/spree/core/testing_support/factories/product_factory_spec.rb
index bcc906cba4e..bdb17b5317d 100644
--- a/core/spec/lib/spree/core/testing_support/factories/product_factory_spec.rb
+++ b/core/spec/lib/spree/core/testing_support/factories/product_factory_spec.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'rails_helper'
+require 'spree/testing_support/shared_examples/working_factory'
 
 RSpec.describe 'product factory' do
   let(:factory_class) { Spree::Product }
diff --git a/core/spec/lib/spree/core/testing_support/factories/product_option_type_factory_spec.rb b/core/spec/lib/spree/core/testing_support/factories/product_option_type_factory_spec.rb
index f4ee28b24ca..0764dad61a9 100644
--- a/core/spec/lib/spree/core/testing_support/factories/product_option_type_factory_spec.rb
+++ b/core/spec/lib/spree/core/testing_support/factories/product_option_type_factory_spec.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'rails_helper'
+require 'spree/testing_support/shared_examples/working_factory'
 
 RSpec.describe 'product option type factory' do
   let(:factory_class) { Spree::ProductOptionType }
diff --git a/core/spec/lib/spree/core/testing_support/factories/product_property_factory_spec.rb b/core/spec/lib/spree/core/testing_support/factories/product_property_factory_spec.rb
index 22e367c66cd..27e1c9c80b1 100644
--- a/core/spec/lib/spree/core/testing_support/factories/product_property_factory_spec.rb
+++ b/core/spec/lib/spree/core/testing_support/factories/product_property_factory_spec.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'rails_helper'
+require 'spree/testing_support/shared_examples/working_factory'
 
 RSpec.describe 'product property factory' do
   let(:factory_class) { Spree::ProductProperty }
diff --git a/core/spec/lib/spree/core/testing_support/factories/promotion_category_factory_spec.rb b/core/spec/lib/spree/core/testing_support/factories/promotion_category_factory_spec.rb
index 906d149c092..6ce2c61bc7c 100644
--- a/core/spec/lib/spree/core/testing_support/factories/promotion_category_factory_spec.rb
+++ b/core/spec/lib/spree/core/testing_support/factories/promotion_category_factory_spec.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'rails_helper'
+require 'spree/testing_support/shared_examples/working_factory'
 
 RSpec.describe 'promotion category factory' do
   let(:factory_class) { Spree::PromotionCategory }
diff --git a/core/spec/lib/spree/core/testing_support/factories/promotion_code_factory_spec.rb b/core/spec/lib/spree/core/testing_support/factories/promotion_code_factory_spec.rb
index 7b240596384..47bf6cb2c1d 100644
--- a/core/spec/lib/spree/core/testing_support/factories/promotion_code_factory_spec.rb
+++ b/core/spec/lib/spree/core/testing_support/factories/promotion_code_factory_spec.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'rails_helper'
+require 'spree/testing_support/shared_examples/working_factory'
 
 RSpec.describe 'promotion code factory' do
   let(:factory_class) { Spree::PromotionCode }
diff --git a/core/spec/lib/spree/core/testing_support/factories/promotion_factory_spec.rb b/core/spec/lib/spree/core/testing_support/factories/promotion_factory_spec.rb
index efef29758df..2af76303cd5 100644
--- a/core/spec/lib/spree/core/testing_support/factories/promotion_factory_spec.rb
+++ b/core/spec/lib/spree/core/testing_support/factories/promotion_factory_spec.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'rails_helper'
+require 'spree/testing_support/shared_examples/working_factory'
 
 RSpec.describe 'promotion code factory' do
   let(:factory_class) { Spree::Promotion }
diff --git a/core/spec/lib/spree/core/testing_support/factories/property_factory_spec.rb b/core/spec/lib/spree/core/testing_support/factories/property_factory_spec.rb
index 221cef9098e..199033409a2 100644
--- a/core/spec/lib/spree/core/testing_support/factories/property_factory_spec.rb
+++ b/core/spec/lib/spree/core/testing_support/factories/property_factory_spec.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'rails_helper'
+require 'spree/testing_support/shared_examples/working_factory'
 
 RSpec.describe 'property factory' do
   let(:factory_class) { Spree::Property }
diff --git a/core/spec/lib/spree/core/testing_support/factories/refund_factory_spec.rb b/core/spec/lib/spree/core/testing_support/factories/refund_factory_spec.rb
index a7b707d777f..28a003a8223 100644
--- a/core/spec/lib/spree/core/testing_support/factories/refund_factory_spec.rb
+++ b/core/spec/lib/spree/core/testing_support/factories/refund_factory_spec.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'rails_helper'
+require 'spree/testing_support/shared_examples/working_factory'
 
 RSpec.describe 'refund factory' do
   let(:factory_class) { Spree::Refund }
diff --git a/core/spec/lib/spree/core/testing_support/factories/refund_reason_factory_spec.rb b/core/spec/lib/spree/core/testing_support/factories/refund_reason_factory_spec.rb
index a7b707d777f..28a003a8223 100644
--- a/core/spec/lib/spree/core/testing_support/factories/refund_reason_factory_spec.rb
+++ b/core/spec/lib/spree/core/testing_support/factories/refund_reason_factory_spec.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'rails_helper'
+require 'spree/testing_support/shared_examples/working_factory'
 
 RSpec.describe 'refund factory' do
   let(:factory_class) { Spree::Refund }
diff --git a/core/spec/lib/spree/core/testing_support/factories/reimbursement_factory_spec.rb b/core/spec/lib/spree/core/testing_support/factories/reimbursement_factory_spec.rb
index e62b9150978..256b7af12e2 100644
--- a/core/spec/lib/spree/core/testing_support/factories/reimbursement_factory_spec.rb
+++ b/core/spec/lib/spree/core/testing_support/factories/reimbursement_factory_spec.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'rails_helper'
+require 'spree/testing_support/shared_examples/working_factory'
 
 RSpec.describe 'reimbursement factory' do
   let(:factory_class) { Spree::Reimbursement }
diff --git a/core/spec/lib/spree/core/testing_support/factories/reimbursement_type_factory_spec.rb b/core/spec/lib/spree/core/testing_support/factories/reimbursement_type_factory_spec.rb
index 5cd9cd176ac..cb80dd48cae 100644
--- a/core/spec/lib/spree/core/testing_support/factories/reimbursement_type_factory_spec.rb
+++ b/core/spec/lib/spree/core/testing_support/factories/reimbursement_type_factory_spec.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'rails_helper'
+require 'spree/testing_support/shared_examples/working_factory'
 
 RSpec.describe 'reimbursement type factory' do
   let(:factory_class) { Spree::ReimbursementType }
diff --git a/core/spec/lib/spree/core/testing_support/factories/return_authorization_factory_spec.rb b/core/spec/lib/spree/core/testing_support/factories/return_authorization_factory_spec.rb
index 4898cd2ad6e..4bac76d427f 100644
--- a/core/spec/lib/spree/core/testing_support/factories/return_authorization_factory_spec.rb
+++ b/core/spec/lib/spree/core/testing_support/factories/return_authorization_factory_spec.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'rails_helper'
+require 'spree/testing_support/shared_examples/working_factory'
 
 RSpec.describe 'return authorization factory' do
   let(:factory_class) { Spree::ReturnAuthorization }
diff --git a/core/spec/lib/spree/core/testing_support/factories/return_item_factory_spec.rb b/core/spec/lib/spree/core/testing_support/factories/return_item_factory_spec.rb
index 2d5078f594a..a984040a53c 100644
--- a/core/spec/lib/spree/core/testing_support/factories/return_item_factory_spec.rb
+++ b/core/spec/lib/spree/core/testing_support/factories/return_item_factory_spec.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'rails_helper'
+require 'spree/testing_support/shared_examples/working_factory'
 
 RSpec.describe 'return item factory' do
   let(:factory_class) { Spree::ReturnItem }
diff --git a/core/spec/lib/spree/core/testing_support/factories/return_reason_factory_spec.rb b/core/spec/lib/spree/core/testing_support/factories/return_reason_factory_spec.rb
index 344b0a17673..45b23dfd028 100644
--- a/core/spec/lib/spree/core/testing_support/factories/return_reason_factory_spec.rb
+++ b/core/spec/lib/spree/core/testing_support/factories/return_reason_factory_spec.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'rails_helper'
+require 'spree/testing_support/shared_examples/working_factory'
 
 RSpec.describe 'return reason factory' do
   let(:factory_class) { Spree::ReturnReason }
diff --git a/core/spec/lib/spree/core/testing_support/factories/role_factory_spec.rb b/core/spec/lib/spree/core/testing_support/factories/role_factory_spec.rb
index df03128cd58..d8a2fa08976 100644
--- a/core/spec/lib/spree/core/testing_support/factories/role_factory_spec.rb
+++ b/core/spec/lib/spree/core/testing_support/factories/role_factory_spec.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'rails_helper'
+require 'spree/testing_support/shared_examples/working_factory'
 
 RSpec.describe 'role factory' do
   let(:factory_class) { Spree::Role }
diff --git a/core/spec/lib/spree/core/testing_support/factories/shipment_factory_spec.rb b/core/spec/lib/spree/core/testing_support/factories/shipment_factory_spec.rb
index 988b33f90dd..0b9cb97e4e7 100644
--- a/core/spec/lib/spree/core/testing_support/factories/shipment_factory_spec.rb
+++ b/core/spec/lib/spree/core/testing_support/factories/shipment_factory_spec.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'rails_helper'
+require 'spree/testing_support/shared_examples/working_factory'
 
 RSpec.describe 'shipment factory' do
   let(:factory_class) { Spree::Shipment }
diff --git a/core/spec/lib/spree/core/testing_support/factories/shipping_category_factory_spec.rb b/core/spec/lib/spree/core/testing_support/factories/shipping_category_factory_spec.rb
index aabf2b228d7..92e6e0a2fdb 100644
--- a/core/spec/lib/spree/core/testing_support/factories/shipping_category_factory_spec.rb
+++ b/core/spec/lib/spree/core/testing_support/factories/shipping_category_factory_spec.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'rails_helper'
+require 'spree/testing_support/shared_examples/working_factory'
 
 RSpec.describe 'shipping category factory' do
   let(:factory_class) { Spree::ShippingCategory }
diff --git a/core/spec/lib/spree/core/testing_support/factories/shipping_method_factory_spec.rb b/core/spec/lib/spree/core/testing_support/factories/shipping_method_factory_spec.rb
index ebecff954a4..fb3557625f9 100644
--- a/core/spec/lib/spree/core/testing_support/factories/shipping_method_factory_spec.rb
+++ b/core/spec/lib/spree/core/testing_support/factories/shipping_method_factory_spec.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'rails_helper'
+require 'spree/testing_support/shared_examples/working_factory'
 
 RSpec.describe 'shipping method factory' do
   let(:factory_class) { Spree::ShippingMethod }
diff --git a/core/spec/lib/spree/core/testing_support/factories/shipping_rate_factory_spec.rb b/core/spec/lib/spree/core/testing_support/factories/shipping_rate_factory_spec.rb
index de1d62ffcfe..28f06818d30 100644
--- a/core/spec/lib/spree/core/testing_support/factories/shipping_rate_factory_spec.rb
+++ b/core/spec/lib/spree/core/testing_support/factories/shipping_rate_factory_spec.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'rails_helper'
+require 'spree/testing_support/shared_examples/working_factory'
 
 RSpec.describe 'shipping rate factory' do
   let(:factory_class) { Spree::ShippingRate }
diff --git a/core/spec/lib/spree/core/testing_support/factories/state_factory_spec.rb b/core/spec/lib/spree/core/testing_support/factories/state_factory_spec.rb
index 2378fb27f5e..1d897f7fa11 100644
--- a/core/spec/lib/spree/core/testing_support/factories/state_factory_spec.rb
+++ b/core/spec/lib/spree/core/testing_support/factories/state_factory_spec.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'rails_helper'
+require 'spree/testing_support/shared_examples/working_factory'
 
 RSpec.describe 'state factory' do
   let(:factory_class) { Spree::State }
diff --git a/core/spec/lib/spree/core/testing_support/factories/stock_item_factory_spec.rb b/core/spec/lib/spree/core/testing_support/factories/stock_item_factory_spec.rb
index 1b745f4bd38..ee217309ab6 100644
--- a/core/spec/lib/spree/core/testing_support/factories/stock_item_factory_spec.rb
+++ b/core/spec/lib/spree/core/testing_support/factories/stock_item_factory_spec.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'rails_helper'
+require 'spree/testing_support/shared_examples/working_factory'
 
 RSpec.describe 'stock item factory' do
   let(:factory_class) { Spree::StockItem }
diff --git a/core/spec/lib/spree/core/testing_support/factories/stock_location_factory_spec.rb b/core/spec/lib/spree/core/testing_support/factories/stock_location_factory_spec.rb
index befb0f88c4c..7866762fe8a 100644
--- a/core/spec/lib/spree/core/testing_support/factories/stock_location_factory_spec.rb
+++ b/core/spec/lib/spree/core/testing_support/factories/stock_location_factory_spec.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'rails_helper'
+require 'spree/testing_support/shared_examples/working_factory'
 
 RSpec.describe 'stock location factory' do
   let(:factory_class) { Spree::StockLocation }
diff --git a/core/spec/lib/spree/core/testing_support/factories/stock_movement_factory_spec.rb b/core/spec/lib/spree/core/testing_support/factories/stock_movement_factory_spec.rb
index 1ed358e9deb..d58782e6669 100644
--- a/core/spec/lib/spree/core/testing_support/factories/stock_movement_factory_spec.rb
+++ b/core/spec/lib/spree/core/testing_support/factories/stock_movement_factory_spec.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'rails_helper'
+require 'spree/testing_support/shared_examples/working_factory'
 
 RSpec.describe 'stock movement factory' do
   let(:factory_class) { Spree::StockMovement }
diff --git a/core/spec/lib/spree/core/testing_support/factories/stock_package_factory_spec.rb b/core/spec/lib/spree/core/testing_support/factories/stock_package_factory_spec.rb
index 1e7645df7e5..d63732810aa 100644
--- a/core/spec/lib/spree/core/testing_support/factories/stock_package_factory_spec.rb
+++ b/core/spec/lib/spree/core/testing_support/factories/stock_package_factory_spec.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'rails_helper'
+require 'spree/testing_support/shared_examples/working_factory'
 
 RSpec.describe 'stock package factory' do
   let(:factory_class) { Spree::Stock::Package }
diff --git a/core/spec/lib/spree/core/testing_support/factories/store_credit_category_factory_spec.rb b/core/spec/lib/spree/core/testing_support/factories/store_credit_category_factory_spec.rb
index e22178b5288..61513d2299d 100644
--- a/core/spec/lib/spree/core/testing_support/factories/store_credit_category_factory_spec.rb
+++ b/core/spec/lib/spree/core/testing_support/factories/store_credit_category_factory_spec.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'rails_helper'
+require 'spree/testing_support/shared_examples/working_factory'
 
 RSpec.describe 'store credit category factory' do
   let(:factory_class) { Spree::StoreCreditCategory }
diff --git a/core/spec/lib/spree/core/testing_support/factories/store_credit_event_factory_spec.rb b/core/spec/lib/spree/core/testing_support/factories/store_credit_event_factory_spec.rb
index 8cb844cab58..1595edc5747 100644
--- a/core/spec/lib/spree/core/testing_support/factories/store_credit_event_factory_spec.rb
+++ b/core/spec/lib/spree/core/testing_support/factories/store_credit_event_factory_spec.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'rails_helper'
+require 'spree/testing_support/shared_examples/working_factory'
 
 RSpec.describe 'store credit event factory' do
   let(:factory_class) { Spree::StoreCreditEvent }
diff --git a/core/spec/lib/spree/core/testing_support/factories/store_credit_factory_spec.rb b/core/spec/lib/spree/core/testing_support/factories/store_credit_factory_spec.rb
index 4bb282597d0..1182107a09a 100644
--- a/core/spec/lib/spree/core/testing_support/factories/store_credit_factory_spec.rb
+++ b/core/spec/lib/spree/core/testing_support/factories/store_credit_factory_spec.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'rails_helper'
+require 'spree/testing_support/shared_examples/working_factory'
 
 RSpec.describe 'store credit factory' do
   let(:factory_class) { Spree::StoreCredit }
diff --git a/core/spec/lib/spree/core/testing_support/factories/store_credit_reason_factory_spec.rb b/core/spec/lib/spree/core/testing_support/factories/store_credit_reason_factory_spec.rb
index 55b98c82463..a4f70e49e3a 100644
--- a/core/spec/lib/spree/core/testing_support/factories/store_credit_reason_factory_spec.rb
+++ b/core/spec/lib/spree/core/testing_support/factories/store_credit_reason_factory_spec.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'rails_helper'
+require 'spree/testing_support/shared_examples/working_factory'
 
 RSpec.describe 'store credit reason factory' do
   let(:factory_class) { Spree::StoreCreditReason }
diff --git a/core/spec/lib/spree/core/testing_support/factories/store_credit_type_factory_spec.rb b/core/spec/lib/spree/core/testing_support/factories/store_credit_type_factory_spec.rb
index 68dc07d2294..7a2e1e2e634 100644
--- a/core/spec/lib/spree/core/testing_support/factories/store_credit_type_factory_spec.rb
+++ b/core/spec/lib/spree/core/testing_support/factories/store_credit_type_factory_spec.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'rails_helper'
+require 'spree/testing_support/shared_examples/working_factory'
 
 RSpec.describe 'store credit type factory' do
   let(:factory_class) { Spree::StoreCreditType }
diff --git a/core/spec/lib/spree/core/testing_support/factories/store_factory_spec.rb b/core/spec/lib/spree/core/testing_support/factories/store_factory_spec.rb
index 86a76c40842..852f063b5cc 100644
--- a/core/spec/lib/spree/core/testing_support/factories/store_factory_spec.rb
+++ b/core/spec/lib/spree/core/testing_support/factories/store_factory_spec.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'rails_helper'
+require 'spree/testing_support/shared_examples/working_factory'
 
 RSpec.describe 'store factory' do
   let(:factory_class) { Spree::Store }
diff --git a/core/spec/lib/spree/core/testing_support/factories/tax_category_factory_spec.rb b/core/spec/lib/spree/core/testing_support/factories/tax_category_factory_spec.rb
index 3faaca88bb4..f9254a76367 100644
--- a/core/spec/lib/spree/core/testing_support/factories/tax_category_factory_spec.rb
+++ b/core/spec/lib/spree/core/testing_support/factories/tax_category_factory_spec.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'rails_helper'
+require 'spree/testing_support/shared_examples/working_factory'
 
 RSpec.describe 'tax category factory' do
   let(:factory_class) { Spree::TaxCategory }
diff --git a/core/spec/lib/spree/core/testing_support/factories/tax_rate_factory_spec.rb b/core/spec/lib/spree/core/testing_support/factories/tax_rate_factory_spec.rb
index 34e523ef94a..acf6e1a11f4 100644
--- a/core/spec/lib/spree/core/testing_support/factories/tax_rate_factory_spec.rb
+++ b/core/spec/lib/spree/core/testing_support/factories/tax_rate_factory_spec.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'rails_helper'
+require 'spree/testing_support/shared_examples/working_factory'
 
 RSpec.describe 'tax rate factory' do
   let(:factory_class) { Spree::TaxRate }
diff --git a/core/spec/lib/spree/core/testing_support/factories/taxon_factory_spec.rb b/core/spec/lib/spree/core/testing_support/factories/taxon_factory_spec.rb
index 6ee5008495b..9243ad67660 100644
--- a/core/spec/lib/spree/core/testing_support/factories/taxon_factory_spec.rb
+++ b/core/spec/lib/spree/core/testing_support/factories/taxon_factory_spec.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'rails_helper'
+require 'spree/testing_support/shared_examples/working_factory'
 
 RSpec.describe 'taxon factory' do
   let(:factory_class) { Spree::Taxon }
diff --git a/core/spec/lib/spree/core/testing_support/factories/taxonomy_factory_spec.rb b/core/spec/lib/spree/core/testing_support/factories/taxonomy_factory_spec.rb
index fecf8b79e74..c1abe7f9dae 100644
--- a/core/spec/lib/spree/core/testing_support/factories/taxonomy_factory_spec.rb
+++ b/core/spec/lib/spree/core/testing_support/factories/taxonomy_factory_spec.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'rails_helper'
+require 'spree/testing_support/shared_examples/working_factory'
 
 RSpec.describe 'taxonomy factory' do
   let(:factory_class) { Spree::Taxonomy }
diff --git a/core/spec/lib/spree/core/testing_support/factories/user_factory_spec.rb b/core/spec/lib/spree/core/testing_support/factories/user_factory_spec.rb
index a8c180013f4..d1ff94bb087 100644
--- a/core/spec/lib/spree/core/testing_support/factories/user_factory_spec.rb
+++ b/core/spec/lib/spree/core/testing_support/factories/user_factory_spec.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'rails_helper'
+require 'spree/testing_support/shared_examples/working_factory'
 
 RSpec.describe 'user factory' do
   let(:factory_class) { Spree.user_class }
diff --git a/core/spec/lib/spree/core/testing_support/factories/variant_factory_spec.rb b/core/spec/lib/spree/core/testing_support/factories/variant_factory_spec.rb
index 58440a19aa8..80ed35f1f42 100644
--- a/core/spec/lib/spree/core/testing_support/factories/variant_factory_spec.rb
+++ b/core/spec/lib/spree/core/testing_support/factories/variant_factory_spec.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'rails_helper'
+require 'spree/testing_support/shared_examples/working_factory'
 
 RSpec.describe 'variant factory' do
   let(:factory_class) { Spree::Variant }
diff --git a/core/spec/lib/spree/core/testing_support/factories/variant_property_rule_condition_factory_spec.rb b/core/spec/lib/spree/core/testing_support/factories/variant_property_rule_condition_factory_spec.rb
index aad297ca695..021814276dd 100644
--- a/core/spec/lib/spree/core/testing_support/factories/variant_property_rule_condition_factory_spec.rb
+++ b/core/spec/lib/spree/core/testing_support/factories/variant_property_rule_condition_factory_spec.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'rails_helper'
+require 'spree/testing_support/shared_examples/working_factory'
 
 RSpec.describe 'variant property rule condition factory' do
   let(:factory_class) { Spree::VariantPropertyRuleCondition }
diff --git a/core/spec/lib/spree/core/testing_support/factories/variant_property_rule_factory_spec.rb b/core/spec/lib/spree/core/testing_support/factories/variant_property_rule_factory_spec.rb
index 8ed95693d1a..f2fe8076039 100644
--- a/core/spec/lib/spree/core/testing_support/factories/variant_property_rule_factory_spec.rb
+++ b/core/spec/lib/spree/core/testing_support/factories/variant_property_rule_factory_spec.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'rails_helper'
+require 'spree/testing_support/shared_examples/working_factory'
 
 RSpec.describe 'variant property rule factory' do
   let(:factory_class) { Spree::VariantPropertyRule }
diff --git a/core/spec/lib/spree/core/testing_support/factories/variant_property_rule_value_factory_spec.rb b/core/spec/lib/spree/core/testing_support/factories/variant_property_rule_value_factory_spec.rb
index 5eadca88a68..7a5a0d00f7e 100644
--- a/core/spec/lib/spree/core/testing_support/factories/variant_property_rule_value_factory_spec.rb
+++ b/core/spec/lib/spree/core/testing_support/factories/variant_property_rule_value_factory_spec.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'rails_helper'
+require 'spree/testing_support/shared_examples/working_factory'
 
 RSpec.describe 'variant property rule value factory' do
   let(:factory_class) { Spree::VariantPropertyRuleValue }
diff --git a/core/spec/lib/spree/core/testing_support/factories/zone_factory_spec.rb b/core/spec/lib/spree/core/testing_support/factories/zone_factory_spec.rb
index f4f3c80519d..23f2adc1a85 100644
--- a/core/spec/lib/spree/core/testing_support/factories/zone_factory_spec.rb
+++ b/core/spec/lib/spree/core/testing_support/factories/zone_factory_spec.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'rails_helper'
+require 'spree/testing_support/shared_examples/working_factory'
 
 RSpec.describe 'zone factory' do
   let(:factory_class) { Spree::Zone }

From 545a0e85d6ce8b3de99db710d5d13a25e4bbcc88 Mon Sep 17 00:00:00 2001
From: Martin Meyerhoff <mamhoff@gmail.com>
Date: Mon, 29 Jan 2024 15:41:21 +0100
Subject: [PATCH 09/19] Add promotion-specific configuration to
 Spree::Core::PromotionConfiguration

We want to be able to move all promotion-related things out of
`solidus_core` in PR #5634. However, Spree::AppConfiguration also does
all the promotion-specific things, and we can't move the app
configuration out of core.

In #5658, we've added a promotion configuration object as a nucleus for
core's promotion system's configuration,
`Spree::Core::PromotionConfiguration`. This implements all the
promotion-specific configuration preferences from
`Spree::AppConfiguration` there.
---
 .../lib/spree/core/promotion_configuration.rb | 37 ++++++++++++++++++-
 .../core/promotion_configuration_spec.rb      | 20 +++++++++-
 2 files changed, 55 insertions(+), 2 deletions(-)

diff --git a/core/lib/spree/core/promotion_configuration.rb b/core/lib/spree/core/promotion_configuration.rb
index cacbbd68e71..9b44d2f584c 100644
--- a/core/lib/spree/core/promotion_configuration.rb
+++ b/core/lib/spree/core/promotion_configuration.rb
@@ -2,9 +2,44 @@
 
 module Spree
   module Core
-    class PromotionConfiguration
+    class PromotionConfiguration < Spree::Preferences::Configuration
       include Core::EnvironmentExtension
 
+      # @!attribute [rw] promotions_per_page
+      #   @return [Integer] Promotions to show per-page in the admin (default: +15+)
+      preference :promotions_per_page, :integer, default: 15
+
+      # promotion_chooser_class allows extensions to provide their own PromotionChooser
+      class_name_attribute :promotion_chooser_class, default: 'Spree::PromotionChooser'
+
+      # promotion_adjuster_class allows extensions to provide their own Promotion Adjuster
+      class_name_attribute :promotion_adjuster_class, default: 'Spree::Promotion::OrderAdjustmentsRecalculator'
+
+      # Allows providing a different shipping promotion handler.
+      # @!attribute [rw] shipping_promotion_handler_class
+      # @see Spree::PromotionHandler::Shipping
+      # @return [Class] an object that conforms to the API of
+      #   the standard shipping promotion handler class
+      #   Spree::PromotionHandler::Coupon.
+      class_name_attribute :shipping_promotion_handler_class, default: 'Spree::PromotionHandler::Shipping'
+
+      # Allows providing your own Mailer for promotion code batch mailer.
+      #
+      # @!attribute [rw] promotion_code_batch_mailer_class
+      # @return [ActionMailer::Base] an object that responds to "promotion_code_batch_finished",
+      #   and "promotion_code_batch_errored"
+      #   (e.g. an ActionMailer with a "promotion_code_batch_finished" method) with the same
+      #   signature as Spree::PromotionCodeBatchMailer.promotion_code_batch_finished.
+      class_name_attribute :promotion_code_batch_mailer_class, default: 'Spree::PromotionCodeBatchMailer'
+
+      # Allows providing a different coupon code handler.
+      # @!attribute [rw] coupon_code_handler_class
+      # @see Spree::PromotionHandler::Coupon
+      # @return [Class] an object that conforms to the API of
+      #   the standard coupon code handler class
+      #   Spree::PromotionHandler::Coupon.
+      class_name_attribute :coupon_code_handler_class, default: 'Spree::PromotionHandler::Coupon'
+
       add_nested_class_set :calculators, default: {
         "Spree::Promotion::Actions::CreateAdjustment" => %w[
           Spree::Calculator::FlatPercentItemTotal
diff --git a/core/spec/lib/spree/core/promotion_configuration_spec.rb b/core/spec/lib/spree/core/promotion_configuration_spec.rb
index 00e3cba201f..a91c9e98d9b 100644
--- a/core/spec/lib/spree/core/promotion_configuration_spec.rb
+++ b/core/spec/lib/spree/core/promotion_configuration_spec.rb
@@ -3,8 +3,26 @@
 require "rails_helper"
 
 RSpec.describe Spree::Core::PromotionConfiguration do
+  subject(:config) { described_class.new }
+
+  it "uses base searcher class by default" do
+    expect(config.promotion_chooser_class).to eq Spree::PromotionChooser
+  end
+
+  it "uses order adjustments recalculator class by default" do
+    expect(config.promotion_adjuster_class).to eq Spree::Promotion::OrderAdjustmentsRecalculator
+  end
+
+  it "uses promotion handler coupon class by default" do
+    expect(config.coupon_code_handler_class).to eq Spree::PromotionHandler::Coupon
+  end
+
+  it "uses promotion handler shipping class by default" do
+    expect(config.shipping_promotion_handler_class).to eq Spree::PromotionHandler::Shipping
+  end
+
   describe "#calculators" do
-    subject { described_class.new.calculators[promotion_action] }
+    subject { config.calculators[promotion_action] }
 
     context "for Spree::Promotion::Actions::CreateAdjustment" do
       let(:promotion_action) { Spree::Promotion::Actions::CreateAdjustment }

From e494ec2763e3548cbfdc23fb8e6ff333bb025ad8 Mon Sep 17 00:00:00 2001
From: Martin Meyerhoff <mamhoff@gmail.com>
Date: Mon, 29 Jan 2024 15:45:59 +0100
Subject: [PATCH 10/19] Deprecate and delegate promotion-specific config from
 Spree::Config

This implements deprecated setters and getters for the
promotion-specific preferences on `Spree::AppConfiguration`.

Now, if a developer wants to set their
---
 core/lib/spree/app_configuration.rb           | 68 +++++++++----------
 core/spec/lib/spree/app_configuration_spec.rb | 32 ++++++---
 2 files changed, 57 insertions(+), 43 deletions(-)

diff --git a/core/lib/spree/app_configuration.rb b/core/lib/spree/app_configuration.rb
index e86a0d6c416..15155383455 100644
--- a/core/lib/spree/app_configuration.rb
+++ b/core/lib/spree/app_configuration.rb
@@ -216,10 +216,6 @@ class AppConfiguration < Preferences::Configuration
     #   @return [Integer] Products to show per-page in the frontend (default: +12+)
     preference :products_per_page, :integer, default: 12
 
-    # @!attribute [rw] promotions_per_page
-    #   @return [Integer] Promotions to show per-page in the admin (default: +15+)
-    preference :promotions_per_page, :integer, default: 15
-
     # @!attribute [rw] require_master_price
     #   @return [Boolean] Require a price on the master variant of a product (default: +true+)
     preference :require_master_price, :boolean, default: true
@@ -324,12 +320,6 @@ def default_pricing_options
     #   Spree::Variant::VatPriceGenerator.
     class_name_attribute :variant_vat_prices_generator_class, default: 'Spree::Variant::VatPriceGenerator'
 
-    # promotion_chooser_class allows extensions to provide their own PromotionChooser
-    class_name_attribute :promotion_chooser_class, default: 'Spree::PromotionChooser'
-
-    # promotion_adjuster_class allows extensions to provide their own Promotion Adjuster
-    class_name_attribute :promotion_adjuster_class, default: 'Spree::Promotion::OrderAdjustmentsRecalculator'
-
     class_name_attribute :allocator_class, default: 'Spree::Stock::Allocator::OnHandFirst'
 
     class_name_attribute :shipping_rate_sorter_class, default: 'Spree::Stock::ShippingRateSorter'
@@ -367,31 +357,6 @@ def default_pricing_options
     #   Spree::OrderUpdater.
     class_name_attribute :order_recalculator_class, default: 'Spree::OrderUpdater'
 
-    # Allows providing a different coupon code handler.
-    # @!attribute [rw] coupon_code_handler_class
-    # @see Spree::PromotionHandler::Coupon
-    # @return [Class] an object that conforms to the API of
-    #   the standard coupon code handler class
-    #   Spree::PromotionHandler::Coupon.
-    class_name_attribute :coupon_code_handler_class, default: 'Spree::PromotionHandler::Coupon'
-
-    # Allows providing a different shipping promotion handler.
-    # @!attribute [rw] shipping_promotion_handler_class
-    # @see Spree::PromotionHandler::Shipping
-    # @return [Class] an object that conforms to the API of
-    #   the standard shipping promotion handler class
-    #   Spree::PromotionHandler::Coupon.
-    class_name_attribute :shipping_promotion_handler_class, default: 'Spree::PromotionHandler::Shipping'
-
-    # Allows providing your own Mailer for promotion code batch mailer.
-    #
-    # @!attribute [rw] promotion_code_batch_mailer_class
-    # @return [ActionMailer::Base] an object that responds to "promotion_code_batch_finished",
-    #   and "promotion_code_batch_errored"
-    #   (e.g. an ActionMailer with a "promotion_code_batch_finished" method) with the same
-    #   signature as Spree::PromotionCodeBatchMailer.promotion_code_batch_finished.
-    class_name_attribute :promotion_code_batch_mailer_class, default: 'Spree::PromotionCodeBatchMailer'
-
     # Allows providing your own Mailer for reimbursement mailer.
     #
     # @!attribute [rw] reimbursement_mailer_class
@@ -623,6 +588,39 @@ def promotions
       @promotion_configuration ||= Spree::Core::PromotionConfiguration.new
     end
 
+    class << self
+      private
+
+      def promotions_deprecation_message(method)
+        "The `Spree::Config.#{method}` preference is deprecated and will be removed in Solidus 5.0. " \
+        "Use `Spree::Config.promotions.#{method}` instead"
+      end
+    end
+
+    delegate :promotion_adjuster_class, :promotion_adjuster_class=, to: :promotions
+    deprecate promotion_adjuster_class: promotions_deprecation_message("promotion_adjuster_class"), deprecator: Spree.deprecator
+    deprecate "promotion_adjuster_class=": promotions_deprecation_message("promotion_adjuster_class="), deprecator: Spree.deprecator
+
+    delegate :promotion_chooser_class, :promotion_chooser_class=, to: :promotions
+    deprecate promotion_chooser_class: promotions_deprecation_message("promotion_chooser_class"), deprecator: Spree.deprecator
+    deprecate "promotion_chooser_class=": promotions_deprecation_message("promotion_chooser_class="), deprecator: Spree.deprecator
+
+    delegate :shipping_promotion_handler_class, :shipping_promotion_handler_class=, to: :promotions
+    deprecate shipping_promotion_handler_class: promotions_deprecation_message("shipping_promotion_handler_class"), deprecator: Spree.deprecator
+    deprecate "shipping_promotion_handler_class=": promotions_deprecation_message("shipping_promotion_handler_class="), deprecator: Spree.deprecator
+
+    delegate :coupon_code_handler_class, :coupon_code_handler_class=, to: :promotions
+    deprecate coupon_code_handler_class: promotions_deprecation_message("coupon_code_handler_class"), deprecator: Spree.deprecator
+    deprecate "coupon_code_handler_class=": promotions_deprecation_message("coupon_code_handler_class"), deprecator: Spree.deprecator
+
+    delegate :promotion_code_batch_mailer_class, :promotion_code_batch_mailer_class=, to: :promotions
+    deprecate promotion_code_batch_mailer_class: promotions_deprecation_message("promotion_code_batch_mailer_class"), deprecator: Spree.deprecator
+    deprecate "promotion_code_batch_mailer_class=": promotions_deprecation_message("promotion_code_batch_mailer_class="), deprecator: Spree.deprecator
+
+    delegate :preferred_promotions_per_page, :preferred_promotions_per_page=, to: :promotions
+    deprecate preferred_promotions_per_page: promotions_deprecation_message("preferred_promotions_per_page"), deprecator: Spree.deprecator
+    deprecate "preferred_promotions_per_page=": promotions_deprecation_message("preferred_promotions_per_page="), deprecator: Spree.deprecator
+
     def roles
       @roles ||= Spree::RoleConfiguration.new.tap do |roles|
         roles.assign_permissions :default, ['Spree::PermissionSets::DefaultCustomer']
diff --git a/core/spec/lib/spree/app_configuration_spec.rb b/core/spec/lib/spree/app_configuration_spec.rb
index 5a59755b846..e6a972ceefe 100644
--- a/core/spec/lib/spree/app_configuration_spec.rb
+++ b/core/spec/lib/spree/app_configuration_spec.rb
@@ -40,16 +40,32 @@
     expect(prefs.variant_price_selector_class).to eq Spree::Variant::PriceSelector
   end
 
-  it "uses order adjustments recalculator class by default" do
-    expect(prefs.promotion_adjuster_class).to eq Spree::Promotion::OrderAdjustmentsRecalculator
-  end
+  context "deprecated preferences" do
+    around do |example|
+      Spree.deprecator.silence do
+        example.run
+      end
+    end
 
-  it "uses promotion handler coupon class by default" do
-    expect(prefs.coupon_code_handler_class).to eq Spree::PromotionHandler::Coupon
-  end
+    it "uses order adjustments recalculator class by default" do
+      expect(prefs.promotion_adjuster_class).to eq Spree::Promotion::OrderAdjustmentsRecalculator
+    end
+
+    it "uses promotion handler coupon class by default" do
+      expect(prefs.coupon_code_handler_class).to eq Spree::PromotionHandler::Coupon
+    end
+
+    it "uses promotion handler shipping class by default" do
+      expect(prefs.shipping_promotion_handler_class).to eq Spree::PromotionHandler::Shipping
+    end
+
+    it "uses promotion code batch mailer class by default" do
+      expect(prefs.promotion_code_batch_mailer_class).to eq Spree::PromotionCodeBatchMailer
+    end
 
-  it "uses promotion handler shipping class by default" do
-    expect(prefs.shipping_promotion_handler_class).to eq Spree::PromotionHandler::Shipping
+    it "uses promotion chooser class by default" do
+      expect(prefs.promotion_chooser_class).to eq Spree::PromotionChooser
+    end
   end
 
   context "deprecated preferences" do

From ec19538cc7f586871892d671a5c6c9592b074234 Mon Sep 17 00:00:00 2001
From: Martin Meyerhoff <mamhoff@gmail.com>
Date: Mon, 29 Jan 2024 16:17:59 +0100
Subject: [PATCH 11/19] Deprecate and delegate
 Spree::Core::Environment::Promotions

The contents of this class are promotion-related and should move to
`Spree::PromotionConfiguration`. We can also use the default option of
the `add_class_set` method here.

There were originally no direct specs for
`Spree::Core::Environment::Promotions`. I'm not adding any, because the
class is indirectly tested through `Spree::AppConfiguration` and now
only has deprecated methods.
---
 core/lib/spree/app_configuration.rb           | 27 -----------------
 core/lib/spree/core/environment/promotions.rb | 29 ++++++++++++++++---
 .../lib/spree/core/promotion_configuration.rb | 27 +++++++++++++++++
 core/spec/lib/spree/app_configuration_spec.rb |  7 +++++
 4 files changed, 59 insertions(+), 31 deletions(-)

diff --git a/core/lib/spree/app_configuration.rb b/core/lib/spree/app_configuration.rb
index 15155383455..1b32ed9e1f8 100644
--- a/core/lib/spree/app_configuration.rb
+++ b/core/lib/spree/app_configuration.rb
@@ -656,33 +656,6 @@ def environment
           Spree::PaymentMethod::Check
         ]
 
-        env.promotions.rules = %w[
-          Spree::Promotion::Rules::ItemTotal
-          Spree::Promotion::Rules::Product
-          Spree::Promotion::Rules::User
-          Spree::Promotion::Rules::FirstOrder
-          Spree::Promotion::Rules::UserLoggedIn
-          Spree::Promotion::Rules::OneUsePerUser
-          Spree::Promotion::Rules::Taxon
-          Spree::Promotion::Rules::MinimumQuantity
-          Spree::Promotion::Rules::NthOrder
-          Spree::Promotion::Rules::OptionValue
-          Spree::Promotion::Rules::FirstRepeatPurchaseSince
-          Spree::Promotion::Rules::UserRole
-          Spree::Promotion::Rules::Store
-        ]
-
-        env.promotions.actions = %w[
-          Spree::Promotion::Actions::CreateAdjustment
-          Spree::Promotion::Actions::CreateItemAdjustments
-          Spree::Promotion::Actions::CreateQuantityAdjustments
-          Spree::Promotion::Actions::FreeShipping
-        ]
-
-        env.promotions.shipping_actions = %w[
-          Spree::Promotion::Actions::FreeShipping
-        ]
-
         env.stock_splitters = %w[
           Spree::Stock::Splitter::ShippingCategory
           Spree::Stock::Splitter::Backordered
diff --git a/core/lib/spree/core/environment/promotions.rb b/core/lib/spree/core/environment/promotions.rb
index 2bc9e11e115..a74044eef3d 100644
--- a/core/lib/spree/core/environment/promotions.rb
+++ b/core/lib/spree/core/environment/promotions.rb
@@ -4,11 +4,32 @@ module Spree
   module Core
     class Environment
       class Promotions
-        include EnvironmentExtension
+        class << self
+          private
 
-        add_class_set :rules
-        add_class_set :actions
-        add_class_set :shipping_actions
+          def promotions_deprecation_message(method)
+            "The `Rails.application.config.spree.promotions.#{method}` preference is deprecated and will be removed in Solidus 5.0. " \
+            "Use `Spree::Config.promotions.#{method}` instead."
+          end
+        end
+
+        delegate :rules, :rules=, to: :promotion_config
+        deprecate rules: promotions_deprecation_message("rules"), deprecator: Spree.deprecator
+        deprecate "rules=": promotions_deprecation_message("rules="), deprecator: Spree.deprecator
+
+        delegate :actions, :actions=, to: :promotion_config
+        deprecate actions: promotions_deprecation_message("actions"), deprecator: Spree.deprecator
+        deprecate "actions=": promotions_deprecation_message("actions="), deprecator: Spree.deprecator
+
+        delegate :shipping_actions, :shipping_actions=, to: :promotion_config
+        deprecate shipping_actions: promotions_deprecation_message("shipping_actions"), deprecator: Spree.deprecator
+        deprecate "shipping_actions=": promotions_deprecation_message("shipping_actions="), deprecator: Spree.deprecator
+
+        private
+
+        def promotion_config
+          Spree::Config.promotions
+        end
       end
     end
   end
diff --git a/core/lib/spree/core/promotion_configuration.rb b/core/lib/spree/core/promotion_configuration.rb
index 9b44d2f584c..5e3aa3b04e7 100644
--- a/core/lib/spree/core/promotion_configuration.rb
+++ b/core/lib/spree/core/promotion_configuration.rb
@@ -40,6 +40,33 @@ class PromotionConfiguration < Spree::Preferences::Configuration
       #   Spree::PromotionHandler::Coupon.
       class_name_attribute :coupon_code_handler_class, default: 'Spree::PromotionHandler::Coupon'
 
+      add_class_set :rules, default: %w[
+        Spree::Promotion::Rules::ItemTotal
+        Spree::Promotion::Rules::Product
+        Spree::Promotion::Rules::User
+        Spree::Promotion::Rules::FirstOrder
+        Spree::Promotion::Rules::UserLoggedIn
+        Spree::Promotion::Rules::OneUsePerUser
+        Spree::Promotion::Rules::Taxon
+        Spree::Promotion::Rules::MinimumQuantity
+        Spree::Promotion::Rules::NthOrder
+        Spree::Promotion::Rules::OptionValue
+        Spree::Promotion::Rules::FirstRepeatPurchaseSince
+        Spree::Promotion::Rules::UserRole
+        Spree::Promotion::Rules::Store
+      ]
+
+      add_class_set :actions, default: %w[
+        Spree::Promotion::Actions::CreateAdjustment
+        Spree::Promotion::Actions::CreateItemAdjustments
+        Spree::Promotion::Actions::CreateQuantityAdjustments
+        Spree::Promotion::Actions::FreeShipping
+      ]
+
+      add_class_set :shipping_actions, default: %w[
+        Spree::Promotion::Actions::FreeShipping
+      ]
+
       add_nested_class_set :calculators, default: {
         "Spree::Promotion::Actions::CreateAdjustment" => %w[
           Spree::Calculator::FlatPercentItemTotal
diff --git a/core/spec/lib/spree/app_configuration_spec.rb b/core/spec/lib/spree/app_configuration_spec.rb
index e6a972ceefe..e14c7dd6351 100644
--- a/core/spec/lib/spree/app_configuration_spec.rb
+++ b/core/spec/lib/spree/app_configuration_spec.rb
@@ -156,7 +156,14 @@ class DummyClass; end;
     end
 
     context '.promotions' do
+      around do |example|
+        Spree.deprecator.silence do
+          example.run
+        end
+      end
+
       subject(:promotions) { environment.promotions }
+
       it { is_expected.to be_a Spree::Core::Environment::Promotions }
 
       context '.promotions.rules' do

From df737dd562e7571655bd89ab9ce29f92c251efdc Mon Sep 17 00:00:00 2001
From: Martin Meyerhoff <mamhoff@gmail.com>
Date: Mon, 29 Jan 2024 17:32:28 +0100
Subject: [PATCH 12/19] Use new promotion configuration across the project

It's working!
---
 api/app/controllers/spree/api/coupon_codes_controller.rb    | 4 ++--
 .../controllers/spree/admin/promotion_actions_controller.rb | 2 +-
 .../controllers/spree/admin/promotion_rules_controller.rb   | 2 +-
 .../app/controllers/spree/admin/promotions_controller.rb    | 2 +-
 backend/app/helpers/spree/promotion_rules_helper.rb         | 2 +-
 backend/app/views/spree/admin/promotions/_actions.html.erb  | 2 +-
 backend/spec/features/admin/promotion_adjustments_spec.rb   | 6 +++---
 core/app/jobs/spree/promotion_code_batch_job.rb             | 4 ++--
 core/app/models/spree/order.rb                              | 4 ++--
 core/app/models/spree/order_updater.rb                      | 2 +-
 .../spree/promotion/order_adjustments_recalculator.rb       | 4 ++--
 core/app/models/spree/promotion_action.rb                   | 2 +-
 .../spree/promotion/order_adjustments_recalculator_spec.rb  | 2 +-
 core/spec/models/spree/promotion_handler/shipping_spec.rb   | 2 +-
 14 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/api/app/controllers/spree/api/coupon_codes_controller.rb b/api/app/controllers/spree/api/coupon_codes_controller.rb
index 614ba9d77fe..b6863ddad3e 100644
--- a/api/app/controllers/spree/api/coupon_codes_controller.rb
+++ b/api/app/controllers/spree/api/coupon_codes_controller.rb
@@ -10,7 +10,7 @@ def create
         authorize! :update, @order, order_token
 
         @order.coupon_code = params[:coupon_code]
-        @handler = Spree::Config.coupon_code_handler_class.new(@order).apply
+        @handler = Spree::Config.promotions.coupon_code_handler_class.new(@order).apply
 
         if @handler.successful?
           render 'spree/api/promotions/handler', status: 200
@@ -24,7 +24,7 @@ def destroy
         authorize! :update, @order, order_token
 
         @order.coupon_code = params[:id]
-        @handler = Spree::Config.coupon_code_handler_class.new(@order).remove
+        @handler = Spree::Config.promotions.coupon_code_handler_class.new(@order).remove
 
         if @handler.successful?
           render 'spree/api/promotions/handler', status: 200
diff --git a/backend/app/controllers/spree/admin/promotion_actions_controller.rb b/backend/app/controllers/spree/admin/promotion_actions_controller.rb
index f6a642ae892..7ba26aecfb9 100644
--- a/backend/app/controllers/spree/admin/promotion_actions_controller.rb
+++ b/backend/app/controllers/spree/admin/promotion_actions_controller.rb
@@ -36,7 +36,7 @@ def load_promotion
 
   def validate_promotion_action_type
     requested_type = params[:action_type]
-    promotion_action_types = Rails.application.config.spree.promotions.actions
+    promotion_action_types = Spree::Config.promotions.actions
     @promotion_action_type = promotion_action_types.detect do |klass|
       klass.name == requested_type
     end
diff --git a/backend/app/controllers/spree/admin/promotion_rules_controller.rb b/backend/app/controllers/spree/admin/promotion_rules_controller.rb
index 1f7438f3288..f5b765498bd 100644
--- a/backend/app/controllers/spree/admin/promotion_rules_controller.rb
+++ b/backend/app/controllers/spree/admin/promotion_rules_controller.rb
@@ -41,7 +41,7 @@ def model_class
 
   def validate_promotion_rule_type
     requested_type = params[:promotion_rule].delete(:type)
-    promotion_rule_types = Rails.application.config.spree.promotions.rules
+    promotion_rule_types = Spree::Config.promotions.rules
     @promotion_rule_type = promotion_rule_types.detect do |klass|
       klass.name == requested_type
     end
diff --git a/backend/app/controllers/spree/admin/promotions_controller.rb b/backend/app/controllers/spree/admin/promotions_controller.rb
index f132b5a4d8c..d56fbb6cb49 100644
--- a/backend/app/controllers/spree/admin/promotions_controller.rb
+++ b/backend/app/controllers/spree/admin/promotions_controller.rb
@@ -49,7 +49,7 @@ def collection
         @collection = @search.result(distinct: true).
           includes(promotion_includes).
           page(params[:page]).
-          per(params[:per_page] || Spree::Config[:promotions_per_page])
+          per(params[:per_page] || Spree::Config.promotions.promotions_per_page)
 
         @collection
       end
diff --git a/backend/app/helpers/spree/promotion_rules_helper.rb b/backend/app/helpers/spree/promotion_rules_helper.rb
index 417af3f5af0..583e17f13a4 100644
--- a/backend/app/helpers/spree/promotion_rules_helper.rb
+++ b/backend/app/helpers/spree/promotion_rules_helper.rb
@@ -4,7 +4,7 @@ module Spree
   module PromotionRulesHelper
     def options_for_promotion_rule_types(promotion)
       existing = promotion.rules.map { |rule| rule.class.name }
-      rules = Rails.application.config.spree.promotions.rules.reject { |rule| existing.include? rule.name }
+      rules = Spree::Config.promotions.rules.reject { |rule| existing.include? rule.name }
       options = rules.map { |rule| [rule.model_name.human, rule.name] }
       options_for_select(options)
     end
diff --git a/backend/app/views/spree/admin/promotions/_actions.html.erb b/backend/app/views/spree/admin/promotions/_actions.html.erb
index 302accb666e..48e485749b5 100644
--- a/backend/app/views/spree/admin/promotions/_actions.html.erb
+++ b/backend/app/views/spree/admin/promotions/_actions.html.erb
@@ -1,7 +1,7 @@
 <fieldset id="action_fields" class="no-border-top">
 
   <%= form_tag spree.admin_promotion_promotion_actions_path(@promotion), remote: true, id: 'new_promotion_action_form' do %>
-    <% options = options_for_select(  Rails.application.config.spree.promotions.actions.map {|action| [ action.model_name.human, action.name] } ) %>
+    <% options = options_for_select(Spree::Config.promotions.actions.map {|action| [ action.model_name.human, action.name] } ) %>
     <fieldset>
       <legend align="center"><%= t('spree.promotion_actions') %></legend>
       <% if can?(:update, @promotion) %>
diff --git a/backend/spec/features/admin/promotion_adjustments_spec.rb b/backend/spec/features/admin/promotion_adjustments_spec.rb
index 383a4a70f29..f355ced3c1e 100644
--- a/backend/spec/features/admin/promotion_adjustments_spec.rb
+++ b/backend/spec/features/admin/promotion_adjustments_spec.rb
@@ -275,12 +275,12 @@ def self.description
             "Complex Calculator"
           end
         end
-        @calculators = Rails.application.config.spree.calculators.promotion_actions_create_item_adjustments
-        Rails.application.config.spree.calculators.promotion_actions_create_item_adjustments = [ComplexCalculator]
+        @calculators = Spree::Config.promotions.calculators['Spree::Promotion::Actions::CreateItemAdjustments']
+        Spree::Config.promotions.calculators['Spree::Promotion::Actions::CreateItemAdjustments'] = [ComplexCalculator]
       end
 
       after do
-        Rails.application.config.spree.calculators.promotion_actions_create_item_adjustments = @calculators
+        Spree::Config.promotions.calculators['Spree::Promotion::Actions::CreateItemAdjustments'] = @calculators
       end
 
       it "does not show array and hash form fields" do
diff --git a/core/app/jobs/spree/promotion_code_batch_job.rb b/core/app/jobs/spree/promotion_code_batch_job.rb
index a89a8dffd8a..a5b4f343f41 100644
--- a/core/app/jobs/spree/promotion_code_batch_job.rb
+++ b/core/app/jobs/spree/promotion_code_batch_job.rb
@@ -10,13 +10,13 @@ def perform(promotion_code_batch)
       ).build_promotion_codes
 
       if promotion_code_batch.email?
-        Spree::Config.promotion_code_batch_mailer_class
+        Spree::Config.promotions.promotion_code_batch_mailer_class
           .promotion_code_batch_finished(promotion_code_batch)
           .deliver_now
       end
     rescue StandardError => error
       if promotion_code_batch.email?
-        Spree::Config.promotion_code_batch_mailer_class
+        Spree::Config.promotions.promotion_code_batch_mailer_class
           .promotion_code_batch_errored(promotion_code_batch)
           .deliver_now
       end
diff --git a/core/app/models/spree/order.rb b/core/app/models/spree/order.rb
index 5b04d0009c8..9c28c0737e6 100644
--- a/core/app/models/spree/order.rb
+++ b/core/app/models/spree/order.rb
@@ -509,7 +509,7 @@ def create_shipments_for_line_item(line_item)
     end
 
     def apply_shipping_promotions
-      Spree::Config.shipping_promotion_handler_class.new(self).activate
+      Spree::Config.promotions.shipping_promotion_handler_class.new(self).activate
       recalculate
     end
 
@@ -799,7 +799,7 @@ def ensure_inventory_units
     end
 
     def ensure_promotions_eligible
-      Spree::Config.promotion_adjuster_class.new(self).call
+      Spree::Config.promotions.promotion_adjuster_class.new(self).call
 
       if promo_total_changed?
         restart_checkout_flow
diff --git a/core/app/models/spree/order_updater.rb b/core/app/models/spree/order_updater.rb
index e44e436ed47..3370843c5fe 100644
--- a/core/app/models/spree/order_updater.rb
+++ b/core/app/models/spree/order_updater.rb
@@ -195,7 +195,7 @@ def log_state_change(name)
     end
 
     def update_promotions
-      Spree::Config.promotion_adjuster_class.new(order).call
+      Spree::Config.promotions.promotion_adjuster_class.new(order).call
     end
 
     def update_taxes
diff --git a/core/app/models/spree/promotion/order_adjustments_recalculator.rb b/core/app/models/spree/promotion/order_adjustments_recalculator.rb
index ed848a4cdc5..d8728bd597e 100644
--- a/core/app/models/spree/promotion/order_adjustments_recalculator.rb
+++ b/core/app/models/spree/promotion/order_adjustments_recalculator.rb
@@ -20,7 +20,7 @@ def call
           promotion_adjustments = item.adjustments.select(&:promotion?)
 
           promotion_adjustments.each { |adjustment| recalculate(adjustment) }
-          Spree::Config.promotion_chooser_class.new(promotion_adjustments).update
+          Spree::Config.promotions.promotion_chooser_class.new(promotion_adjustments).update
 
           item.promo_total = promotion_adjustments.select(&:eligible?).sum(&:amount)
         end
@@ -30,7 +30,7 @@ def call
         # line items and/or shipments.
         order_promotion_adjustments = order.adjustments.select(&:promotion?)
         order_promotion_adjustments.each { |adjustment| recalculate(adjustment) }
-        Spree::Config.promotion_chooser_class.new(order_promotion_adjustments).update
+        Spree::Config.promotions.promotion_chooser_class.new(order_promotion_adjustments).update
 
         order.promo_total = all_items.sum(&:promo_total) +
                             order_promotion_adjustments.
diff --git a/core/app/models/spree/promotion_action.rb b/core/app/models/spree/promotion_action.rb
index 8799a993789..5685491eb8a 100644
--- a/core/app/models/spree/promotion_action.rb
+++ b/core/app/models/spree/promotion_action.rb
@@ -14,7 +14,7 @@ class PromotionAction < Spree::Base
     belongs_to :promotion, class_name: 'Spree::Promotion', inverse_of: :promotion_actions, optional: true
 
     scope :of_type, ->(type) { where(type: Array.wrap(type).map(&:to_s)) }
-    scope :shipping, -> { of_type(Spree::Config.environment.promotions.shipping_actions.to_a) }
+    scope :shipping, -> { of_type(Spree::Config.promotions.shipping_actions.to_a) }
 
     def preload_relations
       []
diff --git a/core/spec/models/spree/promotion/order_adjustments_recalculator_spec.rb b/core/spec/models/spree/promotion/order_adjustments_recalculator_spec.rb
index ff782b514c4..13b25e912c7 100644
--- a/core/spec/models/spree/promotion/order_adjustments_recalculator_spec.rb
+++ b/core/spec/models/spree/promotion/order_adjustments_recalculator_spec.rb
@@ -54,7 +54,7 @@ def initialize(_adjustments)
             end
           end
 
-          stub_spree_preferences(promotion_chooser_class: Spree::TestPromotionChooser)
+          stub_spree_preferences(Spree::Config.promotions, promotion_chooser_class: Spree::TestPromotionChooser)
         end
 
         it 'uses the defined promotion chooser' do
diff --git a/core/spec/models/spree/promotion_handler/shipping_spec.rb b/core/spec/models/spree/promotion_handler/shipping_spec.rb
index 1bbfc5efc33..7f096b2c139 100644
--- a/core/spec/models/spree/promotion_handler/shipping_spec.rb
+++ b/core/spec/models/spree/promotion_handler/shipping_spec.rb
@@ -76,7 +76,7 @@ module PromotionHandler
         before do
           stub_const('CustomShippingAction', custom_klass)
 
-          allow(Spree::Config.environment.promotions).to receive(:shipping_actions) { ['CustomShippingAction'] }
+          allow(Spree::Config.promotions).to receive(:shipping_actions) { ['CustomShippingAction'] }
 
           order.order_promotions.create!(promotion: promotion, promotion_code: promotion.codes.first)
         end

From 4b4f8ea96b8a066d1fa2a03eea9674192c838300 Mon Sep 17 00:00:00 2001
From: Martin Meyerhoff <mamhoff@gmail.com>
Date: Sat, 17 Feb 2024 14:55:37 +0100
Subject: [PATCH 13/19] Make Spree::Deprecator available in unit tests

It seems we want to be able to test files without loading all of Solidus.
Unfortunately, we do load Solidus' configuration, and this PR needs the
configuration object to be able to deprecate extension points. What this
commit does is it allows loading a module that defined
`Spree.deprecator` and loads that module in both `spree/core.rb` and the
`spec_helper.rb`.
---
 core/lib/spree/core.rb       | 5 +----
 core/lib/spree/deprecator.rb | 9 +++++++++
 core/spec/spec_helper.rb     | 1 +
 3 files changed, 11 insertions(+), 4 deletions(-)
 create mode 100644 core/lib/spree/deprecator.rb

diff --git a/core/lib/spree/core.rb b/core/lib/spree/core.rb
index 0c721ee5dc7..f75b601b5ee 100644
--- a/core/lib/spree/core.rb
+++ b/core/lib/spree/core.rb
@@ -11,6 +11,7 @@
 
 require 'active_support/deprecation'
 require 'spree/deprecated_instance_variable_proxy'
+require 'spree/deprecator'
 require 'acts_as_list'
 require 'awesome_nested_set'
 require 'cancan'
@@ -28,10 +29,6 @@
 StateMachines::Machine.ignore_method_conflicts = true
 
 module Spree
-  def self.deprecator
-    @deprecator ||= ActiveSupport::Deprecation.new('5.0', 'Solidus')
-  end
-
   autoload :Deprecation, 'spree/deprecation'
 
   mattr_accessor :user_class, default: 'Spree::LegacyUser'
diff --git a/core/lib/spree/deprecator.rb b/core/lib/spree/deprecator.rb
new file mode 100644
index 00000000000..6bccb4199a8
--- /dev/null
+++ b/core/lib/spree/deprecator.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+require 'active_support/deprecation'
+
+module Spree
+  def self.deprecator
+    @deprecator ||= ActiveSupport::Deprecation.new('5.0', 'Solidus')
+  end
+end
diff --git a/core/spec/spec_helper.rb b/core/spec/spec_helper.rb
index fd1530ff50e..bb207828849 100644
--- a/core/spec/spec_helper.rb
+++ b/core/spec/spec_helper.rb
@@ -16,6 +16,7 @@
 require 'spree/testing_support/partial_double_verification'
 require 'spree/testing_support/silence_deprecations'
 require 'spree/testing_support/preferences'
+require 'spree/deprecator'
 require 'spree/config'
 
 RSpec.configure do |config|

From 05ad73697ad84af96c85a01bd1dbaddae5aaa1fb Mon Sep 17 00:00:00 2001
From: Martin Meyerhoff <mamhoff@gmail.com>
Date: Thu, 25 Jan 2024 15:11:59 +0100
Subject: [PATCH 14/19] Add extension point for promotion source types

This is an extension point to tell adjustments about what type of
adjustments they are. For the new solidus_friendly_promotions gems, we
need a different type from the `Spree::PromotionAction`. This is not
part of the promotion configuration object, because it is very much
thinkable to have historical adjustments with promotion sources from a
different promotion extension.
---
 core/lib/spree/app_configuration.rb           | 4 ++++
 core/spec/lib/spree/app_configuration_spec.rb | 6 ++++++
 2 files changed, 10 insertions(+)

diff --git a/core/lib/spree/app_configuration.rb b/core/lib/spree/app_configuration.rb
index e86a0d6c416..ae08c9d3dfb 100644
--- a/core/lib/spree/app_configuration.rb
+++ b/core/lib/spree/app_configuration.rb
@@ -26,6 +26,7 @@
 
 module Spree
   class AppConfiguration < Preferences::Configuration
+    include Spree::Core::EnvironmentExtension
     # Preferences (alphabetized to more easily lookup particular preferences)
 
     # @!attribute [rw] address_requires_phone
@@ -585,6 +586,9 @@ def payment_canceller
     # Enumerable of taxons adhering to the present_taxon_class interface
     class_name_attribute :taxon_attachment_module, default: "Spree::Taxon::ActiveStorageAttachment"
 
+    # Set of classes that can be promotion adjustment sources
+    add_class_set :adjustment_promotion_source_types, default: ["Spree::PromotionAction"]
+
     # Configures the absolute path that contains the Solidus engine
     # migrations. This will be checked at app boot to confirm that all Solidus
     # migrations are installed.
diff --git a/core/spec/lib/spree/app_configuration_spec.rb b/core/spec/lib/spree/app_configuration_spec.rb
index 5a59755b846..a1910179d05 100644
--- a/core/spec/lib/spree/app_configuration_spec.rb
+++ b/core/spec/lib/spree/app_configuration_spec.rb
@@ -180,6 +180,12 @@ class DummyClass; end;
     end
   end
 
+  describe "#adjustment_promotion_source_types" do
+    subject { described_class.new.adjustment_promotion_source_types }
+
+    it { is_expected.to contain_exactly(Spree::PromotionAction) }
+  end
+
   it 'has a default admin VAT location with nil values by default' do
     expect(prefs.admin_vat_location).to eq(Spree::Tax::TaxLocation.new)
     expect(prefs.admin_vat_location.state_id).to eq(nil)

From d0bf433c0b50c9f072cd165a392fa00b98e4abfa Mon Sep 17 00:00:00 2001
From: Martin Meyerhoff <mamhoff@gmail.com>
Date: Thu, 25 Jan 2024 15:32:09 +0100
Subject: [PATCH 15/19] Use new extension point for promotion adjustment source
 types

Rather than hardcoding `Spree::PromotionAction` here, use the configured
promotion source types.
---
 core/app/models/spree/adjustment.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/app/models/spree/adjustment.rb b/core/app/models/spree/adjustment.rb
index 3ec22c90a9e..0111fa4e6d6 100644
--- a/core/app/models/spree/adjustment.rb
+++ b/core/app/models/spree/adjustment.rb
@@ -42,8 +42,8 @@ class Adjustment < Spree::Base
     scope :charge, -> { where("#{quoted_table_name}.amount >= 0") }
     scope :credit, -> { where("#{quoted_table_name}.amount < 0") }
     scope :nonzero, -> { where("#{quoted_table_name}.amount != 0") }
-    scope :promotion, -> { where(source_type: 'Spree::PromotionAction') }
-    scope :non_promotion, -> { where.not(source_type: 'Spree::PromotionAction') }
+    scope :promotion, -> { where(source_type: Spree::Config.adjustment_promotion_source_types.map(&:to_s)) }
+    scope :non_promotion, -> { where.not(source_type: Spree::Config.adjustment_promotion_source_types.map(&:to_s)) }
     scope :return_authorization, -> { where(source_type: "Spree::ReturnAuthorization") }
     scope :is_included, -> { where(included: true) }
     scope :additional, -> { where(included: false) }
@@ -77,7 +77,7 @@ def currency
 
     # @return [Boolean] true when this is a promotion adjustment (Promotion adjustments have a {PromotionAction} source)
     def promotion?
-      source_type == 'Spree::PromotionAction'
+      source_type.to_s.in?(Spree::Config.adjustment_promotion_source_types.map(&:to_s))
     end
 
     # @return [Boolean] true when this is a tax adjustment (Tax adjustments have a {TaxRate} source)

From e3adb7180594178023a8b28fa789ccd407336341 Mon Sep 17 00:00:00 2001
From: Martin Meyerhoff <mamhoff@gmail.com>
Date: Sat, 17 Feb 2024 21:11:50 +0100
Subject: [PATCH 16/19] Add extension point: Promotion Configuration class

Spree::Core::PromotionConfiguration will have to live in the
solidus_legacy_promotions gem. We will need a stand-in! But for that
stand-in, we also need an extension point.
---
 core/lib/spree/app_configuration.rb           | 8 +++++++-
 core/spec/lib/spree/app_configuration_spec.rb | 4 ++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/core/lib/spree/app_configuration.rb b/core/lib/spree/app_configuration.rb
index a21e5ad599f..9cc8adbdf76 100644
--- a/core/lib/spree/app_configuration.rb
+++ b/core/lib/spree/app_configuration.rb
@@ -422,6 +422,12 @@ def payment_canceller
       )
     end
 
+    # Allow switching out the promotion configuration class
+    #
+    # @!attribute [rw] promotion_configuration_class
+    # @return [Class] a class instance that fulfils the interface of a promo configuration
+    class_name_attribute :promotion_configuration_class, default: 'Spree::Core::PromotionConfiguration'
+
     # Allows providing your own class for adding payment sources to a user's
     # "wallet" after an order moves to the complete state.
     #
@@ -589,7 +595,7 @@ def stock
     end
 
     def promotions
-      @promotion_configuration ||= Spree::Core::PromotionConfiguration.new
+      @promotion_configuration ||= promotion_configuration_class.new
     end
 
     class << self
diff --git a/core/spec/lib/spree/app_configuration_spec.rb b/core/spec/lib/spree/app_configuration_spec.rb
index 2c131cb42a6..d99a704c9ce 100644
--- a/core/spec/lib/spree/app_configuration_spec.rb
+++ b/core/spec/lib/spree/app_configuration_spec.rb
@@ -40,6 +40,10 @@
     expect(prefs.variant_price_selector_class).to eq Spree::Variant::PriceSelector
   end
 
+  it "uses core's promotion configuration class by default" do
+    expect(prefs.promotion_configuration_class).to eq Spree::Core::PromotionConfiguration
+  end
+
   context "deprecated preferences" do
     around do |example|
       Spree.deprecator.silence do

From da78680a05754cdfad96b7dc5bb94a3a14b89011 Mon Sep 17 00:00:00 2001
From: Martin Meyerhoff <mamhoff@gmail.com>
Date: Fri, 26 Jan 2024 17:32:31 +0100
Subject: [PATCH 17/19] Introduce a NullAdjuster

This allows us to have a stand-in for a promotion system when, in fact,
we don't have one.
---
 core/app/models/spree/null_promotion_adjuster.rb  | 13 +++++++++++++
 .../models/spree/null_promotion_adjuster_spec.rb  | 15 +++++++++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 core/app/models/spree/null_promotion_adjuster.rb
 create mode 100644 core/spec/models/spree/null_promotion_adjuster_spec.rb

diff --git a/core/app/models/spree/null_promotion_adjuster.rb b/core/app/models/spree/null_promotion_adjuster.rb
new file mode 100644
index 00000000000..daebd91f08e
--- /dev/null
+++ b/core/app/models/spree/null_promotion_adjuster.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Spree
+  class NullPromotionAdjuster
+    def initialize(order)
+      @order = order
+    end
+
+    def call
+      @order
+    end
+  end
+end
diff --git a/core/spec/models/spree/null_promotion_adjuster_spec.rb b/core/spec/models/spree/null_promotion_adjuster_spec.rb
new file mode 100644
index 00000000000..49fbffd2871
--- /dev/null
+++ b/core/spec/models/spree/null_promotion_adjuster_spec.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require "rails_helper"
+
+RSpec.describe Spree::NullPromotionAdjuster do
+  describe "#call" do
+    subject(:call) { described_class.new(order).call }
+
+    let(:order) { instance_double(Spree::Order) }
+
+    it "returns the unchanged order" do
+      expect(call).to eq(order)
+    end
+  end
+end

From dac45b72f3bad7ca7a0280a8bc3d6b6a1e1e3136 Mon Sep 17 00:00:00 2001
From: Martin Meyerhoff <mamhoff@gmail.com>
Date: Fri, 26 Jan 2024 21:52:57 +0100
Subject: [PATCH 18/19] Introduce Null Promotion Handler

This is a stand-in for all the promotion handlers we have. It implements
all the methods from the promotion handler "coupon".
---
 .../models/spree/null_promotion_handler.rb    | 36 +++++++++++++
 core/config/locales/en.yml                    |  2 +
 .../spree/null_promotion_handler_spec.rb      | 52 +++++++++++++++++++
 3 files changed, 90 insertions(+)
 create mode 100644 core/app/models/spree/null_promotion_handler.rb
 create mode 100644 core/spec/models/spree/null_promotion_handler_spec.rb

diff --git a/core/app/models/spree/null_promotion_handler.rb b/core/app/models/spree/null_promotion_handler.rb
new file mode 100644
index 00000000000..ff4537f76f6
--- /dev/null
+++ b/core/app/models/spree/null_promotion_handler.rb
@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module Spree
+  class NullPromotionHandler
+    attr_reader :order, :coupon_code
+
+    def initialize(order)
+      @order = order
+      @coupon_code = order.coupon_code&.downcase
+    end
+
+    def activate
+      @order
+    end
+
+    def error
+      nil
+    end
+
+    def success
+      true
+    end
+
+    def successful?
+      true
+    end
+
+    def status_code
+      :coupon_code_applied
+    end
+
+    def status
+      I18n.t(:coupon_code_applied, scope: [:spree, :null_promotion_handler])
+    end
+  end
+end
diff --git a/core/config/locales/en.yml b/core/config/locales/en.yml
index 3077f7b364d..6ee5a31082d 100644
--- a/core/config/locales/en.yml
+++ b/core/config/locales/en.yml
@@ -1881,6 +1881,8 @@ en:
       product_not_deleted: Product could not be deleted
       variant_deleted: Variant has been deleted
       variant_not_deleted: Variant could not be deleted
+    null_promotion_handler:
+      coupon_code_applied: Coupon code has been applied.
     num_orders: "# Orders"
     number: Number
     number_of_codes: "%{count} codes"
diff --git a/core/spec/models/spree/null_promotion_handler_spec.rb b/core/spec/models/spree/null_promotion_handler_spec.rb
new file mode 100644
index 00000000000..b20f1dca463
--- /dev/null
+++ b/core/spec/models/spree/null_promotion_handler_spec.rb
@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+require "rails_helper"
+
+RSpec.describe Spree::NullPromotionHandler do
+  let(:order) { double(Spree::Order, coupon_code: "NULL") }
+  subject(:handler) { described_class.new(order) }
+
+  describe "#activate" do
+    subject(:activate) { handler.activate }
+
+    it "returns the unchanged order" do
+      expect(activate).to eq(order)
+    end
+  end
+
+  describe "#status" do
+    subject { handler.status }
+
+    it { is_expected.to eq("Coupon code has been applied.") }
+  end
+
+  describe "#status_code" do
+    subject { handler.status_code }
+
+    it { is_expected.to eq(:coupon_code_applied) }
+  end
+
+  describe "#error" do
+    subject { handler.error }
+
+    it { is_expected.to be nil }
+  end
+
+  describe "#coupon_code" do
+    subject { handler.coupon_code }
+
+    it { is_expected.to eq 'null' }
+  end
+
+  describe "#success" do
+    subject { handler.success }
+
+    it { is_expected.to be true }
+  end
+
+  describe "#successful?" do
+    subject { handler.successful? }
+
+    it { is_expected.to be true }
+  end
+end

From e29983fc60d7a99c3080f1f78577aad82864e59b Mon Sep 17 00:00:00 2001
From: Martin Meyerhoff <mamhoff@gmail.com>
Date: Sat, 17 Feb 2024 21:28:01 +0100
Subject: [PATCH 19/19] Add a Null promotion configuration

We need a promotion configuration when solidus_legacy_promotions is out
of core. This provides it.
---
 core/lib/spree/core.rb                         |  1 +
 .../spree/core/null_promotion_configuration.rb | 18 ++++++++++++++++++
 .../core/null_promotion_configuration_spec.rb  | 15 +++++++++++++++
 3 files changed, 34 insertions(+)
 create mode 100644 core/lib/spree/core/null_promotion_configuration.rb
 create mode 100644 core/spec/lib/spree/core/null_promotion_configuration_spec.rb

diff --git a/core/lib/spree/core.rb b/core/lib/spree/core.rb
index f75b601b5ee..2a15cafb718 100644
--- a/core/lib/spree/core.rb
+++ b/core/lib/spree/core.rb
@@ -121,6 +121,7 @@ class GatewayError < RuntimeError; end
 require 'spree/core/state_machines'
 require 'spree/core/stock_configuration'
 require 'spree/core/promotion_configuration'
+require 'spree/core/null_promotion_configuration'
 require 'spree/core/validators/email'
 require 'spree/permission_sets'
 require 'spree/user_class_handle'
diff --git a/core/lib/spree/core/null_promotion_configuration.rb b/core/lib/spree/core/null_promotion_configuration.rb
new file mode 100644
index 00000000000..8e73dbf5317
--- /dev/null
+++ b/core/lib/spree/core/null_promotion_configuration.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Spree
+  module Core
+    class NullPromotionConfiguration < Spree::Preferences::Configuration
+      # promotion_adjuster_class allows extensions to provide their own Promotion Adjuster
+      class_name_attribute :promotion_adjuster_class, default: 'Spree::NullPromotionAdjuster'
+
+      # Allows providing a different coupon code handler.
+      # @!attribute [rw] coupon_code_handler_class
+      # @see Spree::NullPromotionHandler
+      # @return [Class] an object that conforms to the API of
+      #   the standard coupon code handler class
+      #   Spree::NullPromotionHandler.
+      class_name_attribute :coupon_code_handler_class, default: 'Spree::NullPromotionHandler'
+    end
+  end
+end
diff --git a/core/spec/lib/spree/core/null_promotion_configuration_spec.rb b/core/spec/lib/spree/core/null_promotion_configuration_spec.rb
new file mode 100644
index 00000000000..b82401ecaf9
--- /dev/null
+++ b/core/spec/lib/spree/core/null_promotion_configuration_spec.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe Spree::Core::NullPromotionConfiguration do
+  subject(:config) { described_class.new }
+
+  it "uses the null promotion adjuster class by default" do
+    expect(config.promotion_adjuster_class).to eq Spree::NullPromotionAdjuster
+  end
+
+  it "uses the null coupon code handler class by default" do
+    expect(config.coupon_code_handler_class).to eq Spree::NullPromotionHandler
+  end
+end