diff --git a/app/helpers/budget_executions_helper.rb b/app/helpers/budget_executions_helper.rb index 8b2123ccc..182fd3fe4 100644 --- a/app/helpers/budget_executions_helper.rb +++ b/app/helpers/budget_executions_helper.rb @@ -4,7 +4,7 @@ module BudgetExecutionsHelper end def options_for_milestone_tags - @budget.milestone_tags.map do |tag| + @budget.investments_milestone_tags.map do |tag| ["#{tag} (#{@budget.investments.winners.tagged_with(tag).count})", tag] end end diff --git a/app/models/budget.rb b/app/models/budget.rb index 1f528b102..41a6c0869 100644 --- a/app/models/budget.rb +++ b/app/models/budget.rb @@ -197,7 +197,7 @@ class Budget < ApplicationRecord investments.winners.any? end - def milestone_tags + def investments_milestone_tags investments.winners.map(&:milestone_tag_list).flatten.uniq.sort end diff --git a/spec/models/budget_spec.rb b/spec/models/budget_spec.rb index 7c3eea4f1..08fb0cea2 100644 --- a/spec/models/budget_spec.rb +++ b/spec/models/budget_spec.rb @@ -296,7 +296,7 @@ describe Budget do end end - describe "#milestone_tags" do + describe "#investments_milestone_tags" do let(:investment1) { build(:budget_investment, :winner) } let(:investment2) { build(:budget_investment, :winner) } let(:investment3) { build(:budget_investment) } @@ -304,7 +304,7 @@ describe Budget do it "returns an empty array if not investments milestone_tags" do budget.investments << investment1 - expect(budget.milestone_tags).to eq([]) + expect(budget.investments_milestone_tags).to eq([]) end it "returns array of investments milestone_tags" do @@ -312,7 +312,7 @@ describe Budget do investment1.save! budget.investments << investment1 - expect(budget.milestone_tags).to eq(["tag1"]) + expect(budget.investments_milestone_tags).to eq(["tag1"]) end it "returns uniq list of investments milestone_tags" do @@ -323,7 +323,7 @@ describe Budget do budget.investments << investment1 budget.investments << investment2 - expect(budget.milestone_tags).to eq(["tag1"]) + expect(budget.investments_milestone_tags).to eq(["tag1"]) end it "returns tags only for winner investments" do @@ -334,7 +334,7 @@ describe Budget do budget.investments << investment1 budget.investments << investment3 - expect(budget.milestone_tags).to eq(["tag1"]) + expect(budget.investments_milestone_tags).to eq(["tag1"]) end end end