Merge pull request #4056 from mamhoff/distinct-promotion-has-actions

Fix Spree::Promotion.has_actions scope

core/app/models/spree/promotion.rb

@@ -47,7 +47,7 @@ class Promotion < Spree::Base
         where(table[:expires_at].eq(nil).or(table[:expires_at].gt(time)))
     end
     scope :has_actions, -> do
-      joins(:promotion_actions)
+      joins(:promotion_actions).distinct
     end
     scope :applied, -> { joins(:order_promotions).distinct }
 

core/spec/models/spree/promotion_spec.rb

@@ -82,6 +82,30 @@
     end
   end
 
+  describe '.has_actions' do
+    subject { described_class.has_actions }
+
+    let(:promotion) { create(:promotion, starts_at: Date.yesterday, name: "name1") }
+
+    before { promotion }
+
+    it "doesn't return promotion without actions" do
+      expect(subject).to be_empty
+    end
+
+    context 'when promotion has two actions' do
+      let(:promotion) { create(:promotion, :with_action, starts_at: Date.yesterday, name: "name1") }
+
+      before do
+        promotion.actions << Spree::Promotion::Actions::CreateAdjustment.new
+      end
+
+      it 'returns distinct promotion' do
+        expect(subject).to match [promotion]
+      end
+    end
+  end
+
   describe "#apply_automatically" do
     subject { build(:promotion) }