blacklight 7.33.1 → 7.35.0

data/lib/blacklight/solr/request.rb

@@ -18,6 +18,8 @@ class Blacklight::Solr::Request < ActiveSupport::HashWithIndifferentAccess
   end
 
   def append_query(query)
+    return if query.nil?
+
     if self['q'] || dig(:json, :query, :bool)
       self[:json] ||= { query: { bool: { must: [] } } }
       self[:json][:query] ||= { bool: { must: [] } }

data/lib/blacklight/solr/search_builder_behavior.rb

@@ -102,8 +102,9 @@ module Blacklight::Solr
     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
 

data/lib/blacklight.rb

@@ -23,7 +23,7 @@ module Blacklight
   require 'blacklight/engine' if defined?(Rails)
 
   def self.blacklight_config_file
-    "#{::Rails.root}/config/blacklight.yml"
+    Rails.root.join("config/blacklight.yml")
   end
 
   ##

data/lib/generators/blacklight/assets_generator.rb

@@ -37,7 +37,7 @@ module Blacklight
     def appease_sprockets4
       return if !defined?(Sprockets::VERSION) || Sprockets::VERSION < '4' || using_importmap?
 
-      append_to_file 'app/assets/config/manifest.js', "\n//= link application.js"
+      append_to_file 'app/assets/config/manifest.js', "\n//= link application.js\n"
       empty_directory 'app/assets/images'
     end
 

data/lib/generators/blacklight/install_generator.rb

@@ -34,7 +34,7 @@ module Blacklight
     # Call external generator in AssetsGenerator, so we can
     # leave that callable seperately too.
     def copy_public_assets
-      generated_options = "--bootstrap-version #{options[:'bootstrap-version']}" if options[:'bootstrap-version']
+      generated_options = "--bootstrap-version='#{options[:'bootstrap-version']}'" if options[:'bootstrap-version']
 
       generate "blacklight:assets", generated_options unless options[:'skip-assets']
     end

data/lib/generators/blacklight/templates/catalog_controller.rb

@@ -15,6 +15,9 @@ class <%= controller_name.classify %>Controller < ApplicationController
     ## Model that maps search index responses to the blacklight response model
     # config.response_model = Blacklight::Solr::Response
     #
+    ## The destination for the link around the logo in the header
+    # config.logo_link = root_path
+    #
     ## Should the raw solr document endpoint (e.g. /catalog/:id/raw) be enabled
     # config.raw_endpoint.enabled = false
 
@@ -26,6 +29,7 @@ class <%= controller_name.classify %>Controller < ApplicationController
     # solr path which will be added to solr base url before the other solr params.
     #config.solr_path = 'select'
     #config.document_solr_path = 'get'
+    #config.json_solr_path = 'advanced'
 
     # items to show per page, each number in the array represent another option to choose from.
     #config.per_page = [10,20,50,100]

data/lib/generators/blacklight/templates/solr/conf/solrconfig.xml

@@ -100,6 +100,75 @@
     </arr>
   </requestHandler>
 
+  <requestHandler name="/advanced" class="solr.SearchHandler">
+    <!-- a lucene request handler for using the JSON Query DSL,
+         specifically for advanced search.
+         Using a separate requestHandler is a workaround to
+         https://issues.apache.org/jira/browse/SOLR-16916, although
+         it could be desirable for other reasons as well.
+      -->
+     <lst name="defaults">
+       <str name="defType">lucene</str>
+       <str name="echoParams">explicit</str>
+        <str name="df">title_tsim</str>
+        <str name="qf">
+          id
+          full_title_tsim
+          short_title_tsim
+          alternative_title_tsim
+          active_fedora_model_ssi
+          title_tsim
+          author_tsim
+          subject_tsim
+          all_text_timv
+        </str>
+        <str name="pf">
+          all_text_timv^10
+        </str>
+
+       <str name="author_qf">
+          author_tsim
+       </str>
+       <str name="author_pf">
+       </str>
+       <str name="title_qf">
+          title_tsim
+          full_title_tsim
+          short_title_tsim
+          alternative_title_tsim
+       </str>
+       <str name="title_pf">
+       </str>
+       <str name="subject_qf">
+          subject_tsim
+       </str>
+       <str name="subject_pf">
+       </str>
+
+       <str name="fl">
+         *,
+         score
+       </str>
+
+       <str name="facet">true</str>
+       <str name="facet.mincount">1</str>
+       <str name="facet.limit">10</str>
+       <str name="facet.field">active_fedora_model_ssi</str>
+       <str name="facet.field">subject_ssim</str>
+
+       <str name="spellcheck">true</str>
+       <str name="spellcheck.dictionary">default</str>
+       <str name="spellcheck.onlyMorePopular">true</str>
+       <str name="spellcheck.extendedResults">true</str>
+       <str name="spellcheck.collate">false</str>
+       <str name="spellcheck.count">5</str>
+
+     </lst>
+    <arr name="last-components">
+      <str>spellcheck</str>
+    </arr>
+  </requestHandler>
+
   <requestHandler name="permissions" class="solr.SearchHandler" >
     <lst name="defaults">
       <str name="facet">off</str>

data/lib/generators/blacklight/templates/solr_document.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Represent a single document returned from Solr
+# Represents a single document returned from Solr
 class <%= model_name.classify %>
   include Blacklight::Solr::Document
 

data/lib/railties/blacklight.rake

@@ -41,7 +41,7 @@ namespace :blacklight do
         exit 1
       end
     rescue => e
-      puts e.to_s
+      puts e
       exit 1
     end
 
@@ -71,7 +71,7 @@ namespace :blacklight do
         end
       rescue => e
         errors += 1
-        puts e.to_s
+        puts e
       end
 
       print " - search_results: "
@@ -93,7 +93,7 @@ namespace :blacklight do
         end
       rescue => e
         errors += 1
-        puts e.to_s
+        puts e
       end
 
       print " - fetch: "
@@ -113,7 +113,7 @@ namespace :blacklight do
         end
       rescue => e
         errors += 1
-        puts e.to_s
+        puts e
       end
 
       exit 1 if errors > 0

data/package.json

@@ -1,7 +1,7 @@
 {
   "name": "blacklight-frontend",
   "version": "7.33.1",
-  "description": "[![Build Status](https://travis-ci.com/projectblacklight/blacklight.png?branch=main)](https://travis-ci.com/projectblacklight/blacklight) [![Gem Version](https://badge.fury.io/rb/blacklight.png)](http://badge.fury.io/rb/blacklight) [![Coverage Status](https://coveralls.io/repos/github/projectblacklight/blacklight/badge.svg?branch=main)](https://coveralls.io/github/projectblacklight/blacklight?branch=main)",
+  "description": "The frontend code and styles for Blacklight",
   "main": "app/assets/javascripts/blacklight",
   "scripts": {
     "js-compile-bundle": "shx cat app/javascript/blacklight/core.js app/javascript/blacklight/autocomplete.js app/javascript/blacklight/bookmark_toggle.js app/javascript/blacklight/button_focus.js app/javascript/blacklight/checkbox_submit.js app/javascript/blacklight/facet_load.js app/javascript/blacklight/modal.js app/javascript/blacklight/search_context.js | shx sed \"s/^(import|export).*//\" | babel --filename app/javascript/blacklight/blacklight.js > app/assets/javascripts/blacklight/blacklight.js"

data/spec/components/blacklight/document_component_spec.rb

@@ -74,6 +74,10 @@ RSpec.describe Blacklight::DocumentComponent, type: :component do
   end
 
   context 'index view' do
+    before do
+      controller.action_name = "index"
+    end
+
     let(:attr) { { counter: 5 } }
 
     it 'has data properties' do
@@ -92,9 +96,12 @@ RSpec.describe Blacklight::DocumentComponent, type: :component do
     end
 
     context 'with a document rendered as part of a collection' do
-      let(:attr) { { document_counter: 10, counter_offset: 100 } }
+      # ViewComponent 3 changes iteration counters to begin at 0 rather than 1
+      let(:document_counter) { ViewComponent::VERSION::MAJOR < 3 ? 11 : 10 }
+      let(:attr) { { document_counter: document_counter, counter_offset: 100 } }
 
       it 'renders a counter with the title' do
+        # after ViewComponent 2.5, collection counter params are 1-indexed
         expect(rendered).to have_selector 'header', text: '111. Title'
       end
     end
@@ -106,13 +113,22 @@ RSpec.describe Blacklight::DocumentComponent, type: :component do
     it 'renders a thumbnail' do
       expect(rendered).to have_selector 'a[href="/catalog/x"] img[src="http://example.com/image.jpg"]'
     end
+
+    context 'with default metadata component' do
+      it 'renders metadata' do
+        expect(rendered).to have_selector 'dl.document-metadata'
+        expect(rendered).to have_selector 'dt', text: 'Title:'
+        expect(rendered).to have_selector 'dd', text: 'Title'
+        expect(rendered).not_to have_selector 'dt', text: 'ISBN:'
+      end
+    end
   end
 
   context 'show view' do
     let(:attr) { { title_component: :h1, show: true } }
 
     before do
-      allow(view_context).to receive(:action_name).and_return('show')
+      controller.action_name = "show"
     end
 
     it 'renders with an id' do
@@ -143,13 +159,46 @@ RSpec.describe Blacklight::DocumentComponent, type: :component do
       blacklight_config.show.embed_component = StubComponent
       expect(rendered).to have_content 'embed'
     end
-  end
 
-  it 'renders metadata' do
-    expect(rendered).to have_selector 'dl.document-metadata'
-    expect(rendered).to have_selector 'dt', text: 'Title:'
-    expect(rendered).to have_selector 'dd', text: 'Title'
-    expect(rendered).not_to have_selector 'dt', text: 'ISBN:'
+    context 'with configured metadata component' do
+      let(:custom_component_class) do
+        Class.new(Blacklight::DocumentMetadataComponent) do
+          # Override component rendering with our own value
+          def call
+            'blah'
+          end
+        end
+      end
+
+      before do
+        stub_const('MyMetadataComponent', custom_component_class)
+        blacklight_config.show.metadata_component = MyMetadataComponent
+      end
+
+      it 'renders custom component' do
+        expect(rendered).to have_text 'blah'
+      end
+    end
+
+    context 'with configured title component' do
+      let(:custom_component_class) do
+        Class.new(Blacklight::DocumentTitleComponent) do
+          # Override component rendering with our own value
+          def call
+            'Titleriffic'
+          end
+        end
+      end
+
+      before do
+        stub_const('MyTitleComponent', custom_component_class)
+        blacklight_config.show.title_component = MyTitleComponent
+      end
+
+      it 'renders custom component' do
+        expect(rendered).to have_text 'Titleriffic'
+      end
+    end
   end
 
   context 'with a thumbnail component' do
@@ -167,11 +216,11 @@ RSpec.describe Blacklight::DocumentComponent, type: :component do
     end
   end
 
-  context 'with before_title' do
+  context 'with before_titles' do
     let(:render) do
       component.render_in(view_context) do
-        component.title do |c|
-          c.before_title { 'Prefix!' }
+        component.with_title do |c|
+          c.with_before_title { 'Prefix!' }
         end
       end
     end

data/spec/components/blacklight/facet_component_spec.rb

@@ -51,7 +51,17 @@ RSpec.describe Blacklight::FacetComponent, type: :component do
     end
 
     before do
-      controller.view_context.view_paths.unshift(RSpec::Rails::ViewExampleGroup::StubResolverCache.resolver_for('catalog/_facet_partial.html.erb' => 'facet partial'))
+      # Not sure why we need to re-implement rspec's stub_template, but
+      # we already were, and need a Rails 7.1+ safe alternate too
+      # https://github.com/rspec/rspec-rails/commit/4d65bea0619955acb15023b9c3f57a3a53183da8
+      # https://github.com/rspec/rspec-rails/issues/2696
+
+      replace_hash = { 'catalog/_facet_partial.html.erb' => 'facet partial' }
+      if ::Rails.version.to_f >= 7.1
+        controller.prepend_view_path(RSpec::Rails::ViewExampleGroup::StubResolverCache.resolver_for(replace_hash))
+      else
+        controller.view_context.view_paths.unshift(RSpec::Rails::ViewExampleGroup::StubResolverCache.resolver_for(replace_hash))
+      end
     end
 
     it 'renders the partial' do

data/spec/components/blacklight/facet_item_pivot_component_spec.rb

@@ -33,13 +33,14 @@ RSpec.describe Blacklight::FacetItemPivotComponent, type: :component do
 
   it 'links to the facet and shows the number of hits' do
     expect(rendered).to have_selector 'li'
-    expect(rendered).to have_link 'x', href: '/catalog?f%5Bz%5D=x'
+    expect(rendered).to have_link 'x', href: nokogiri_mediated_href(facet_item.href)
     expect(rendered).to have_selector '.facet-count', text: '10'
   end
 
   it 'has the facet hierarchy' do
+    pending
     expect(rendered).to have_selector 'li ul.pivot-facet'
-    expect(rendered).to have_link 'x:1', href: /f%5Bz%5D%5B%5D=x%3A1/
+    expect(rendered).to have_link 'x:1', href: nokogiri_mediated_href(facet_item.facet_item_presenters.first.href)
   end
 
   context 'with a selected facet' do

data/spec/components/blacklight/header_component_spec.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+RSpec.describe Blacklight::HeaderComponent, type: :component do
+  before do
+    with_controller_class(CatalogController) do
+      allow(controller).to receive(:current_user).and_return(nil)
+      allow(controller).to receive(:search_action_url).and_return('/search')
+      render
+    end
+  end
+
+  context 'with no slots' do
+    let(:render) { render_inline(described_class.new(blacklight_config: CatalogController.blacklight_config)) }
+
+    it 'draws the topbar' do
+      expect(page).to have_css 'nav.topbar'
+      expect(page).to have_link 'Blacklight', href: '/'
+    end
+  end
+end

data/spec/components/blacklight/search_bar_component_spec.rb

@@ -29,7 +29,7 @@ RSpec.describe Blacklight::SearchBarComponent, type: :component do
   context 'when a button is passed in' do
     subject(:render) do
       render_inline(instance) do |c|
-        c.search_button do
+        c.with_search_button do
           controller.view_context.tag.button "hello", id: 'custom_search'
         end
       end

data/spec/controllers/blacklight/base_spec.rb

@@ -3,7 +3,7 @@
 RSpec.describe Blacklight::Base do
   subject { controller }
 
-  let(:controller) { (Class.new(ApplicationController) { include Blacklight::Base }).new }
+  let(:controller) { Deprecation.silence(described_class) { (Class.new(ApplicationController) { include Blacklight::Base }).new } }
 
   describe "#search_state" do
     subject { controller.send(:search_state) }

data/spec/features/advanced_search_spec.rb

@@ -5,9 +5,28 @@ require 'spec_helper'
 RSpec.describe "Blacklight Advanced Search Form" do
   describe "advanced search form" do
     before do
+      CatalogController.blacklight_config.search_fields['all_fields']['clause_params'] = {
+        edismax: {}
+      }
+      CatalogController.blacklight_config.search_fields['author']['clause_params'] = {
+        edismax: { qf: '${author_qf}' }
+      }
+      CatalogController.blacklight_config.search_fields['title']['clause_params'] = {
+        edismax: { qf: '${title_qf}' }
+      }
+      CatalogController.blacklight_config.search_fields['subject']['clause_params'] = {
+        edismax: { qf: '${subject_qf}' }
+      }
+      CatalogController.blacklight_config.json_solr_path = 'advanced'
       visit '/catalog/advanced?hypothetical_existing_param=true&q=ignore+this+existing+query'
     end
 
+    after do
+      %w[all_fields author title subject].each do |field|
+        CatalogController.blacklight_config.search_fields[field].delete(:clause_params)
+      end
+    end
+
     it "has field and facet blocks" do
       expect(page).to have_selector('.query-criteria')
       expect(page).to have_selector('.limit-criteria')
@@ -45,6 +64,43 @@ RSpec.describe "Blacklight Advanced Search Form" do
       click_on 'advanced-search-submit'
       expect(page).to have_content 'Remove constraint Title: Medicine'
       expect(page).to have_content 'Strong Medicine speaks'
+      expect(page).to have_selector('article.document', count: 1)
+    end
+
+    it 'can limit to facets' do
+      fill_in 'Subject', with: 'Women'
+      click_on 'Language'
+      check 'Urdu 3'
+      click_on 'advanced-search-submit'
+      expect(page).to have_content 'Pākistānī ʻaurat dorāhe par'
+      expect(page).not_to have_content 'Ajikto kŭrŏk chŏrŏk sasimnikka : and 아직도　그럭　저럭　사십니까'
+      expect(page).to have_selector('article.document', count: 1)
+    end
+
+    it 'handles boolean queries' do
+      fill_in 'All Fields', with: 'history NOT strong'
+      click_on 'advanced-search-submit'
+      expect(page).to have_content('Ci an zhou bian')
+      expect(page).not_to have_content('Strong Medicine speaks')
+      expect(page).to have_selector('article.document', count: 10)
+    end
+
+    it 'handles queries in multiple fields with the ALL operator' do
+      fill_in 'All Fields', with: 'history'
+      fill_in 'Author', with: 'hearth'
+      click_on 'advanced-search-submit'
+      expect(page).to have_content('Strong Medicine speaks')
+      expect(page).to have_selector('article.document', count: 1)
+    end
+
+    it 'handles queries in multiple fields with the ANY operator' do
+      select 'any', from: 'op'
+      fill_in 'All Fields', with: 'history'
+      fill_in 'Subject', with: 'women'
+      click_on 'advanced-search-submit'
+      expect(page).to have_content('Ci an zhou bian')
+      expect(page).to have_content('Pākistānī ʻaurat dorāhe par')
+      expect(page).to have_selector('article.document', count: 10)
     end
   end
 

data/spec/features/axe_spec.rb

@@ -21,6 +21,11 @@ RSpec.describe 'Accessibility testing', api: false, js: true do
     expect(page).to be_accessible
   end
 
+  it 'validates the advanced search form' do
+    visit advanced_search_catalog_path
+    expect(page).to be_accessible.excluding('.search-query-form')
+  end
+
   it 'validates the single results page' do
     visit solr_document_path('2007020969')
     expect(page).to be_accessible

data/spec/features/sitelinks_search_box_spec.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+RSpec.describe 'Sitelinks search box' do
+  it 'is home page' do
+    visit root_path
+    expect(page).to have_selector 'script[type="application/ld+json"]', visible: :hidden
+  end
+
+  it 'on search page' do
+    visit search_catalog_path q: 'book'
+    expect(page).not_to have_selector 'script[type="application/ld+json"]', visible: :hidden
+  end
+end

data/spec/helpers/blacklight/search_history_constraints_helper_behavior_spec.rb

@@ -25,8 +25,8 @@ RSpec.describe Blacklight::SearchHistoryConstraintsHelperBehavior do
       it "renders basic element" do
         response = helper.render_search_to_s_element("key", "value")
         expect(response).to have_selector("span.constraint") do |span|
-          expect(span).to have_selector("span.filter-name", content: "key:")
-          expect(span).to have_selector("span.filter-value", content: "value")
+          expect(span).to have_selector("span.filter-name", text: "key:")
+          expect(span).to have_selector("span.filter-values", text: "value")
         end
         expect(response).to be_html_safe
       end
@@ -34,24 +34,17 @@ RSpec.describe Blacklight::SearchHistoryConstraintsHelperBehavior do
       it "escapes them that need escaping" do
         response = helper.render_search_to_s_element("key>", "value>")
         expect(response).to have_selector("span.constraint") do |span|
-          expect(span).to have_selector("span.filter-name") do |s2|
-            # Note: nokogiri's gettext will unescape the inner html
-            # which seems to be what rspecs "contains" method calls on
-            # text nodes - thus the to_s inserted below.
-            expect(s2).to match(/key>:/)
-          end
-          expect(span).to have_selector("span.filter-value") do |s3|
-            expect(s3).to match(/value>/)
-          end
+          expect(span).to have_selector("span.filter-name", text: 'key>:')
+          expect(span).to have_selector("span.filter-values", text: 'value>')
         end
         expect(response).to be_html_safe
       end
 
-      it "does not escape with options set thus" do
-        response = helper.render_search_to_s_element("key>", "value>", escape_key: false, escape_value: false)
+      xit "does not escape with options set thus" do
+        response = helper.render_search_to_s_element("<key>", "value>", escape_key: false, escape_value: false)
         expect(response).to have_selector("span.constraint") do |span|
-          expect(span).to have_selector("span.filter-name", content: "key>:")
-          expect(span).to have_selector("span.filter-value", content: "value>")
+          expect(span).to have_selector("span.filter-name", text: "key>:")
+          expect(span).to have_selector("span.filter-values", text: "value>")
         end
         expect(response).to be_html_safe
       end

data/spec/helpers/blacklight_helper_spec.rb

@@ -331,12 +331,17 @@ RSpec.describe BlacklightHelper do
         blacklight_config.view.gallery(template: '/my/partial')
       end
 
-      def stub_template(hash)
-        view.view_paths.unshift(ActionView::FixtureResolver.new(hash))
-      end
-
       it 'renders that template' do
-        stub_template 'my/_partial.html.erb' => 'some content'
+        # Not sure why we need to re-implement rspec's stub_template, but
+        # we already were, and need a Rails 7.1+ safe alternate too
+        # https://github.com/rspec/rspec-rails/commit/4d65bea0619955acb15023b9c3f57a3a53183da8
+        # https://github.com/rspec/rspec-rails/issues/2696
+        replace_hash = { 'my/_partial.html.erb' => 'some content' }
+        if ::Rails.version.to_f >= 7.1
+          controller.prepend_view_path(RSpec::Rails::ViewExampleGroup::StubResolverCache.resolver_for(replace_hash))
+        else
+          view.view_paths.unshift(ActionView::FixtureResolver.new(replace_hash))
+        end
 
         response = helper.render_document_index_with_view :gallery, [obj1, obj1]
 

data/spec/models/blacklight/configuration_spec.rb

@@ -723,4 +723,26 @@ RSpec.describe "Blacklight::Configuration", api: true do
       expect { config.view.a = '123' }.to raise_error(FrozenError)
     end
   end
+
+  describe '.default_configuration' do
+    it 'adds additional default configuration properties' do
+      Blacklight::Configuration.default_configuration do
+        Blacklight::Configuration.default_values[:a] = '123'
+      end
+
+      Blacklight::Configuration.default_configuration do
+        Blacklight::Configuration.default_values[:b] = 'abc'
+      end
+
+      expect(Blacklight::Configuration.default_values[:a]).to eq '123'
+      expect(Blacklight::Configuration.default_values[:b]).to eq 'abc'
+    ensure
+      # reset the default configuration
+      Blacklight::Configuration.default_values.delete(:a)
+      Blacklight::Configuration.default_values.delete(:b)
+
+      Blacklight::Configuration.default_configuration.delete_at(1)
+      Blacklight::Configuration.default_configuration.delete_at(2)
+    end
+  end
 end

data/spec/models/blacklight/solr/repository_spec.rb

@@ -153,6 +153,33 @@ RSpec.describe Blacklight::Solr::Repository, api: true do
         expect(JSON.parse(actual_params[:data]).with_indifferent_access).to include(query: { bool: {} })
         expect(actual_params[:headers]).to include({ 'Content-Type' => 'application/json' })
       end
+
+      context "without a json solr path configured" do
+        before do
+          blacklight_config.json_solr_path = nil
+        end
+
+        it "uses the default solr path" do
+          blacklight_config.solr_path = 'xyz'
+          allow(subject.connection).to receive(:send_and_receive) do |path|
+            expect(path).to eq 'xyz'
+          end
+          subject.search(input_params)
+        end
+      end
+
+      context "with a json solr path configured" do
+        before do
+          blacklight_config.json_solr_path = 'my-great-json'
+        end
+
+        it "uses the configured json_solr_path" do
+          allow(subject.connection).to receive(:send_and_receive) do |path|
+            expect(path).to eq 'my-great-json'
+          end
+          subject.search(input_params)
+        end
+      end
     end
   end
 

data/spec/models/blacklight/solr/search_builder_spec.rb

@@ -191,6 +191,14 @@ RSpec.describe Blacklight::Solr::SearchBuilderBehavior, api: true do
       end
     end
 
+    describe "for a missing string search" do
+      let(:user_params) { { q: nil } }
+
+      it "does not populate the q parameter in solr parameters" do
+        expect(subject).not_to have_key :q
+      end
+    end
+
     describe "for an empty string search" do
       let(:user_params) { { q: "" } }
 
@@ -398,6 +406,14 @@ RSpec.describe Blacklight::Solr::SearchBuilderBehavior, api: true do
       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