adds Budget::Group model to group headings

many refactors through budget related models
This commit is contained in:
Juanjo Bazán
2016-06-09 18:00:06 +02:00
parent 3fae269c40
commit b5a6828e41
18 changed files with 156 additions and 110 deletions

View File

@@ -65,7 +65,13 @@ describe "Abilities::Administrator" do
it { should be_able_to(:update, Budget::Investment) }
it { should be_able_to(:hide, Budget::Investment) }
it { should be_able_to(:valuate, create(:budget_investment, budget: create(:budget, valuating: true))) }
it { should_not be_able_to(:valuate, create(:budget_investment, budget: create(:budget, valuating: false))) }
it { should be_able_to(:valuate, create(:budget_investment,
heading: create(:budget_heading,
group: create(:budget_group,
budget: create(:budget, valuating: true))))) }
it { should_not be_able_to(:valuate, create(:budget_investment,
heading: create(:budget_heading,
group: create(:budget_group,
budget: create(:budget, valuating: false))))) }
end

View File

@@ -12,9 +12,16 @@ describe "Abilities::Common" do
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(:accepting_budget_group) { create(:budget_group, budget: accepting_budget) }
let(:selecting_budget_group) { create(:budget_group, budget: selecting_budget) }
let(:balloting_budget_group) { create(:budget_group, budget: balloting_budget) }
let(:accepting_budget_heading) { create(:budget_heading, group: accepting_budget_group) }
let(:selecting_budget_heading) { create(:budget_heading, group: selecting_budget_group) }
let(:balloting_budget_heading) { create(:budget_heading, group: balloting_budget_group) }
let(:investment_in_accepting_budget) { create(:budget_investment, heading: accepting_budget_heading) }
let(:investment_in_selecting_budget) { create(:budget_investment, heading: selecting_budget_heading) }
let(:investment_in_balloting_budget) { create(:budget_investment, heading: balloting_budget_heading) }
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) }

View File

@@ -7,10 +7,16 @@ describe "Abilities::Valuator" do
let(:valuator) { create(:valuator) }
let(:non_assigned_investment) { create(:budget_investment) }
let(:assigned_investment) { create(:budget_investment, budget: create(:budget, valuating: true)) }
let(:assigned_investment) { create(:budget_investment,
heading: create(:budget_heading,
group: create(:budget_group,
budget: create(:budget, valuating: true)))) }
before(:each) { assigned_investment.valuators << valuator }
let(:assigned_investment_not_valuating) { create(:budget_investment, budget: create(:budget, valuating: false)) }
let(:assigned_investment_not_valuating) { create(:budget_investment,
heading: create(:budget_heading,
group: create(:budget_group,
budget: create(:budget, valuating: false)))) }
before(:each) { assigned_investment_not_valuating.valuators << valuator }
it { should be_able_to(:read, SpendingProposal) }