I3048 backport nil json param

lib/blacklight/solr/search_builder_behavior.rb

@@ -102,8 +102,9 @@ def add_additional_filters(solr_parameters, additional_filters = nil)
     end
 
     def add_search_field_with_json_query_parameters(solr_parameters)
-      bool_query = search_field.clause_params.transform_values { |v| v.merge(query: search_state.query_param) }
+      return unless search_state.query_param
 
+      bool_query = search_field.clause_params.transform_values { |v| v.merge(query: search_state.query_param) }
       solr_parameters.append_boolean_query(:must, bool_query)
     end
 

spec/models/blacklight/solr/search_builder_spec.rb

@@ -406,6 +406,14 @@
       it 'includes addtional clause parameters for the field' do
         expect(subject.dig(:json, :query, :bool, :must, 0, :edismax)).to include another: :parameter
       end
+
+      context 'with an empty search' do
+        let(:subject_search_params) { { commit: "search", search_field: "subject", action: "index", controller: "catalog", rows: "10", q: nil } }
+
+        it 'does not add nil query value clauses to json query' do
+          expect(subject).not_to have_key :json
+        end
+      end
     end
 
     describe "overriding of qt parameter" do

spec/spec_helper.rb

@@ -27,13 +27,13 @@
 
 Capybara.register_driver :headless_chrome do |app|
   Capybara::Selenium::Driver.load_selenium
-  capabilities = ::Selenium::WebDriver::Chrome::Options.new.tap do |opts|
+  options = ::Selenium::WebDriver::Chrome::Options.new.tap do |opts|
     opts.args << '--headless'
     opts.args << '--disable-gpu'
     opts.args << '--no-sandbox'
     opts.args << '--window-size=1280,1696'
   end
-  Capybara::Selenium::Driver.new(app, browser: :chrome, capabilities: capabilities)
+  Capybara::Selenium::Driver.new(app, browser: :chrome, options: options)
 end
 
 # Requires supporting ruby files with custom matchers and macros, etc,