Merge pull request #70 from mattrayner/master

[HOTFIX] Add search_action to SearchFormComponents serialiser

app/serializers/component_serializer/search_form_component_serializer.rb

@@ -5,16 +5,18 @@ class SearchFormComponentSerializer < ComponentSerializer::BaseComponentSerializ
     # @param [String] query string to passed in as the value attribute of the input element.
     # @param [Array<Object>] components components that are intended to be part of the search form.
     # @param [Boolean] global a boolean to determine if the global tags are added in te dust file.
+    # @param [String] search_action a path which is used as the action parameter on the search form.
     #
     # @example Initialising a search form component
     #  query_nil_unless_rendering_results_page = nil
     #  an_icon_componet = ComponentSerializer::SearchIconComponentSerializer.new().to_h
     #  nil_unless_search_used_in_header = nil
     #  ComponentSerializer::SearchFormComponentSerializer.new(query: query_nil_unless_rendering_results_page, components: [an_icon_componet], global: nil_unless_search_used_in_header).to_h
-    def initialize(query: nil, components: nil, global: nil)
+    def initialize(query: nil, components: nil, global: nil, search_action: nil)
       @query = query
       @components = components
       @global = global
+      @search_action = search_action
     end
 
     private
@@ -29,6 +31,7 @@ def data
         hash[:global] = @global if @global
         hash[:label] = 'search.label'
         hash[:components] = @components
+        hash['search-action'] = @search_action if @search_action
       end
     end
   end

app/serializers/partial_serializer/header_components_partial_serializer.rb

@@ -73,7 +73,7 @@ def header_link
     end
 
     def header_search
-      ComponentSerializer::SearchFormComponentSerializer.new(components: [ComponentSerializer::SearchIconComponentSerializer.new.to_h], global: true).to_h
+      ComponentSerializer::SearchFormComponentSerializer.new(components: [ComponentSerializer::SearchIconComponentSerializer.new.to_h], global: true, search_action: search_path).to_h
     end
 
     def header_display_data

spec/fixtures/controllers/home_controller/index/fixture.yml

@@ -62,6 +62,7 @@ header-components:
         components:
         - name: icon__search
           data: search.search-icon
+        search-action: "/search"
 main-components:
 - name: hero
   data:

spec/fixtures/controllers/proposed_negative_statutory_instruments_controller/index/fixture.yml

@@ -85,6 +85,7 @@ header-components:
         components:
         - name: icon__search
           data: search.search-icon
+        search-action: "/search"
 main-components:
 - name: section__primary
   data:

spec/fixtures/controllers/proposed_negative_statutory_instruments_controller/show/fixture.yml

@@ -85,6 +85,7 @@ header-components:
         components:
         - name: icon__search
           data: search.search-icon
+        search-action: "/search"
 main-components:
 - name: section__primary
   data:

spec/fixtures/controllers/statutory_instruments_controller/index/fixture.yml

@@ -85,6 +85,7 @@ header-components:
         components:
         - name: icon__search
           data: search.search-icon
+        search-action: "/search"
 main-components:
 - name: section__primary
   data:

spec/fixtures/controllers/statutory_instruments_controller/show/fixture.yml

@@ -85,6 +85,7 @@ header-components:
         components:
         - name: icon__search
           data: search.search-icon
+        search-action: "/search"
 main-components:
 - name: section__primary
   data:

spec/fixtures/serializers/component_serializer/search_form_component_serializer/with_search_action.yml

@@ -0,0 +1,8 @@
+---
+name: form__search
+data:
+  value: query
+  label: search.label
+  components:
+  - 1
+  search-action: "/foo/search"

spec/fixtures/serializers/page_serializer/home_page_serializer/fixture.yml

@@ -62,6 +62,7 @@ header-components:
         components:
         - name: icon__search
           data: search.search-icon
+        search-action: "/search"
 main-components:
 - name: hero
   data:

spec/fixtures/serializers/page_serializer/laid_thing_show_page_serializer/fixture.yml

@@ -70,6 +70,7 @@ header-components:
         components:
         - name: icon__search
           data: search.search-icon
+        search-action: "/search"
 main-components: 
 footer-components:
 - name: footer

spec/fixtures/serializers/page_serializer/laid_thing_show_page_serializer/laid_thing_missing_data.yml

@@ -70,6 +70,7 @@ header-components:
         components:
         - name: icon__search
           data: search.search-icon
+        search-action: "/search"
 main-components: 
 footer-components:
 - name: footer

spec/fixtures/serializers/page_serializer/proposed_negative_statutory_instruments_index_page_serializer/fixture.yml

@@ -70,6 +70,7 @@ header-components:
         components:
         - name: icon__search
           data: search.search-icon
+        search-action: "/search"
 main-components:
 - name: section__primary
   data:

spec/fixtures/serializers/page_serializer/proposed_negative_statutory_instruments_show_page_serializer/fixture.yml

@@ -70,6 +70,7 @@ header-components:
         components:
         - name: icon__search
           data: search.search-icon
+        search-action: "/search"
 main-components:
 - name: section__primary
   data:

spec/fixtures/serializers/page_serializer/proposed_negative_statutory_instruments_show_page_serializer/si_missing_data.yml

@@ -70,6 +70,7 @@ header-components:
         components:
         - name: icon__search
           data: search.search-icon
+        search-action: "/search"
 main-components:
 - name: section__primary
   data:

spec/fixtures/serializers/page_serializer/statutory_instruments_index_page_serializer/fixture.yml

@@ -70,6 +70,7 @@ header-components:
         components:
         - name: icon__search
           data: search.search-icon
+        search-action: "/search"
 main-components:
 - name: section__primary
   data:

spec/fixtures/serializers/page_serializer/statutory_instruments_show_page_serializer/fixture.yml

@@ -70,6 +70,7 @@ header-components:
         components:
         - name: icon__search
           data: search.search-icon
+        search-action: "/search"
 main-components:
 - name: section__primary
   data:

spec/fixtures/serializers/page_serializer/statutory_instruments_show_page_serializer/si_missing_data.yml

@@ -70,6 +70,7 @@ header-components:
         components:
         - name: icon__search
           data: search.search-icon
+        search-action: "/search"
 main-components:
 - name: section__primary
   data:

spec/fixtures/serializers/partial_serializer/header_components_partial_serializer/fixture.yml

@@ -57,3 +57,4 @@
         components:
         - name: icon__search
           data: search.search-icon
+        search-action: "/search"

spec/serializers/component_serializer/search_form_component_serializer_spec.rb

@@ -26,5 +26,14 @@
       expect(serializer.to_yaml).to eq expected
     end
 
+    context 'with a search_action passed' do
+      it 'returns the expected JSON' do
+        serializer = described_class.new(query: 'query', components: [1], search_action: '/foo/search')
+
+        expected = get_fixture('with_search_action')
+
+        expect(serializer.to_yaml).to eq expected
+      end
+    end
   end
 end