diff --git a/app/models/spending_proposal.rb b/app/models/spending_proposal.rb index 69d4d839f..66c6cb2ad 100644 --- a/app/models/spending_proposal.rb +++ b/app/models/spending_proposal.rb @@ -100,7 +100,7 @@ class SpendingProposal < ActiveRecord::Base end def total_votes - cached_votes_up + cached_votes_up + physical_votes end def code diff --git a/spec/models/spending_proposal_spec.rb b/spec/models/spending_proposal_spec.rb index ba18287e6..e3b7629d7 100644 --- a/spec/models/spending_proposal_spec.rb +++ b/spec/models/spending_proposal_spec.rb @@ -277,4 +277,15 @@ describe SpendingProposal do end end + describe "total votes" do + it "takes into account physical votes in addition to web votes" do + sp = create(:spending_proposal) + sp.register_vote(create(:user, :level_two), true) + expect(sp.total_votes).to eq(1) + sp.physical_votes = 10 + expect(sp.total_votes).to eq(11) + end + end + + end