diff --git a/app/models/abilities/common.rb b/app/models/abilities/common.rb index ed2c3d4a0..0d1bfd4b9 100644 --- a/app/models/abilities/common.rb +++ b/app/models/abilities/common.rb @@ -49,7 +49,7 @@ module Abilities can :create, SpendingProposal can :create, Budget::Investment, budget: { phase: "accepting" } can :vote, Budget::Investment, budget: { phase: "selecting" } - can :ballot, Budget::Investment, budget: { phase: "balloting" } + can :create, Budget::Ballot, budget: { phase: "balloting" } end can :create, Annotation diff --git a/spec/models/abilities/common_spec.rb b/spec/models/abilities/common_spec.rb index 36b4b49f6..6fd751c9f 100644 --- a/spec/models/abilities/common_spec.rb +++ b/spec/models/abilities/common_spec.rb @@ -9,9 +9,15 @@ describe "Abilities::Common" do let(:debate) { create(:debate) } let(:comment) { create(:comment) } let(:proposal) { create(:proposal) } - let(:investment_in_accepting_budget) { create(:budget_investment, budget: create(:budget, phase: 'accepting')) } - let(:investment_in_selecting_budget) { create(:budget_investment, budget: create(:budget, phase: 'selecting')) } - let(:investment_in_balloting_budget) { create(:budget_investment, budget: create(:budget, phase: 'balloting')) } + let(:accepting_budget) { create(:budget, phase: 'accepting') } + let(:selecting_budget) { create(:budget, phase: 'selecting') } + let(:balloting_budget) { create(:budget, phase: 'balloting') } + let(:investment_in_accepting_budget) { create(:budget_investment, budget: accepting_budget) } + let(:investment_in_selecting_budget) { create(:budget_investment, budget: selecting_budget) } + let(:investment_in_balloting_budget) { create(:budget_investment, budget: balloting_budget) } + let(:ballot_in_accepting_budget) { create(:budget_ballot, budget: accepting_budget) } + let(:ballot_in_selecting_budget) { create(:budget_ballot, budget: selecting_budget) } + let(:ballot_in_balloting_budget) { create(:budget_ballot, budget: balloting_budget) } let(:own_debate) { create(:debate, author: user) } let(:own_comment) { create(:comment, author: user) } let(:own_proposal) { create(:proposal, author: user) } @@ -105,9 +111,9 @@ describe "Abilities::Common" do it { should be_able_to(:vote, investment_in_selecting_budget) } it { should_not be_able_to(:vote, investment_in_balloting_budget) } - it { should_not be_able_to(:ballot, investment_in_accepting_budget) } - it { should_not be_able_to(:ballot, investment_in_selecting_budget) } - it { should be_able_to(:ballot, investment_in_balloting_budget) } + it { should_not be_able_to(:create, ballot_in_accepting_budget) } + it { should_not be_able_to(:create, ballot_in_selecting_budget) } + it { should be_able_to(:create, ballot_in_balloting_budget) } end