Merge pull request #3490 from alphagov/hidden-clear-filt

All content finder: Implement hidden clearable facet

app/models/hidden_clearable_facet.rb

@@ -1,4 +1,6 @@
 class HiddenClearableFacet < FilterableFacet
+  attr_reader :value
+
   def initialize(facet, value_hash)
     @value = Array(value_hash)
     super(facet)

app/views/finders/all_content_finder_facets/_hidden_clearable_facet.html.erb

@@ -1 +1,3 @@
-<%# TODO: Hidden clearable facet %>
+<% hidden_clearable_facet.value.each do |value| %>
+  <%= hidden_field_tag "#{hidden_clearable_facet.key}[]", value %>
+<% end %>

features/all_content_finder.feature

@@ -12,6 +12,11 @@ Feature: All content finder ("site search")
     Then I can see results for my search
     And I can see how many results there are
 
+  Scenario: Making a search with a hidden clearable filter
+    When I search for "search-term" with a hidden clearable manual filter
+    And I change my search term to "search-term-updated" and submit
+    Then my search is still filtered by manual
+
   Scenario: Filtering results
     When I search all content for "how to walk silly"
     And I open the filter panel

features/step_definitions/site_search_steps.rb

@@ -2,6 +2,15 @@
   visit "/search/all?q=#{search_term}"
 end
 
+When(/^I search for "([^"]*)" with a hidden clearable manual filter$/) do |search_term|
+  visit "/search/all?q=#{search_term}&manual%5B%5D=how-to-be-a-wizard"
+end
+
+When(/^I change my search term to "([^"]*)" and submit$/) do |search_term|
+  fill_in "Search", with: search_term
+  click_on "Search"
+end
+
 Then("I can see results for my search") do
   expect(page).to have_link("West London wobbley walk")
   expect(page).to have_link("The Gerry Anderson")
@@ -11,6 +20,10 @@
   expect(page).to have_selector("h2", text: "2 results")
 end
 
+Then("my search is still filtered by manual") do
+  expect(page).to have_link("Remove filter Manual: How to be a Wizard", normalize_ws: true)
+end
+
 When("I open the filter panel") do
   click_on "Filter and sort"
 end

features/support/document_helper.rb

@@ -136,6 +136,11 @@ def stub_search_api_request_with_manual_filter_all_content_results
       filtered_by_manual_all_content_results_json,
       including_v2: true,
     )
+    stub_response(
+      hash_including("q" => "search-term-updated", "filter_manual" => %w[how-to-be-a-wizard]),
+      filtered_by_manual_all_content_results_json,
+      including_v2: true,
+    )
   end
 
   def stub_search_api_request_with_filtered_policy_papers_results