From e1d0df918f8bd011d94ab8fd8bbe6682628e7297 Mon Sep 17 00:00:00 2001
From: Kevin Dew <kevindew@me.com>
Date: Wed, 11 Dec 2024 17:11:12 +0000
Subject: [PATCH 1/3] Helper method for search_component

We intend to use the conditional for which search component we use in
two places now: the search results page and the search entry form.

To facilitate this without requiring code to be copied I have moved the
logic for this into a helper method.
---
 app/controllers/finders_controller.rb         |  5 -----
 app/helpers/application_helper.rb             |  6 ++++++
 .../finders/show_all_content_finder.html.erb  |  2 +-
 spec/helpers/application_helper_spec.rb       | 21 +++++++++++++++++++
 4 files changed, 28 insertions(+), 6 deletions(-)
 create mode 100644 spec/helpers/application_helper_spec.rb

diff --git a/app/controllers/finders_controller.rb b/app/controllers/finders_controller.rb
index 19ab425cc..d5c6f7554 100644
--- a/app/controllers/finders_controller.rb
+++ b/app/controllers/finders_controller.rb
@@ -58,7 +58,6 @@ def show_page_variables
     @sort_presenter = sort_presenter
     @pagination = pagination_presenter
     @spelling_suggestion_presenter = spelling_suggestion_presenter
-    @search_component = use_autocomplete? ? "search_with_autocomplete" : "search"
   end
 
 private
@@ -387,8 +386,4 @@ def filter_query_array(arr)
       arr.reject { |v| v == "all" }.compact.presence
     end
   end
-
-  def use_autocomplete?
-    true unless ENV["GOVUK_DISABLE_SEARCH_AUTOCOMPLETE"]
-  end
 end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 09d85d0b1..d7ee19b4e 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -2,4 +2,10 @@ module ApplicationHelper
   def absolute_url_for(path)
     URI.join(Plek.new.website_root, path)
   end
+
+  def search_component
+    use_autocomplete = true unless ENV["GOVUK_DISABLE_SEARCH_AUTOCOMPLETE"]
+
+    use_autocomplete ? "search_with_autocomplete" : "search"
+  end
 end
diff --git a/app/views/finders/show_all_content_finder.html.erb b/app/views/finders/show_all_content_finder.html.erb
index b0a8a6e63..beec63ad2 100644
--- a/app/views/finders/show_all_content_finder.html.erb
+++ b/app/views/finders/show_all_content_finder.html.erb
@@ -53,7 +53,7 @@
     <div class="govuk-grid-row">
       <div class="govuk-grid-column-two-thirds-from-desktop">
         <div id="keywords" role="search" aria-label="Sitewide">
-          <%= render "govuk_publishing_components/components/#{@search_component}", {
+          <%= render "govuk_publishing_components/components/#{search_component}", {
             id: "finder-keyword-search",
             name: "keywords",
             type: 'search',
diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb
new file mode 100644
index 000000000..87731781a
--- /dev/null
+++ b/spec/helpers/application_helper_spec.rb
@@ -0,0 +1,21 @@
+require "spec_helper"
+
+RSpec.describe ApplicationHelper, type: :helper do
+  describe "#search_component" do
+    context "when ENV['GOVUK_DISABLE_SEARCH_AUTOCOMPLETE'] is not set" do
+      it "returns 'search_with_autocomplete'" do
+        ClimateControl.modify GOVUK_DISABLE_SEARCH_AUTOCOMPLETE: nil do
+          expect(helper.search_component).to eq("search_with_autocomplete")
+        end
+      end
+    end
+
+    context "when ENV['GOVUK_DISABLE_SEARCH_AUTOCOMPLETE'] is set" do
+      it "returns 'search'" do
+        ClimateControl.modify GOVUK_DISABLE_SEARCH_AUTOCOMPLETE: "1" do
+          expect(helper.search_component).to eq("search")
+        end
+      end
+    end
+  end
+end

From e9ca789d3554f4b149757fb8b0ee2c407f16b970 Mon Sep 17 00:00:00 2001
From: Kevin Dew <kevindew@me.com>
Date: Wed, 11 Dec 2024 17:35:30 +0000
Subject: [PATCH 2/3] Add basic tests for SearchController#index

I intend to add a conditional to the index action of SearchController
and I want to test it. When I went to implement this I noticed there
were not any specs for the action so I thought adding some basic tests
would be appropriate.
---
 spec/controllers/search_controller_spec.rb | 40 ++++++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 spec/controllers/search_controller_spec.rb

diff --git a/spec/controllers/search_controller_spec.rb b/spec/controllers/search_controller_spec.rb
new file mode 100644
index 000000000..69b9ce967
--- /dev/null
+++ b/spec/controllers/search_controller_spec.rb
@@ -0,0 +1,40 @@
+require "spec_helper"
+require "gds_api/test_helpers/content_store"
+
+describe SearchController, type: :controller do
+  include GdsApi::TestHelpers::ContentStore
+
+  before do
+    stub_content_store_has_item("/search")
+  end
+
+  describe "GET index" do
+    render_views
+
+    it "renders the search page" do
+      get :index
+      expect(response.status).to eq(200)
+      expect(response).to render_template("search/no_search_term")
+    end
+
+    context "when given search parameters" do
+      it "redirects to the all content finder" do
+        get :index, params: { q: "my search" }
+        
+        destination = finder_path("search/all",
+                                  params: { keywords: "my search", order: "relevance" })
+        expect(response).to redirect_to(destination)
+      end
+    end
+
+    context "when JSON is requested" do
+      it "redirects to the all content finder" do
+        get :index, format: :json
+        
+        destination = finder_path("search/all",
+                                  params: { order: "relevance", format: "json" })
+        expect(response).to redirect_to(destination)
+      end
+    end
+  end
+end

From 4d751521e6924b70f8807dd614f4701e85d7acea Mon Sep 17 00:00:00 2001
From: Kevin Dew <kevindew@me.com>
Date: Wed, 11 Dec 2024 17:43:50 +0000
Subject: [PATCH 3/3] Add autocomplete to search index

We've tried to add autocomplete to each site search input on GOV.UK.
When reviewing this we noticed that one of them was missed, the one on
https://www.gov.uk/search.

This commit corrects this by adding the component here.
---
 app/views/search/_search_field.html.erb    |  4 +++-
 spec/controllers/search_controller_spec.rb | 25 ++++++++++++++++++++--
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/app/views/search/_search_field.html.erb b/app/views/search/_search_field.html.erb
index 008a327cf..57926801f 100644
--- a/app/views/search/_search_field.html.erb
+++ b/app/views/search/_search_field.html.erb
@@ -6,12 +6,14 @@
 } %>
 <% end %>
 
-<%= render "govuk_publishing_components/components/search", {
+<%= render "govuk_publishing_components/components/#{search_component}", {
   inline_label: false,
   label_text: label_text,
   size: "large",
   id: "search-main",
   disable_corrections: true,
+  source_url: api_search_autocomplete_url(format: :json),
+  source_key: "suggestions",
 } %>
 
 <%= hidden_field_tag("filter_manual[]", params[:filter_manual]) if params[:filter_manual] %>
diff --git a/spec/controllers/search_controller_spec.rb b/spec/controllers/search_controller_spec.rb
index 69b9ce967..849c9b005 100644
--- a/spec/controllers/search_controller_spec.rb
+++ b/spec/controllers/search_controller_spec.rb
@@ -20,7 +20,7 @@
     context "when given search parameters" do
       it "redirects to the all content finder" do
         get :index, params: { q: "my search" }
-        
+
         destination = finder_path("search/all",
                                   params: { keywords: "my search", order: "relevance" })
         expect(response).to redirect_to(destination)
@@ -30,11 +30,32 @@
     context "when JSON is requested" do
       it "redirects to the all content finder" do
         get :index, format: :json
-        
+
         destination = finder_path("search/all",
                                   params: { order: "relevance", format: "json" })
         expect(response).to redirect_to(destination)
       end
     end
+
+    context "when GOVUK_DISABLE_SEARCH_AUTOCOMPLETE is not set" do
+      it "renders the search autocomplete component" do
+        ClimateControl.modify GOVUK_DISABLE_SEARCH_AUTOCOMPLETE: nil do
+          get :index
+
+          expect(response.body).to include("gem-c-search-with-autocomplete")
+        end
+      end
+    end
+
+    context "when GOVUK_DISABLE_SEARCH_AUTOCOMPLETE is set" do
+      it "renders the search component instead of the autocomplete component" do
+        ClimateControl.modify GOVUK_DISABLE_SEARCH_AUTOCOMPLETE: "1" do
+          get :index
+
+          expect(response.body).not_to include("gem-c-search-with-autocomplete")
+          expect(response.body).to include("gem-c-search")
+        end
+      end
+    end
   end
 end