From 315ed776184d8f8a04b1bd5d43ba6ea2a39e27aa Mon Sep 17 00:00:00 2001 From: decabeza Date: Tue, 13 Nov 2018 18:33:24 +0100 Subject: [PATCH 1/2] Removes unnecessary condition --- app/views/budgets/investments/_investment_show.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/budgets/investments/_investment_show.html.erb b/app/views/budgets/investments/_investment_show.html.erb index d5208909a..5f8f67939 100644 --- a/app/views/budgets/investments/_investment_show.html.erb +++ b/app/views/budgets/investments/_investment_show.html.erb @@ -156,7 +156,7 @@
<%= t("budgets.investments.show.project_selected_html") %>
- <% elsif !investment.selected? && @budget.balloting_or_later? %> + <% elsif @budget.balloting_or_later? %>
<%= t("budgets.investments.show.project_not_selected_html") %>
From 9284453e6927177eb5da5c23de19778842f082a3 Mon Sep 17 00:00:00 2001 From: decabeza Date: Wed, 14 Nov 2018 12:31:09 +0100 Subject: [PATCH 2/2] Adds spec when no message is displayed --- spec/features/budgets/investments_spec.rb | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/spec/features/budgets/investments_spec.rb b/spec/features/budgets/investments_spec.rb index 5a9798133..e918e9f52 100644 --- a/spec/features/budgets/investments_spec.rb +++ b/spec/features/budgets/investments_spec.rb @@ -1063,6 +1063,25 @@ feature 'Budget Investments' do expect(page).to have_content("This investment project has not been selected for balloting phase") end + scenario "Show title (no message)" do + user = create(:user) + login_as(user) + + investment = create(:budget_investment, + :feasible, + :finished, + budget: budget, + group: group, + heading: heading) + + visit budget_investment_path(budget_id: budget.id, id: investment.id) + + within("aside") do + expect(page).to have_content("Investment project") + expect(page).to have_css(".label-budget-investment") + end + end + scenario "Show (unfeasible budget investment with valuation not finished)" do user = create(:user) login_as(user)