Merge pull request #6161 from blish/fix-promotions-patch-loading

[Promotions] Set Flickwerk patches in initializer

Author: tvdeyen

promotions/lib/solidus_promotions/engine.rb

@@ -6,7 +6,6 @@
 module SolidusPromotions
   class Engine < Rails::Engine
     include SolidusSupport::EngineExtensions
-    Flickwerk.aliases["Spree::Config.order_recalculator_class"] = Spree::Config.order_recalculator_class_name
 
     isolate_namespace ::SolidusPromotions
 
@@ -17,6 +16,10 @@ class Engine < Rails::Engine
       g.test_framework :rspec
     end
 
+    initializer "solidus_promotions.flickwerk_alias" do
+      Flickwerk.aliases["Spree::Config.order_recalculator_class"] = Spree::Config.order_recalculator_class_name
+    end
+
     initializer "solidus_promotions.assets" do |app|
       if SolidusSupport.backend_available?
         app.config.assets.precompile << "solidus_promotions/manifest.js"

promotions/spec/lib/solidus_promotions/engine_spec.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+RSpec.describe SolidusPromotions::Engine do
+  describe "initializer.flickwerk_alias" do
+    it "sets the Flickwerk alias for order_recalculator_class" do
+      Flickwerk.aliases["Spree::Config.order_recalculator_class"] = nil
+
+      require "solidus_promotions/engine"
+      expect(Flickwerk.aliases["Spree::Config.order_recalculator_class"]).to be_nil
+
+      initializer = SolidusPromotions::Engine.initializers.find { |i| i.name == "solidus_promotions.flickwerk_alias" }
+      initializer.run
+      expect(Flickwerk.aliases["Spree::Config.order_recalculator_class"]).to eq("Spree::OrderUpdater")
+    end
+  end
+end