Directly assign valuator groups in specs
This commit is contained in:
@@ -88,11 +88,10 @@ describe "Admin budget investments" do
|
||||
admin = create(:administrator, user: create(:user, username: "Gema"))
|
||||
|
||||
budget_investment1 = create(:budget_investment, budget: budget, valuators: [valuator1])
|
||||
budget_investment2 = create(:budget_investment, budget: budget, valuators: [valuator1, valuator2])
|
||||
budget_investment2 = create(:budget_investment, budget: budget, valuators: [valuator1, valuator2],
|
||||
valuator_groups: [valuator_group])
|
||||
budget_investment3 = create(:budget_investment, budget: budget)
|
||||
|
||||
budget_investment2.valuator_groups << valuator_group
|
||||
|
||||
visit admin_budget_budget_investments_path(budget_id: budget.id)
|
||||
|
||||
within("#budget_investment_#{budget_investment1.id}") do
|
||||
@@ -241,11 +240,8 @@ describe "Admin budget investments" do
|
||||
health_group = create(:valuator_group, name: "Health")
|
||||
culture_group = create(:valuator_group, name: "Culture")
|
||||
|
||||
budget_investment1 = create(:budget_investment, title: "Build a hospital", budget: budget)
|
||||
budget_investment1.valuator_groups << health_group
|
||||
|
||||
budget_investment2 = create(:budget_investment, title: "Build a theatre", budget: budget)
|
||||
budget_investment2.valuator_groups << culture_group
|
||||
create(:budget_investment, title: "Build a hospital", budget: budget, valuator_groups: [health_group])
|
||||
create(:budget_investment, title: "Build a theatre", budget: budget, valuator_groups: [culture_group])
|
||||
|
||||
visit admin_budget_budget_investments_path(budget_id: budget)
|
||||
expect(page).to have_link("Build a hospital")
|
||||
|
||||
@@ -231,7 +231,7 @@ describe "Valuation budget investments" do
|
||||
create(:budget_investment, :unfeasible, budget: budget, price: 1234,
|
||||
unfeasibility_explanation: "It is impossible",
|
||||
administrator: administrator,
|
||||
valuators: [valuator, second_valuator] )
|
||||
valuators: [valuator, second_valuator])
|
||||
end
|
||||
|
||||
scenario "visible for assigned valuators" do
|
||||
|
||||
@@ -5,18 +5,13 @@ describe Abilities::Valuator do
|
||||
subject(:ability) { Ability.new(user) }
|
||||
|
||||
let(:user) { valuator.user }
|
||||
let(:valuator) { create(:valuator) }
|
||||
let(:group) { create(:valuator_group) }
|
||||
let(:valuator) { create(:valuator, valuator_group: group) }
|
||||
let(:non_assigned_investment) { create(:budget_investment) }
|
||||
let(:assigned_investment) { create(:budget_investment, budget: create(:budget, :valuating), valuators: [valuator]) }
|
||||
let(:group_assigned_investment) { create(:budget_investment, budget: create(:budget, :valuating)) }
|
||||
let(:group_assigned_investment) { create(:budget_investment, budget: create(:budget, :valuating), valuator_groups: [group]) }
|
||||
let(:finished_assigned_investment) { create(:budget_investment, budget: create(:budget, :finished), valuators: [valuator]) }
|
||||
|
||||
before do
|
||||
group_assigned_investment.valuator_groups << group
|
||||
valuator.update(valuator_group: group)
|
||||
end
|
||||
|
||||
it "cannot valuate an assigned investment with a finished valuation" do
|
||||
assigned_investment.update(valuation_finished: true)
|
||||
|
||||
|
||||
@@ -439,11 +439,8 @@ describe Budget::Investment do
|
||||
|
||||
it "returns all investments with assigned valuator groups but valuation not finished" do
|
||||
investment1 = create(:budget_investment)
|
||||
investment2 = create(:budget_investment)
|
||||
investment3 = create(:budget_investment, :finished)
|
||||
|
||||
investment2.valuator_groups << create(:valuator_group)
|
||||
investment3.valuator_groups << create(:valuator_group)
|
||||
investment2 = create(:budget_investment, valuator_groups: [create(:valuator_group)])
|
||||
investment3 = create(:budget_investment, :finished, valuator_groups: [create(:valuator_group)])
|
||||
|
||||
valuating = Budget::Investment.valuating
|
||||
|
||||
|
||||
@@ -34,13 +34,10 @@ describe Valuator do
|
||||
group = create(:valuator_group)
|
||||
valuator = create(:valuator, valuator_group: group)
|
||||
|
||||
investment1 = create(:budget_investment)
|
||||
investment2 = create(:budget_investment)
|
||||
investment1 = create(:budget_investment, valuator_groups: [group])
|
||||
investment2 = create(:budget_investment, valuator_groups: [group])
|
||||
investment3 = create(:budget_investment)
|
||||
|
||||
investment1.valuator_groups << group
|
||||
investment2.valuator_groups << group
|
||||
|
||||
assigned_investment_ids = valuator.assigned_investment_ids
|
||||
|
||||
expect(assigned_investment_ids).to match_array [investment1.id, investment2.id]
|
||||
|
||||
Reference in New Issue
Block a user