From 8aff5e95d67fee3b03affb28891c41804158668a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Sat, 9 Apr 2022 01:19:07 +0200 Subject: [PATCH] Fix term in investments advanced search results When using the advanced search in the debates and proposals sections, we were not displaying the search term in the search results summary. However, we were displaying it when using the advanced search in the investments section. Now we're doing the same thing everywhere. --- app/views/budgets/investments/index.html.erb | 8 +++++--- spec/system/budgets/investments_spec.rb | 8 ++++++-- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/app/views/budgets/investments/index.html.erb b/app/views/budgets/investments/index.html.erb index d0f813ff0..37b62a90e 100644 --- a/app/views/budgets/investments/index.html.erb +++ b/app/views/budgets/investments/index.html.erb @@ -28,9 +28,11 @@

<%= t("shared.search_results") %>

<%= page_entries_info @investments %> - <%= sanitize(t("budgets.investments.index.search_results", - count: @investments.size, - search_term: params[:search])) %> + <% if params[:advanced_search].blank? %> + <%= sanitize(t("budgets.investments.index.search_results", + count: @investments.size, + search_term: params[:search])) %> + <% end %>

diff --git a/spec/system/budgets/investments_spec.rb b/spec/system/budgets/investments_spec.rb index 5917bf48f..01fceb272 100644 --- a/spec/system/budgets/investments_spec.rb +++ b/spec/system/budgets/investments_spec.rb @@ -175,6 +175,8 @@ describe "Budget Investments" do click_button "Search" end + expect(page).to have_content "containing the term 'Schwifty'" + within("#budget-investments") do expect(page).to have_css(".budget-investment", count: 2) @@ -199,9 +201,10 @@ describe "Budget Investments" do select "Last 24 hours", from: "By date" click_button "Filter" - expect(page).to have_content "There is 1 investment containing the term 'environment'" + expect(page).to have_content "There is 1 investment" expect(page).to have_css ".budget-investment", count: 1 expect(page).to have_content "Feasible environment" + expect(page).not_to have_content "containing the term" expect(page).not_to have_content "Feasible health" expect(page).not_to have_content "Unfeasible environment" expect(page).not_to have_content "Unfeasible health" @@ -209,9 +212,10 @@ describe "Budget Investments" do click_link "Unfeasible" expect(page).not_to have_content "Feasible environment" - expect(page).to have_content "There is 1 investment containing the term 'environment'" + expect(page).to have_content "There is 1 investment" expect(page).to have_css ".budget-investment", count: 1 expect(page).to have_content "Unfeasible environment" + expect(page).not_to have_content "containing the term" expect(page).not_to have_content "Feasible health" expect(page).not_to have_content "Unfeasible health" end