From 55a2bcb5590a358a2aa644d859cde79f8546ec47 Mon Sep 17 00:00:00 2001 From: decabeza Date: Wed, 6 Mar 2019 10:07:11 +0100 Subject: [PATCH] Show unfeasible budget investment messages only when valuation finished --- .../investments/_investment_show.html.erb | 2 +- spec/features/budgets/investments_spec.rb | 23 +++++++++++++++---- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/app/views/budgets/investments/_investment_show.html.erb b/app/views/budgets/investments/_investment_show.html.erb index 656834d05..8565a80d7 100644 --- a/app/views/budgets/investments/_investment_show.html.erb +++ b/app/views/budgets/investments/_investment_show.html.erb @@ -146,7 +146,7 @@ <% end %> <% end %> - <% if investment.unfeasible? %> + <% if investment.unfeasible? && investment.valuation_finished? %>
<%= t("budgets.investments.show.project_unfeasible_html") %>
diff --git a/spec/features/budgets/investments_spec.rb b/spec/features/budgets/investments_spec.rb index 52ce89fd2..c82018cac 100644 --- a/spec/features/budgets/investments_spec.rb +++ b/spec/features/budgets/investments_spec.rb @@ -1097,23 +1097,38 @@ feature 'Budget Investments' do end - scenario "Show (unfeasible budget investment)" do + scenario "Show (unfeasible budget investment) only when valuation finished" do user = create(:user) login_as(user) investment = create(:budget_investment, + :unfeasible, + budget: budget, + group: group, + heading: heading, + unfeasibility_explanation: "Local government is not competent in this") + + investment_2 = create(:budget_investment, :unfeasible, :finished, budget: budget, group: group, heading: heading, - unfeasibility_explanation: 'Local government is not competent in this matter') + unfeasibility_explanation: "The unfeasible explanation") visit budget_investment_path(budget_id: budget.id, id: investment.id) + expect(page).not_to have_content("Unfeasibility explanation") + expect(page).not_to have_content("Local government is not competent in this") + expect(page).not_to have_content("This investment project has been marked as not feasible "\ + "and will not go to balloting phase") + + visit budget_investment_path(budget_id: budget.id, id: investment_2.id) + expect(page).to have_content("Unfeasibility explanation") - expect(page).to have_content("Local government is not competent in this matter") - expect(page).to have_content("This investment project has been marked as not feasible and will not go to balloting phase") + expect(page).to have_content("The unfeasible explanation") + expect(page).to have_content("This investment project has been marked as not feasible "\ + "and will not go to balloting phase") end scenario "Show (selected budget investment)" do