Merge pull request solidusio#5767 from mamhoff/null-promo-handler-ret…

…urn-value

NullPromotionHandler: return self from #apply

core/app/models/spree/null_promotion_handler.rb

@@ -12,7 +12,10 @@ def initialize(order)
     def activate
       @order
     end
-    alias_method :apply, :activate
+
+    def apply
+      self
+    end
 
     def can_apply?
       true

core/spec/models/spree/null_promotion_handler_spec.rb

@@ -17,8 +17,9 @@
   describe "#apply" do
     subject(:activate) { handler.apply }
 
-    it "returns the unchanged order" do
-      expect(activate).to eq(order)
+    it "returns the handler with the unchanged order" do
+      expect(activate).to eq(handler)
+      expect(activate.order).to eq(order)
     end
   end