From 3ad14f4acb52d233a84c03ede2ba068d521b81ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sen=C3=A9n=20Rodero=20Rodr=C3=ADguez?= Date: Tue, 22 Dec 2020 13:39:18 +0100 Subject: [PATCH] Send current tab reference when filtering with search form --- .../relations/index_component.html.erb | 1 + spec/system/sdg_management/relations_spec.rb | 41 +++++++++++++++---- 2 files changed, 33 insertions(+), 9 deletions(-) diff --git a/app/components/sdg_management/relations/index_component.html.erb b/app/components/sdg_management/relations/index_component.html.erb index 3366a1372..484d49ce9 100644 --- a/app/components/sdg_management/relations/index_component.html.erb +++ b/app/components/sdg_management/relations/index_component.html.erb @@ -7,6 +7,7 @@ <%= component.select_tag :target_code, target_options, include_blank: target_blank_option, "aria-label": target_label %> + <%= component.hidden_field_tag :filter, current_filter %> <% end %> <%= render "shared/filter_subnav", i18n_namespace: "sdg_management.relations.index" %> diff --git a/spec/system/sdg_management/relations_spec.rb b/spec/system/sdg_management/relations_spec.rb index 53fa1c808..b79aef80a 100644 --- a/spec/system/sdg_management/relations_spec.rb +++ b/spec/system/sdg_management/relations_spec.rb @@ -138,6 +138,7 @@ describe "SDG Relations", :js do expect(page).to have_content "Internet speech freedom" expect(page).not_to have_content "SDG interest" + expect(page).to have_css "li.is-active h2", exact_text: "Pending" end scenario "goal filter" do @@ -150,19 +151,41 @@ describe "SDG Relations", :js do expect(page).to have_content "School" expect(page).not_to have_content "Hospital" + expect(page).to have_css "li.is-active h2", exact_text: "Pending" end - end - scenario "target filter" do - create(:budget_investment, title: "School", sdg_targets: [SDG::Target[4.1]]) - create(:budget_investment, title: "Preschool", sdg_targets: [SDG::Target[4.2]]) + scenario "target filter" do + create(:budget_investment, title: "School", sdg_targets: [SDG::Target[4.1]]) + create(:budget_investment, title: "Preschool", sdg_targets: [SDG::Target[4.2]]) - visit sdg_management_budget_investments_path - select "4.1", from: "target_code" - click_button "Search" + visit sdg_management_budget_investments_path + select "4.1", from: "target_code" + click_button "Search" - expect(page).to have_content "School" - expect(page).not_to have_content "Preschool" + expect(page).to have_content "School" + expect(page).not_to have_content "Preschool" + expect(page).to have_css "li.is-active h2", exact_text: "Pending" + end + + scenario "search within current tab" do + visit sdg_management_proposals_path(filter: "pending_sdg_review") + + click_button "Search" + + expect(page).to have_css "li.is-active h2", exact_text: "Pending" + + visit sdg_management_proposals_path(filter: "sdg_reviewed") + + click_button "Search" + + expect(page).to have_css "li.is-active h2", exact_text: "Marked as reviewed" + + visit sdg_management_proposals_path(filter: "all") + + click_button "Search" + + expect(page).to have_css "li.is-active h2", exact_text: "All" + end end end