diff --git a/app/views/budgets/investments/index.html.erb b/app/views/budgets/investments/index.html.erb index 3c20c3256..99e47d0c9 100644 --- a/app/views/budgets/investments/index.html.erb +++ b/app/views/budgets/investments/index.html.erb @@ -16,17 +16,14 @@ <% end %>
- - <% unless params[:search].present? %> - <%= render "/budgets/investments/header" %> - <% end %> - - <% if params[:search].present? || params[:advanced_search].present? %> + <% if @search_terms || @advanced_search_terms %> <%= render Shared::SearchResultsSummaryComponent.new( results: @investments, - search_terms: params[:search], - advanced_search_terms: params[:advanced_search] + search_terms: @search_terms, + advanced_search_terms: @advanced_search_terms ) %> + <% else %> + <%= render "/budgets/investments/header" %> <% end %>
diff --git a/spec/system/budgets/investments_spec.rb b/spec/system/budgets/investments_spec.rb index 01fceb272..b1dd24db1 100644 --- a/spec/system/budgets/investments_spec.rb +++ b/spec/system/budgets/investments_spec.rb @@ -219,6 +219,23 @@ describe "Budget Investments" do expect(page).not_to have_content "Feasible health" expect(page).not_to have_content "Unfeasible health" end + + scenario "Advanced search without search terms" do + create(:budget_heading, group: heading.group) + create(:budget_investment, heading: heading, title: "Old thing", created_at: 2.years.ago) + create(:budget_investment, heading: heading, title: "Newest thing", created_at: 1.hour.ago) + + visit budget_investments_path(budget, heading: heading) + + click_button "Advanced search" + select "Last year", from: "By date" + click_button "Filter" + + expect(page).to have_content "There is 1 investment" + expect(page).to have_content "Newest thing" + expect(page).not_to have_content "Old thing" + within("main") { expect(page).not_to have_content "Participatory budgeting" } + end end context("Filters") do