blacklight 8.12.2 → 9.0.0.beta1

data/spec/components/blacklight/document_component_spec.rb

@@ -41,12 +41,11 @@ RSpec.describe Blacklight::DocumentComponent, type: :component do
   end
 
   it 'has some defined content areas' do
-    component.with_title { 'Title' }
-    component.with_embed('Embed')
-    component.with_metadata('Metadata')
-    component.with_thumbnail('Thumbnail')
-    component.with_actions { 'Actions' }
-    render_inline component
+    component.set_slot(:title) { 'Title' }
+    component.set_slot(:embed, nil, 'Embed')
+    component.set_slot(:metadata, nil, 'Metadata')
+    component.set_slot(:thumbnail, nil, 'Thumbnail')
+    component.set_slot(:actions) { 'Actions' }
 
     expect(rendered).to have_content 'Title'
     expect(rendered).to have_content 'Embed'
@@ -56,8 +55,7 @@ RSpec.describe Blacklight::DocumentComponent, type: :component do
   end
 
   it 'has schema.org properties' do
-    component.with_body { '-' }
-    render_inline component
+    component.set_slot(:body) { '-' }
 
     expect(rendered).to have_css 'article[@itemtype="http://schema.org/Thing"]'
     expect(rendered).to have_css 'article[@itemscope]'
@@ -65,8 +63,7 @@ RSpec.describe Blacklight::DocumentComponent, type: :component do
 
   context 'with a provided body' do
     it 'opts-out of normal component content' do
-      component.with_body { 'Body content' }
-      render_inline component
+      component.set_slot(:body) { 'Body content' }
 
       expect(rendered).to have_content 'Body content'
       expect(rendered).to have_no_css 'header'
@@ -82,8 +79,7 @@ RSpec.describe Blacklight::DocumentComponent, type: :component do
     let(:attr) { { counter: 5 } }
 
     it 'has data properties' do
-      component.with_body { '-' }
-      render_inline component
+      component.set_slot(:body) { '-' }
 
       expect(rendered).to have_css 'article[@data-document-id="x"]'
       expect(rendered).to have_css 'article[@data-document-counter="5"]'
@@ -134,8 +130,7 @@ RSpec.describe Blacklight::DocumentComponent, type: :component do
     end
 
     it 'renders with an id' do
-      component.with_body { '-' }
-      render_inline component
+      component.set_slot(:body) { '-' }
 
       expect(rendered).to have_css 'article#document'
     end

data/spec/components/blacklight/facet_field_checkboxes_component_spec.rb

@@ -32,8 +32,8 @@ RSpec.describe Blacklight::FacetFieldCheckboxesComponent, type: :component do
   let(:search_state) { Blacklight::SearchState.new(params.with_indifferent_access, Blacklight::Configuration.new) }
   let(:params) { { f: { field: ['a'] } } }
 
-  it 'renders a collapsible card' do
-    expect(rendered).to have_css '.card'
+  it 'renders an accordion item' do
+    expect(rendered).to have_css '.accordion-item'
     expect(rendered).to have_button 'Field'
     expect(rendered).to have_css 'button[data-bs-target="#facet-field"]'
     expect(rendered).to have_css '#facet-field.collapse.show'

data/spec/components/blacklight/facet_field_list_component_spec.rb

@@ -30,8 +30,8 @@ RSpec.describe Blacklight::FacetFieldListComponent, type: :component do
                     ])
   end
 
-  it 'renders a collapsible card' do
-    expect(rendered).to have_css '.card'
+  it 'renders an accordion item' do
+    expect(rendered).to have_css '.accordion-item'
     expect(rendered).to have_button 'Field'
     expect(rendered).to have_css 'button[data-bs-target="#facet-field"]'
     expect(rendered).to have_css '#facet-field.collapse.show'

data/spec/components/blacklight/search/facet_suggest_input_spec.rb

@@ -3,13 +3,11 @@
 require 'spec_helper'
 
 RSpec.describe Blacklight::Search::FacetSuggestInput, type: :component do
-  let(:facet) { Blacklight::Configuration::FacetField.new key: 'language_facet', suggest: true }
+  let(:facet) { Blacklight::Configuration::FacetField.new key: 'language_facet' }
   let(:presenter) { instance_double(Blacklight::FacetFieldPresenter) }
-  let(:view_context) { double(ActionView::Base) }
 
   before do
-    allow(presenter).to receive_messages(label: 'Language', view_context: view_context)
-    allow(view_context).to receive(:search_facet_path).and_return('/catalog/facet/language_facet')
+    allow(presenter).to receive(:label).and_return 'Language'
   end
 
   it 'has an input with the facet-suggest class, which the javascript needs to find it' do
@@ -22,36 +20,14 @@ RSpec.describe Blacklight::Search::FacetSuggestInput, type: :component do
     expect(rendered.css('input[data-facet-field="language_facet"]').count).to eq 1
   end
 
-  it 'has an input with the data-facet-search-context attribute, which the javascript needs to determine the current search context' do
-    allow(view_context).to receive(:search_facet_path).and_return('/catalog/facet/language_facet?f%5Bformat%5D%5B%5D=Book&facet.prefix=R&facet.sort=index&q=tibet&search_field=all_fields')
-    rendered = render_inline(described_class.new(facet: facet, presenter: presenter))
-    expect(rendered.css('input[data-facet-search-context="/catalog/facet/language_facet?f%5Bformat%5D%5B%5D=Book&facet.prefix=R&facet.sort=index&q=tibet&search_field=all_fields"]').count).to eq 1
-  end
-
   it 'has a visible label that is associated with the input' do
     rendered = render_inline(described_class.new(facet: facet, presenter: presenter))
     label = rendered.css('label').first
     expect(label.text.strip).to eq 'Filter Language'
 
     id_in_label_for = label.attribute('for').text
-    expect(id_in_label_for).to eq('facet_suggest_language_facet')
+    expect(id_in_label_for).to eq('facet-suggest-language_facet')
 
     expect(rendered.css('input').first.attribute('id').text).to eq id_in_label_for
   end
-
-  context 'when the facet is explicitly configured to suggest: false' do
-    let(:facet) { Blacklight::Configuration::FacetField.new key: 'language_facet', suggest: false }
-
-    it 'does not display' do
-      expect(render_inline(described_class.new(facet: facet, presenter: presenter)).to_s).to eq ''
-    end
-  end
-
-  context 'when the facet is not explicitly configured with a suggest key' do
-    let(:facet) { Blacklight::Configuration::FacetField.new key: 'language_facet' }
-
-    it 'does not display' do
-      expect(render_inline(described_class.new(facet: facet, presenter: presenter)).to_s).to eq ''
-    end
-  end
 end

data/spec/components/blacklight/search_bar_component_spec.rb

@@ -85,7 +85,7 @@ RSpec.describe Blacklight::SearchBarComponent, type: :component do
     subject(:render) { render_inline(instance) }
 
     it 'sets the rounded border class' do
-      expect(render.css('.rounded-left.rounded-start')).to be_present
+      expect(render.css('.rounded-start')).to be_present
     end
   end
 

data/spec/controllers/blacklight/catalog_spec.rb

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

data/spec/controllers/catalog_controller_spec.rb

@@ -803,7 +803,7 @@ RSpec.describe CatalogController, :api do
     end
 
     it "is empty for empty result sets", :integration do
-      get :page_links, params: { f: { "format" => ['empty-result-set'] }, counter: 1 }
+      get :page_links, params: { f: { "format" => 'empty-result-set' }, counter: 1 }
       expect(assigns(:page_link_data)).to be_empty
     end
   end

data/spec/features/axe_spec.rb

@@ -3,7 +3,7 @@
 RSpec.describe 'Accessibility testing', :js, api: false do
   it 'validates the home page' do
     visit root_path
-    expect(page).to be_accessible
+    expect(page).to be_axe_clean
   end
 
   it 'validates the catalog page' do
@@ -11,28 +11,23 @@ RSpec.describe 'Accessibility testing', :js, api: false do
     fill_in "q", with: 'history'
     click_on 'search'
 
-    expect(page).to be_accessible
+    expect(page).to be_axe_clean
 
-    within '.card.blacklight-language_ssim' do
+    within '.accordion-item.blacklight-language_ssim' do
       click_on 'Language'
       click_on "Tibetan"
     end
 
-    expect(page).to be_accessible
+    expect(page).to be_axe_clean
   end
 
   it 'validates the advanced search form' do
     visit advanced_search_catalog_path
-    expect(page).to be_accessible
+    expect(page).to be_axe_clean
   end
 
   it 'validates the single results page' do
     visit solr_document_path('2007020969')
-    expect(page).to be_accessible
-  end
-
-  def be_accessible(skipping: [])
-    # typeahead does funny things with the search bar
-    be_axe_clean.excluding('.tt-hint').skipping(skipping + [('color-contrast' if defined?(Bootstrap) && Bootstrap::VERSION < '5')].compact)
+    expect(page).to be_axe_clean
   end
 end

data/spec/features/bookmarks_spec.rb

@@ -1,6 +1,11 @@
 # frozen_string_literal: true
 
 RSpec.describe "Bookmarks" do
+  before do
+    # Prevent any existing bookmarks from interfering
+    Bookmark.delete_all
+  end
+
   describe "navigating from the homepage" do
     it "has a link to the history page" do
       sign_in 'user1'
@@ -40,13 +45,25 @@ RSpec.describe "Bookmarks" do
     expect(page).to have_content 'Successfully removed bookmark.'
   end
 
-  it 'shows bookmarks as checkboxes', :js do
-    visit solr_document_path('2007020969')
-    check 'Bookmark'
+  context 'when bookmark_icon_component is set to nil' do
+    let!(:default_bookmark_icon_component) { CatalogController.blacklight_config.bookmark_icon_component }
 
-    visit solr_document_path('2007020969')
-    expect(page).to have_css('input[type="checkbox"][checked]')
-    uncheck 'In Bookmarks'
+    before do
+      CatalogController.blacklight_config.bookmark_icon_component = nil
+    end
+
+    after do
+      CatalogController.blacklight_config.bookmark_icon_component = default_bookmark_icon_component
+    end
+
+    it 'shows bookmarks as checkboxes', :js do
+      visit solr_document_path('2007020969')
+      check 'Bookmark'
+
+      visit solr_document_path('2007020969')
+      expect(page).to have_css('input[type="checkbox"][checked]')
+      uncheck 'In Bookmarks'
+    end
   end
 
   it "adds bookmarks after a user logs in" do
@@ -82,17 +99,37 @@ RSpec.describe "Bookmarks" do
     expect(page).to have_content 'Ci an zhou bian'
   end
 
-  context "has bookmark icon" do
+  context "when the bookmark icon is configured (default)" do
+    it 'shows bookmark icon', :js do
+      visit solr_document_path('2007020969')
+      expect(page).to have_css('.blacklight-icons-bookmark')
+      find('.blacklight-icons-bookmark').click
+
+      expect(find('.toggle-bookmark-input', visible: false)).to be_checked
+      find('.blacklight-icons-bookmark').click
+    end
+  end
+
+  context "without bookmark navbar element" do
+    let!(:default_nav_partials) { CatalogController.blacklight_config.navbar.partials }
+
     before do
-      CatalogController.blacklight_config.bookmark_icon_component = Blacklight::Icons::BookmarkIconComponent
+      CatalogController.blacklight_config.navbar.partials = CatalogController.blacklight_config.navbar.partials.except(:bookmark)
+    end
+
+    after do
+      CatalogController.blacklight_config.navbar.partials = default_nav_partials
     end
 
-    it 'shows bookmark icon instead of checkbox', :js do
+    it 'adds and removes bookmarks', :js do
       visit solr_document_path('2007020969')
-      expect(page).to have_css('.blacklight-icons-bookmark')
+      expect(page).to have_no_css('#bookmarks_nav')
       find('.blacklight-icons-bookmark').click
 
-      expect(find('.toggle-bookmark[type="checkbox"]', visible: false)).to be_checked
+      expect(page).to have_content 'In Bookmarks'
+
+      visit solr_document_path('2007020969')
+      expect(find('.toggle-bookmark-input', visible: false)).to be_checked
       find('.blacklight-icons-bookmark').click
     end
   end

data/spec/features/facets_spec.rb

@@ -99,103 +99,35 @@ RSpec.describe "Facets" do
     end
   end
 
-  describe 'Facet modal content' do
-    context 'when facet is configured with suggest: true' do
-      # BL8: turn on the suggest feature for testing (off by default)
-      before do
-        CatalogController.blacklight_config.facet_fields[:subject_ssim].suggest = true
-      end
-
-      after do
-        CatalogController.blacklight_config.facet_fields[:subject_ssim].delete(:suggest)
-      end
-
-      it 'allows the user to filter a long list of facet values', :js do
-        visit '/catalog/facet/subject_ssim'
-        expect(page).to have_no_link 'Old age' # This is on the second page of facet values
-        expect(page).to have_css 'a.facet-select', count: 20
-
-        fill_in 'facet_suggest_subject_ssim', with: "ag"
-
-        expect(page).to have_css '.facet-suggestions'
-        expect(page).to have_link 'Old age'
-        expect(page).to have_css 'a.facet-select', count: 2
-      end
-
-      it 'shows the user facet suggestions that are relevant to their q param', :js do
-        visit '/catalog/facet/subject_ssim?q=tibet&search_field=all_fields'
-        fill_in 'facet_suggest_subject_ssim', with: 'la'
-
-        expect(page).to have_css '.facet-suggestions'
-        expect(page).to have_link 'Tibetan language'
-        expect(page).to have_no_link 'Law'
-        expect(page).to have_css 'a.facet-select', count: 1
-      end
-
-      it 'allows the user to toggle the sort, then filter', :js do
-        visit '/catalog/facet/subject_ssim'
-
-        fill_in 'facet_suggest_subject_ssim', with: 'po'
-
-        expect(page).to have_css '.facet-suggestions'
-        expect(page).to have_css('.facet-values li:nth-child(1)', text: 'Political plays, Japanese')
-        expect(page).to have_css('.facet-values li:nth-child(2)', text: 'Military weapons')
-        expect(page).to have_css('.facet-values li:nth-child(3)', text: 'Political science')
-
-        first(:link, 'A-Z Sort').click
-
-        expect(page).to have_css('.facet-suggest[data-facet-search-context*="facet.sort=index"]')
+  describe 'Facet modal' do
+    it 'allows the user to filter a long list of facet values', :js do
+      visit '/catalog/facet/subject_ssim'
+      expect(page).to have_no_link 'Old age' # This is on the second page of facet values
+      expect(page).to have_css 'a.facet-select', count: 20
 
-        fill_in 'facet_suggest_subject_ssim', with: 'po'
+      fill_in 'facet_suggest_subject_ssim', with: "ag"
 
-        expect(page).to have_css '.facet-suggestions'
-        expect(page).to have_css('.facet-values li:nth-child(1)', text: 'Military weapons')
-        expect(page).to have_css('.facet-values li:nth-child(2)', text: 'Political plays, Japanese')
-        expect(page).to have_css('.facet-values li:nth-child(3)', text: 'Political science')
-      end
-
-      it 'allows the user to choose a starting letter, then filter', :js do
-        visit '/catalog/facet/subject_ssim'
-
-        first(:link, 'A-Z Sort').click
-        expect(page).to have_css('.facet-suggest[data-facet-search-context*="facet.sort=index"]')
-
-        click_on 'M'
-        expect(page).to have_css('.facet-suggest[data-facet-search-context*="facet.prefix=M"]')
-
-        fill_in 'facet_suggest_subject_ssim', with: 'te'
-
-        expect(page).to have_css '.facet-suggestions'
-        expect(page).to have_link 'Maternity insurance'
-        expect(page).to have_no_link 'Teaching'
-      end
-
-      it 'hides previous/next links when filtering', :js do
-        visit '/catalog/facet/subject_ssim'
-        expect(page).to have_link 'Next »'
+      expect(page).to have_link 'Old age'
+      expect(page).to have_css 'a.facet-select', count: 2
+    end
 
-        fill_in 'facet_suggest_subject_ssim', with: 'te'
-        expect(page).to have_css '.facet-suggestions'
-        expect(page).to have_no_link 'Next »'
+    it 'shows the user facet suggestions that are relevant to their q param', :js do
+      visit '/catalog/facet/subject_ssim?q=tibet&search_field=all_fields'
+      fill_in 'facet_suggest_subject_ssim', with: 'la'
 
-        fill_in 'facet_suggest_subject_ssim', with: ''
-        expect(page).to have_no_css '.facet-suggestions'
-        expect(page).to have_link 'Next »'
-      end
+      expect(page).to have_link 'Tibetan language'
+      expect(page).to have_css 'a.facet-select', count: 1
     end
 
-    context 'when facet is NOT configured with suggest: true' do
-      it 'does not offer the user a way to filter the list of facet values' do
-        visit '/catalog/facet/subject_ssim'
-        expect(page).to have_no_field 'facet_suggest_subject_ssim'
-      end
-    end
-  end
+    it 'allows the user to filter more than once', :js do
+      visit '/catalog/facet/subject_ssim'
+      expect(page).to have_no_link 'Old age' # This is on the second page of facet values
+      expect(page).to have_css 'a.facet-select', count: 20
+
+      fill_in 'facet_suggest_subject_ssim', with: "ag"
 
-  describe 'facebook-style facet parameters' do
-    it 'can perform a search' do
-      visit '/?f[subject_ssim][0]=Iran.+Viza%CC%84rat-i+Kishvar'
-      expect(page).to have_text 'Naqdī barā-yi tamām-i fuṣūl'
+      expect(page).to have_link 'Old age'
+      expect(page).to have_link('Old age', href: '/?f%5Bsubject_ssim%5D%5B%5D=Old+age')
     end
   end
 end

data/spec/features/search_context_spec.rb

@@ -47,10 +47,9 @@ RSpec.describe "Search Results context" do
       search_for ''
       expect(page).to have_content "1 - 10"
       find_all('.index_title a').last.click
-      expect(page).to have_css "h1", text: "Pluvial nectar"
       click_on "Next »"
 
-      expect(page).to have_css "h1", text: "Naqdī barā-yi tamām-i"
+      expect(page).to have_content "Naqdī barā-yi tamām-i"
       click_on "Back to Search"
       expect(page).to have_content "11 - 20"
     end

data/spec/features/search_filters_spec.rb

@@ -171,7 +171,7 @@ RSpec.describe "Facets" do
     visit root_path
 
     within(".blacklight-subject_ssim") do
-      expect(page).to have_no_css(".card-body", visible: true)
+      expect(page).to have_no_css(".accordion-body", visible: true)
     end
   end
 
@@ -179,9 +179,9 @@ RSpec.describe "Facets" do
     visit root_path
 
     within(".blacklight-subject_ssim") do
-      expect(page).to have_no_css(".card-body", visible: true)
+      expect(page).to have_no_css(".accordion-body", visible: true)
       click_on 'Topic'
-      expect(page).to have_css(".card-body", visible: true)
+      expect(page).to have_css(".accordion-body", visible: true)
     end
   end
 
@@ -189,9 +189,9 @@ RSpec.describe "Facets" do
     visit root_path
 
     within(".blacklight-subject_ssim") do
-      expect(page).to have_no_css(".card-body", visible: true)
-      find(".card-header").click
-      expect(page).to have_css(".card-body", visible: true)
+      expect(page).to have_no_css(".accordion-body", visible: true)
+      find(".accordion-header").click
+      expect(page).to have_css(".accordion-body", visible: true)
     end
   end
 

data/spec/helpers/blacklight/configuration_helper_behavior_spec.rb

@@ -93,15 +93,6 @@ RSpec.describe Blacklight::ConfigurationHelperBehavior do
     end
   end
 
-  describe "#per_page_options_for_select" do
-    it "is the per-page values formatted as options_for_select" do
-      allow(helper).to receive_messages(blacklight_config: double(per_page: [11, 22, 33]))
-      expect(helper.per_page_options_for_select).to include ["11<span class=\"sr-only visually-hidden\"> per page</span>", 11]
-      expect(helper.per_page_options_for_select).to include ["22<span class=\"sr-only visually-hidden\"> per page</span>", 22]
-      expect(helper.per_page_options_for_select).to include ["33<span class=\"sr-only visually-hidden\"> per page</span>", 33]
-    end
-  end
-
   describe "#should_render_field?" do
     let(:field_config) { double('field config', if: true, unless: false) }
 

data/spec/helpers/blacklight/render_partials_helper_behavior_spec.rb

@@ -31,7 +31,7 @@ RSpec.describe Blacklight::RenderPartialsHelperBehavior do
     end
   end
 
-  describe "#render_document_partials" do
+  describe "#render_document_partial" do
     let(:doc) { double }
 
     before do

data/spec/lib/blacklight/parameters_spec.rb

@@ -52,7 +52,7 @@ RSpec.describe Blacklight::Parameters do
     let(:search_state) { Blacklight::SearchState.new(query_params, blacklight_config) }
     let(:blacklight_config) { Blacklight::Configuration.new }
 
-    context 'with facebook\'s badly mangled query parameters' do
+    context 'with facebooks badly mangled query parameters' do
       let(:query_params) do
         ActionController::Parameters.new(
           f: { field: { '0': 'first', '1': 'second' } },
@@ -67,17 +67,6 @@ RSpec.describe Blacklight::Parameters do
       it 'normalizes the facets to the expected format' do
         expect(params.permit_search_params.to_h.with_indifferent_access).to include f: { field: %w[first second] }, f_inclusive: { field: %w[first second] }
       end
-
-      context 'when several fields are configured' do
-        before do
-          blacklight_config.add_facet_field 'other_field'
-          blacklight_config.add_facet_field 'some_other_pivot_field', pivot: %w[abc def]
-        end
-
-        it 'normalizes the facets to the expected format' do
-          expect(params.permit_search_params.to_h.with_indifferent_access).to include f: { field: %w[first second] }, f_inclusive: { field: %w[first second] }
-        end
-      end
     end
 
     context 'with filter_search_state_fields set to false' do

data/spec/lib/blacklight/search_state/filter_field_spec.rb

@@ -198,22 +198,4 @@ RSpec.describe Blacklight::SearchState::FilterField do
       expect(search_state.filter('some_field').include?(OpenStruct.new(value: '1'))).to be true
     end
   end
-
-  describe '#permitted_params' do
-    context 'with a pivot facet' do
-      let(:blacklight_config) do
-        Blacklight::Configuration.new.configure do |config|
-          config.add_facet_field 'my_pivot', pivot: %w[format language_ssim]
-        end
-      end
-
-      it 'marks all the pivot fields as permitted' do
-        field = described_class.new blacklight_config.facet_fields['my_pivot'], search_state
-        expect(field.permitted_params).to eq({
-                                               f: { "-format" => [], "-language_ssim" => [], "format" => [], "language_ssim" => [] },
-                                               f_inclusive: { "format" => [], "language_ssim" => [] }
-                                             })
-      end
-    end
-  end
 end

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

@@ -64,5 +64,12 @@ RSpec.describe Blacklight::Solr::Request, :api do
 
       expect(subject.dig('json', 'query', 'bool', 'must')).to contain_exactly('some query', 'also required')
     end
+
+    it 'filters out empty query' do
+      subject['q'] = ""
+      subject.append_boolean_query :must, 'present query'
+
+      expect(subject.dig('json', 'query', 'bool', 'must')).to contain_exactly('present query')
+    end
   end
 end

data/spec/services/blacklight/search_service_spec.rb

@@ -59,7 +59,7 @@ RSpec.describe Blacklight::SearchService, :api do
         allow(blacklight_config).to receive(:default_solr_params).and_return(qt: 'custom_request_handler')
         allow(blacklight_solr).to receive(:send_and_receive) do |path, params|
           expect(path).to eq 'select'
-          expect(params[:params]['facet.field']).to contain_exactly "format", "{!ex=pub_date_ssim_single}pub_date_ssim", "subject_ssim", "language_ssim", "lc_1letter_ssim", "subject_geo_ssim", "subject_era_ssim"
+          expect(params[:params]['facet.field']).to eq ["format", "{!ex=pub_date_ssim_single}pub_date_ssim", "subject_ssim", "language_ssim", "lc_1letter_ssim", "subject_geo_ssim", "subject_era_ssim"]
           expect(params[:params]["facet.query"]).to eq ["pub_date_ssim:[#{5.years.ago.year} TO *]", "pub_date_ssim:[#{10.years.ago.year} TO *]", "pub_date_ssim:[#{25.years.ago.year} TO *]"]
           expect(params[:params]).to include('rows' => 10, 'qt' => "custom_request_handler", 'q' => "", "f.subject_ssim.facet.limit" => 21, 'sort' => "score desc, pub_date_si desc, title_si asc")
         end.and_return('response' => { 'docs' => [] })

data/spec/support/presenter_test_helpers.rb

@@ -2,7 +2,7 @@
 
 module PresenterTestHelpers
   def controller
-    @controller ||= ApplicationController.new.tap { |c| c.request = request }.extend(Rails.application.routes.url_helpers)
+    @controller ||= ViewComponent::Base.test_controller.constantize.new.tap { |c| c.request = request }.extend(Rails.application.routes.url_helpers)
   end
 
   def request

data/spec/views/catalog/_facet_layout.html.erb_spec.rb

@@ -28,14 +28,14 @@ RSpec.describe "catalog/facet_layout" do
   it "is collapsable" do
     render partial: 'catalog/facet_layout', locals: { facet_field: facet_field }
     expect(rendered).to have_css 'button.collapsed[data-toggle="collapse"][data-bs-toggle="collapse"][aria-expanded="false"]'
-    expect(rendered).to have_css '.collapse .card-body'
+    expect(rendered).to have_css '.collapse .accordion-body'
   end
 
   it "is configured to be open by default" do
     allow(facet_field).to receive_messages(collapse: false)
     render partial: 'catalog/facet_layout', locals: { facet_field: facet_field }
     expect(rendered).to have_css 'button[data-toggle="collapse"][data-bs-toggle="collapse"][aria-expanded="true"]'
-    expect(rendered).to have_no_css '.card-header.collapsed'
-    expect(rendered).to have_css '.collapse.show .card-body'
+    expect(rendered).to have_no_css '.accordion-header.collapsed'
+    expect(rendered).to have_css '.collapse.show .accordion-body'
   end
 end

data/spec/views/catalog/facet.html.erb_spec.rb

@@ -4,14 +4,11 @@ RSpec.describe 'catalog/facet.html.erb' do
   let(:display_facet) { double }
   let(:blacklight_config) { Blacklight::Configuration.new }
   let(:component) { instance_double(Blacklight::FacetComponent) }
-  let(:facet_suggest_input) { instance_double(Blacklight::Search::FacetSuggestInput) }
 
   before do
     allow(Blacklight::FacetComponent).to receive(:new).and_return(component)
-    allow(Blacklight::Search::FacetSuggestInput).to receive(:new).and_return(facet_suggest_input)
     allow(view).to receive(:render).and_call_original
     allow(view).to receive(:render).with(component)
-    allow(view).to receive(:render).with(facet_suggest_input)
 
     blacklight_config.add_facet_field 'xyz', label: "Facet title"
     allow(view).to receive(:blacklight_config).and_return(blacklight_config)
@@ -25,11 +22,6 @@ RSpec.describe 'catalog/facet.html.erb' do
     expect(rendered).to have_css 'h1', text: "Facet title"
   end
 
-  it "renders the facet suggest input" do
-    render
-    expect(view).to have_received(:render).with(facet_suggest_input)
-  end
-
   it "renders facet pagination" do
     render
     expect(rendered).to have_content 'pagination'

data/spec/views/catalog/index.atom.builder_spec.rb

@@ -93,8 +93,6 @@ RSpec.describe "catalog/index" do
     context 'with a custom template' do
       before do
         my_template = Class.new(ViewComponent::Base) do
-          def initialize(**); end
-
           def call
             'whatever content'.html_safe
           end