diff --git a/app/controllers/concerns/commentable_actions.rb b/app/controllers/concerns/commentable_actions.rb index 855ad1de5..01066c8ad 100644 --- a/app/controllers/concerns/commentable_actions.rb +++ b/app/controllers/concerns/commentable_actions.rb @@ -65,8 +65,7 @@ module CommentableActions end end - - def map + def map @resource = resource_model.new @tag_cloud = tag_cloud end diff --git a/app/models/spending_proposal.rb b/app/models/spending_proposal.rb index a084a800e..4b3c7d4f7 100644 --- a/app/models/spending_proposal.rb +++ b/app/models/spending_proposal.rb @@ -24,6 +24,9 @@ class SpendingProposal < ActiveRecord::Base scope :managed, -> { valuation_open.where(valuation_assignments_count: 0).where("administrator_id IS NOT ?", nil) } scope :valuating, -> { valuation_open.where("valuation_assignments_count > 0 AND valuation_finished = ?", false) } scope :valuation_finished, -> { where(valuation_finished: true) } + scope :feasible, -> { where(feasible: true) } + scope :unfeasible, -> { where(feasible: false) } + scope :not_unfeasible, -> { where("feasible IS ? OR feasible = ?", nil, true) } scope :by_admin, -> (admin) { where(administrator_id: admin.presence) } scope :by_tag, -> (tag_name) { tagged_with(tag_name) } diff --git a/app/views/proposals/_comments.html.erb b/app/views/proposals/_comments.html.erb index 4a0bd2aea..31f1cb8ba 100644 --- a/app/views/proposals/_comments.html.erb +++ b/app/views/proposals/_comments.html.erb @@ -2,7 +2,6 @@
-

<%= t("proposals.show.comments_title") %> (<%= @proposal.comments_count %>) diff --git a/spec/models/spending_proposal_spec.rb b/spec/models/spending_proposal_spec.rb index 4d320a8d7..ebe3573a4 100644 --- a/spec/models/spending_proposal_spec.rb +++ b/spec/models/spending_proposal_spec.rb @@ -227,6 +227,38 @@ describe SpendingProposal do expect(valuation_finished.first).to eq(spending_proposal3) end end + + describe "feasible" do + it "should return all feasible spending proposals" do + feasible_spending_proposal = create(:spending_proposal, feasible: true) + create(:spending_proposal) + + expect(SpendingProposal.feasible).to eq [feasible_spending_proposal] + end + end + + describe "unfeasible" do + it "should return all unfeasible spending proposals" do + unfeasible_spending_proposal = create(:spending_proposal, feasible: false) + create(:spending_proposal, feasible: true) + + expect(SpendingProposal.unfeasible).to eq [unfeasible_spending_proposal] + end + end + + describe "not_unfeasible" do + it "should return all not unfeasible spending proposals" do + not_unfeasible_spending_proposal_1 = create(:spending_proposal, feasible: true) + not_unfeasible_spending_proposal_2 = create(:spending_proposal) + create(:spending_proposal, feasible: false) + + not_unfeasibles = SpendingProposal.not_unfeasible + + expect(not_unfeasibles.size).to eq(2) + expect(not_unfeasibles.include?(not_unfeasible_spending_proposal_1)).to eq(true) + expect(not_unfeasibles.include?(not_unfeasible_spending_proposal_2)).to eq(true) + end + end end end