Add Valuator Groups list to investment csv & table

We've added the list of valuator groups assigned to each investment at
 both admin investment list and investment csv exported file
This commit is contained in:
Bertocq
2018-04-11 21:12:46 +02:00
parent b364fc475e
commit 1dc8d29f2d
5 changed files with 28 additions and 11 deletions

View File

@@ -64,22 +64,27 @@ feature 'Admin budget investments' do
admin = create(:administrator, user: create(:user, username: 'Gema'))
budget_investment1.valuators << valuator1
budget_investment2.valuator_ids = [valuator1.id, valuator2.id]
budget_investment3.update(administrator_id: admin.id)
budget_investment2.valuators << valuator1
budget_investment2.valuators << valuator2
visit admin_budget_budget_investments_path(budget_id: budget.id)
within("#budget_investment_#{budget_investment1.id}") do
expect(page).to have_content("No admin assigned")
expect(page).to have_content("Valuator Olga")
expect(page).to have_content("No valuation groups assigned")
end
within("#budget_investment_#{budget_investment2.id}") do
expect(page).to have_content("No admin assigned")
expect(page).to have_content("Valuator Olga")
expect(page).to have_content("Valuator Miriam")
expect(page).to have_content("No valuation groups assigned")
end
budget_investment3.update(administrator_id: admin.id)
visit admin_budget_budget_investments_path(budget_id: budget.id)
within("#budget_investment_#{budget_investment3.id}") do
expect(page).to have_content("Gema")
expect(page).to have_content("No valuators assigned")
@@ -109,7 +114,7 @@ feature 'Admin budget investments' do
end
within("#budget_investment_#{budget_investment3.id}") do
expect(page).to have_content("No valuators assigned")
expect(page).to have_content("No valuation groups assigned")
end
end
@@ -953,7 +958,9 @@ feature 'Admin budget investments' do
price: 100)
valuator = create(:valuator, user: create(:user, username: 'Rachel',
email: 'rachel@val.org'))
investment.valuators.push(valuator)
group = create(:valuator_group, name: "Test name")
investment.valuator_groups << group
admin = create(:administrator, user: create(:user, username: 'Gema'))
investment.update(administrator_id: admin.id)
@@ -978,6 +985,7 @@ feature 'Admin budget investments' do
expect(page).to have_content investment.administrator.name
expect(page).to have_content valuators
expect(page).to have_content group.name
expect(page).to have_content price
expect(page).to have_content I18n.t('shared.no')
end