blacklight 7.19.0 → 7.20.1

data/lib/generators/blacklight/assets_generator.rb

@@ -3,9 +3,11 @@ module Blacklight
   class Assets < Rails::Generators::Base
     source_root File.expand_path('../templates', __FILE__)
 
+    class_option :'bootstrap-version', type: :string, default: ENV.fetch('BOOTSTRAP_VERSION', '~> 4.0'), desc: "Set the generated app's bootstrap version"
+
     # This could be skipped if you want to use webpacker
     def add_javascript_dependencies
-      gem 'bootstrap', '~> 4.0'
+      gem 'bootstrap', options[:'bootstrap-version']
       gem 'twitter-typeahead-rails', '0.11.1.pre.corejavascript'
     end
 
@@ -15,7 +17,7 @@ module Blacklight
 
       create_file 'app/assets/javascripts/application.js' do
         <<~CONTENT
-          //= require jquery
+          //= require jquery3
           //= require rails-ujs
           //= require turbolinks
         CONTENT

data/lib/generators/blacklight/install_generator.rb

@@ -10,6 +10,7 @@ module Blacklight
 
     class_option :devise, type: :boolean, default: false, aliases: "-d", desc: "Use Devise as authentication logic."
     class_option :marc, type: :boolean, default: false, aliases: "-m", desc: "Generate MARC-based demo."
+    class_option :'bootstrap-version', type: :string, default: nil, desc: "Set the generated app's bootstrap version"
     class_option :'skip-assets', type: :boolean, default: !defined?(Sprockets), desc: "Skip generating javascript and css assets into the application"
     class_option :'skip-solr', type: :boolean, default: false, desc: "Skip generating solr configurations."
 
@@ -33,7 +34,9 @@ module Blacklight
     # Call external generator in AssetsGenerator, so we can
     # leave that callable seperately too.
     def copy_public_assets
-      generate "blacklight:assets" unless options[:'skip-assets']
+      generated_options = "--bootstrap-version #{options[:'bootstrap-version']}" if options[:'bootstrap-version']
+
+      generate "blacklight:assets", generated_options unless options[:'skip-assets']
     end
 
     def bundle_install

data/lib/generators/blacklight/user_generator.rb

@@ -22,7 +22,7 @@ module Blacklight
       return unless options[:devise]
 
       gem "devise"
-      gem "devise-guests", "~> 0.6"
+      gem "devise-guests", "~> 0.8"
 
       inside destination_root do
         Bundler.with_clean_env do

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "blacklight-frontend",
-  "version": "7.10.0",
+  "version": "7.20.1",
   "description": "[![Build Status](https://travis-ci.com/projectblacklight/blacklight.png?branch=master)](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=master)](https://coveralls.io/github/projectblacklight/blacklight?branch=master)",
   "main": "app/assets/javascripts/blacklight",
   "scripts": {
@@ -27,7 +27,7 @@
   },
   "dependencies": {
     "bloodhound-js": "^1.2.3",
-    "bootstrap": "^4.3.1",
+    "bootstrap": ">=4.3.1 <6.0.0",
     "jquery": "^3.5.1",
     "typeahead.js": "^0.11.1"
   }

data/spec/components/blacklight/constraint_layout_component_spec.rb

@@ -3,12 +3,8 @@
 require 'spec_helper'
 
 RSpec.describe Blacklight::ConstraintLayoutComponent, type: :component do
-  subject(:render) do
-    render_inline(described_class.new(**params))
-  end
-
-  let(:rendered) do
-    Capybara::Node::Simple.new(render)
+  subject(:rendered) do
+    render_inline_to_capybara_node(described_class.new(**params))
   end
 
   describe "for simple display" do
@@ -39,7 +35,7 @@ RSpec.describe Blacklight::ConstraintLayoutComponent, type: :component do
 
     it "has an accessible remove label" do
       expect(rendered).to have_selector(".remove") do |s|
-        expect(s).to have_selector('.sr-only', text: 'Remove constraint my label: my value')
+        expect(s).to have_selector('.visually-hidden', text: 'Remove constraint my label: my value')
       end
     end
   end

data/spec/components/blacklight/facet_field_checkboxes_component_spec.rb

@@ -3,12 +3,8 @@
 require 'spec_helper'
 
 RSpec.describe Blacklight::FacetFieldCheckboxesComponent, type: :component do
-  subject(:render) do
-    render_inline(described_class.new(facet_field: facet_field))
-  end
-
-  let(:rendered) do
-    Capybara::Node::Simple.new(render)
+  subject(:rendered) do
+    render_inline_to_capybara_node(described_class.new(facet_field: facet_field))
   end
 
   let(:facet_field) do
@@ -40,7 +36,7 @@ RSpec.describe Blacklight::FacetFieldCheckboxesComponent, type: :component do
   it 'renders a collapsible card' do
     expect(rendered).to have_selector '.card'
     expect(rendered).to have_button 'Field'
-    expect(rendered).to have_selector 'button[data-target="#facet-field"]'
+    expect(rendered).to have_selector 'button[data-bs-target="#facet-field"]'
     expect(rendered).to have_selector '#facet-field.collapse.show'
   end
 

data/spec/components/blacklight/facet_field_list_component_spec.rb

@@ -3,12 +3,8 @@
 require 'spec_helper'
 
 RSpec.describe Blacklight::FacetFieldListComponent, type: :component do
-  subject(:render) do
-    render_inline(described_class.new(facet_field: facet_field))
-  end
-
-  let(:rendered) do
-    Capybara::Node::Simple.new(render)
+  subject(:rendered) do
+    render_inline_to_capybara_node(described_class.new(facet_field: facet_field))
   end
 
   let(:facet_field) do
@@ -35,7 +31,7 @@ RSpec.describe Blacklight::FacetFieldListComponent, type: :component do
   it 'renders a collapsible card' do
     expect(rendered).to have_selector '.card'
     expect(rendered).to have_button 'Field'
-    expect(rendered).to have_selector 'button[data-target="#facet-field"]'
+    expect(rendered).to have_selector 'button[data-bs-target="#facet-field"]'
     expect(rendered).to have_selector '#facet-field.collapse.show'
   end
 

data/spec/components/blacklight/facet_item_component_spec.rb

@@ -3,12 +3,8 @@
 require 'spec_helper'
 
 RSpec.describe Blacklight::FacetItemComponent, type: :component do
-  subject(:render) do
-    render_inline(described_class.new(facet_item: facet_item))
-  end
-
-  let(:rendered) do
-    Capybara::Node::Simple.new(render)
+  subject(:rendered) do
+    render_inline_to_capybara_node(described_class.new(facet_item: facet_item))
   end
 
   let(:facet_item) do
@@ -24,7 +20,9 @@ RSpec.describe Blacklight::FacetItemComponent, 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=x'
+    expect(rendered).to have_link 'x', href: '/catalog?f=x' do |link|
+      link['rel'] == 'nofollow'
+    end
     expect(rendered).to have_selector '.facet-count', text: '10'
   end
 
@@ -43,7 +41,9 @@ RSpec.describe Blacklight::FacetItemComponent, 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_selector '.selected', text: 'x'
-      expect(rendered).to have_link '[remove]', href: '/catalog'
+      expect(rendered).to have_link '[remove]', href: '/catalog' do |link|
+        link['rel'] == 'nofollow'
+      end
       expect(rendered).to have_selector '.selected.facet-count', text: '10'
     end
   end

data/spec/components/blacklight/facet_item_pivot_component_spec.rb

@@ -3,12 +3,8 @@
 require 'spec_helper'
 
 RSpec.describe Blacklight::FacetItemPivotComponent, type: :component do
-  subject(:render) do
-    render_inline(described_class.new(facet_item: facet_item))
-  end
-
-  let(:rendered) do
-    Capybara::Node::Simple.new(render)
+  subject(:rendered) do
+    render_inline_to_capybara_node(described_class.new(facet_item: facet_item))
   end
 
   let(:search_state) do
@@ -31,7 +27,7 @@ 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[z]=x'
+    expect(rendered).to have_link 'x', href: '/catalog?f%5Bz%5D=x'
     expect(rendered).to have_selector '.facet-count', text: '10'
   end
 

data/spec/components/blacklight/hidden_search_state_component_spec.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 RSpec.describe Blacklight::HiddenSearchStateComponent, type: :component do
-  subject(:render) { render_inline(instance) }
+  subject(:rendered) { render_inline_to_capybara_node(instance) }
 
   let(:params) do
     { q: "query",
@@ -11,14 +11,13 @@ RSpec.describe Blacklight::HiddenSearchStateComponent, type: :component do
       f: { field1: %w[a b], field2: ["z"] } }
   end
   let(:instance) { described_class.new(params: params) }
-  let(:generated) { Capybara::Node::Simple.new("<div>#{render.to_html}</div>") }
 
   it "converts a hash with nested complex data to Rails-style hidden form fields" do
-    expect(generated).to have_selector("input[type='hidden'][name='q'][value='query']", visible: :hidden)
-    expect(generated).to have_selector("input[type='hidden'][name='per_page'][value='10']", visible: :hidden)
-    expect(generated).to have_selector("input[type='hidden'][name='extra_arbitrary_key'][value='arbitrary_value']", visible: :hidden)
-    expect(generated).to have_selector("input[type='hidden'][name='f[field2][]'][value='z']", visible: :hidden)
-    expect(generated).to have_selector("input[type='hidden'][name='f[field1][]'][value='a']", visible: :hidden)
-    expect(generated).to have_selector("input[type='hidden'][name='f[field1][]'][value='b']", visible: :hidden)
+    expect(rendered).to have_selector("input[type='hidden'][name='q'][value='query']", visible: :hidden)
+    expect(rendered).to have_selector("input[type='hidden'][name='per_page'][value='10']", visible: :hidden)
+    expect(rendered).to have_selector("input[type='hidden'][name='extra_arbitrary_key'][value='arbitrary_value']", visible: :hidden)
+    expect(rendered).to have_selector("input[type='hidden'][name='f[field2][]'][value='z']", visible: :hidden)
+    expect(rendered).to have_selector("input[type='hidden'][name='f[field1][]'][value='a']", visible: :hidden)
+    expect(rendered).to have_selector("input[type='hidden'][name='f[field1][]'][value='b']", visible: :hidden)
   end
 end

data/spec/components/blacklight/metadata_field_component_spec.rb

@@ -3,8 +3,8 @@
 require 'spec_helper'
 
 RSpec.describe Blacklight::MetadataFieldComponent, type: :component do
-  subject(:render) do
-    render_inline(described_class.new(field: field))
+  subject(:rendered) do
+    render_inline_to_capybara_node(described_class.new(field: field))
   end
 
   let(:view_context) { controller.view_context }
@@ -15,10 +15,6 @@ RSpec.describe Blacklight::MetadataFieldComponent, type: :component do
     Blacklight::FieldPresenter.new(view_context, document, field_config)
   end
 
-  let(:rendered) do
-    Capybara::Node::Simple.new(render)
-  end
-
   it 'renders the field label' do
     expect(rendered).to have_selector 'dt.blacklight-field', text: 'Field label'
   end
@@ -28,8 +24,8 @@ RSpec.describe Blacklight::MetadataFieldComponent, type: :component do
   end
 
   context 'from a show view' do
-    subject(:render) do
-      render_inline(described_class.new(field: field, show: true))
+    subject(:rendered) do
+      render_inline_to_capybara_node(described_class.new(field: field, show: true))
     end
 
     it 'renders the right field label' do

data/spec/features/axe_spec.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+RSpec.describe 'Accessibility testing', api: false, js: true do
+  xit 'validates the home page' do
+    visit root_path
+    expect(page).to be_accessible
+  end
+
+  xit 'validates the catalog page' do
+    visit root_path
+    fill_in "q", with: 'history'
+    click_button 'search'
+
+    # aria-allowed-role doesn't like nav[role="region"]
+    expect(page).to be_accessible(skipping: ['aria-allowed-role'])
+
+    within '.card.blacklight-language_ssim' do
+      click_button 'Language'
+      click_link "Tibetan"
+    end
+
+    expect(page).to be_accessible(skipping: ['aria-allowed-role'])
+  end
+
+  xit '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 Bootstrap::VERSION < '5')])
+  end
+end

data/spec/features/facet_missing_spec.rb

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+RSpec.describe "Facet missing" do
+  before do
+    CatalogController.blacklight_config[:default_solr_params]["facet.missing"] = true
+  end
+
+  after do
+    CatalogController.blacklight_config[:default_solr_params].delete("facet.missing")
+  end
+
+  context "selecting missing field in facets" do
+    it "adds facet missing query and constraints" do
+      visit root_path
+
+      within "#facet-subject_geo_ssim" do
+        click_link "[Missing]"
+      end
+
+      within "#facet-subject_geo_ssim" do
+        expect(page).to have_selector("span.selected", text: "[Missing")
+        expect(page).to have_selector("span.facet-count.selected", text: "13")
+      end
+
+      within "#sortAndPerPage" do
+        expect(page).to have_content "1 - 10 of 13"
+      end
+
+      expect(page).to have_css(".constraint-value", text: "Region")
+      expect(page).to have_css(".constraint-value", text: "[Missing]")
+    end
+  end
+
+  context "unselecting the facet missing facet" do
+    it "unselects the missig field facet" do
+      visit root_path + "?f[-subject_geo_ssim:[* TO *]][]=&f[subject_geo_ssim][]="
+
+      within "#facet-subject_geo_ssim" do
+        click_link "remove"
+      end
+
+      expect(page).not_to have_link "remove"
+      expect(page).to have_content("Welcome!")
+    end
+  end
+
+  context "unselecting the facet missing constraint" do
+    it "unselects the missig field facet" do
+      visit root_path + "?f[-subject_geo_ssim:[* TO *]][]=&f[subject_geo_ssim][]="
+
+      within ".filter-subject_geo_ssim" do
+        click_link "Remove constraint Region: [Missing]"
+      end
+
+      expect(page).not_to have_link "remove"
+      expect(page).to have_content("Welcome!")
+    end
+  end
+end

data/spec/features/facets_spec.rb

@@ -69,7 +69,7 @@ RSpec.describe "Facets" do
     page.find('h3.facet-field-heading button', text: 'Pivot Field').click
 
     within '#facet-example_pivot_field' do
-      expect(page).to have_css('.facet-leaf-node', text: "Book\t30")
+      expect(page).to have_css('.facet-leaf-node', text: "Book 30")
       expect(page).not_to have_css('.facet-select', text: 'Tibetan')
       page.find('.facet-toggle-handle').click
       click_link 'Tibetan'
@@ -84,13 +84,13 @@ RSpec.describe "Facets" do
       pending 'Capybara::NotSupportedByDriverError: Capybara::Driver::Base#evaluate_script'
       visit root_path
       page.find('h3.facet-field-heading button', text: 'Format').click
-      focused_element_data_target = page.evaluate_script("document.activeElement")['data-target']
+      focused_element_data_target = page.evaluate_script("document.activeElement")['data-bs-target']
       expect(focused_element_data_target).to eq '#facet-format'
     end
   end
 
   describe '"More" links' do
-    it 'has default more link with sr-only text' do
+    it 'has default more link with visually-hidden text' do
       visit root_path
       within '#facet-language_ssim' do
         expect(page).to have_css 'div.more_facets', text: 'more Language'

data/spec/helpers/blacklight/configuration_helper_behavior_spec.rb

@@ -194,9 +194,9 @@ RSpec.describe Blacklight::ConfigurationHelperBehavior do
   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\"> per page</span>", 11]
-      expect(helper.per_page_options_for_select).to include ["22<span class=\"sr-only\"> per page</span>", 22]
-      expect(helper.per_page_options_for_select).to include ["33<span class=\"sr-only\"> per page</span>", 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
 

data/spec/helpers/blacklight/facets_helper_behavior_spec.rb

@@ -314,7 +314,7 @@ RSpec.describe Blacklight::FacetsHelperBehavior do
     end
 
     describe "simple case" do
-      let(:expected_html) { '<span class="facet-label"><a class="facet-select" href="/catalog">Z</a></span><span class="facet-count">10</span>' }
+      let(:expected_html) { '<span class="facet-label"><a class="facet-select" rel="nofollow" href="/catalog">Z</a></span><span class="facet-count">10</span>' }
 
       it "uses facet_display_value" do
         result = helper.render_facet_value('simple_field', item)
@@ -323,7 +323,7 @@ RSpec.describe Blacklight::FacetsHelperBehavior do
     end
 
     describe "when :url_method is set" do
-      let(:expected_html) { '<span class="facet-label"><a class="facet-select" href="/blabla">Z</a></span><span class="facet-count">10</span>' }
+      let(:expected_html) { '<span class="facet-label"><a class="facet-select" rel="nofollow" href="/blabla">Z</a></span><span class="facet-count">10</span>' }
 
       it "uses that method" do
         allow(helper).to receive(:facet_configuration_for_field).with('simple_field').and_return(Blacklight::Configuration::FacetField.new(key: 'simple_field', query: nil, date: nil, helper_method: nil, single: false, url_method: :test_method))

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

@@ -159,6 +159,33 @@ RSpec.describe Blacklight::SearchState::FilterField do
         expect(new_state.filter('another_field').values).to eq ['3']
       end
     end
+
+    context "With facet.missing field" do
+      let(:params) do
+        { f: { some_field: [""], "-some_field:": [""] } }
+      end
+
+      it "removes facet.missing facet params" do
+        filter = search_state.filter("some_field")
+        new_state = filter.remove(OpenStruct.new(fq: "-some_field:[* TO *]"))
+
+        expect(new_state.params).to eq("f" => {})
+      end
+    end
+
+    context "With facet.missing field value" do
+      let(:params) do
+        { f: { some_field: [""], "-some_field:": [""] } }
+      end
+
+      it "removes facet.missing facet params" do
+        missing = I18n.t("blacklight.search.facets.missing")
+        filter = search_state.filter("some_field")
+        new_state = filter.remove(missing)
+
+        expect(new_state.params).to eq("f" => {})
+      end
+    end
   end
 
   describe '#values' do

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

@@ -16,7 +16,6 @@ RSpec.describe Blacklight::Solr::Request, api: true do
       subject['spellcheck'] = "a"
       subject['spellcheck.q'] = "fleece"
       subject['f.title_facet.facet.limit'] = "vest"
-      subject['facet.field'] = []
     end
 
     it "accepts valid parameters" do

data/spec/models/blacklight/solr/response/group_response_spec.rb

@@ -69,8 +69,9 @@ RSpec.describe Blacklight::Solr::Response::GroupResponse, api: true do
     it "accesses a custom field grouped i18n key" do
       allow(I18n).to receive(:t).with(
         'blacklight.entry_name.grouped.result_group_ssi',
-        default: :'blacklight.entry_name.grouped.default'
-      ).and_return('cool group')
+        default: :'blacklight.entry_name.grouped.default',
+        count: 2
+      ).and_return('cool groups')
       expect(group.entry_name(count: 2)).to eq 'cool groups'
     end
 

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

@@ -27,6 +27,24 @@ RSpec.describe Blacklight::Solr::SearchBuilderBehavior, api: true do
     it "uses the class-level default_processor_chain" do
       expect(subject.processor_chain).to eq search_builder_class.default_processor_chain
     end
+
+    it "appends the :add_missing_field_query processor" do
+      expect(subject.processor_chain).to include(:add_missing_field_query)
+    end
+  end
+
+  context 'with merged parameters from the defaults + the search field' do
+    before do
+      blacklight_config.default_solr_params = { json: { whatever: [1, 2, 3] } }
+      blacklight_config.search_fields['all_fields'].solr_parameters = { json: { and_also: [4, 5, 6] } }
+    end
+
+    let(:user_params) { { search_field: 'all_fields' } }
+
+    it 'deep merges hash values' do
+      expect(subject.to_hash.dig(:json, :whatever)).to eq [1, 2, 3]
+      expect(subject.to_hash.dig(:json, :and_also)).to eq [4, 5, 6]
+    end
   end
 
   context "with a complex parameter environment" do
@@ -304,7 +322,6 @@ RSpec.describe Blacklight::Solr::SearchBuilderBehavior, api: true do
 
       it "does not include weird keys not in field definition" do
         expect(subject[:phrase_filters]).to be_nil
-        expect(subject[:fq]).to eq []
         expect(subject[:commit]).to be_nil
         expect(subject[:action]).to be_nil
         expect(subject[:controller]).to be_nil
@@ -809,4 +826,13 @@ RSpec.describe Blacklight::Solr::SearchBuilderBehavior, api: true do
       expect(subject.to_hash).to include q: '{!lucene}id:(1 OR 2 OR 3)'
     end
   end
+
+  describe "#add_missing_field_query" do
+    it "precesses facet.missing query" do
+      subject.with("f" => { "-hello:" => [""] })
+      solr_params = { "facet.missing" => true, fq: [] }
+
+      expect(subject.add_missing_field_query(solr_params)).to eq(["-hello:[* TO *]"])
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -19,18 +19,24 @@ EngineCart.load_application!
 require 'rspec/rails'
 require 'rspec/its'
 require 'rspec/collection_matchers'
-require 'capybara/rspec'
-require 'capybara/apparition'
+require 'capybara/rails'
+require 'webdrivers'
+require 'selenium-webdriver'
 require 'equivalent-xml'
+require 'axe-rspec'
 
-Capybara.javascript_driver = :apparition
-Capybara.disable_animation = true
-# Capybara.enable_aria_label = true
+Capybara.javascript_driver = :headless_chrome
 
-# Uncomment for a headed browser
-# Capybara.register_driver :apparition do |app|
-#   Capybara::Apparition::Driver.new(app, headless: false)
-# end
+Capybara.register_driver :headless_chrome do |app|
+  Capybara::Selenium::Driver.load_selenium
+  browser_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, options: browser_options)
+end
 
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.
@@ -62,6 +68,7 @@ RSpec.configure do |config|
   config.infer_spec_type_from_file_location!
   config.include PresenterTestHelpers, type: :presenter
   config.include ViewComponent::TestHelpers, type: :component
+  config.include ViewComponentCapybaraTestHelpers, type: :component
 
   config.include(ControllerLevelHelpers, type: :helper)
   config.before(:each, type: :helper) { initialize_controller_helpers(helper) }

data/spec/support/view_component_capybara_test_helpers.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module ViewComponentCapybaraTestHelpers
+  # Work around for https://github.com/teamcapybara/capybara/issues/2466
+  def render_inline_to_capybara_node(component)
+    Capybara::Node::Simple.new(render_inline(component).to_s)
+  end
+end

data/spec/test_app_templates/lib/generators/test_app_generator.rb

@@ -17,9 +17,6 @@ class TestAppGenerator < Rails::Generators::Base
     options = '--devise'
     if ENV['BLACKLIGHT_API_TEST']
       options += ' --skip-assets'
-      inject_into_class 'app/controllers/application_controller.rb', 'ApplicationController' do
-        "  include ActionController::MimeResponds\n" # see https://github.com/projectblacklight/blacklight/issues/1894
-      end
     end
 
     generate 'blacklight:install', options

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

@@ -27,14 +27,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_selector 'button.collapsed[data-toggle="collapse"][aria-expanded="false"]'
+    expect(rendered).to have_selector 'button.collapsed[data-toggle="collapse"][data-bs-toggle="collapse"][aria-expanded="false"]'
     expect(rendered).to have_selector '.collapse .card-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_selector 'button[data-toggle="collapse"][aria-expanded="true"]'
+    expect(rendered).to have_selector 'button[data-toggle="collapse"][data-bs-toggle="collapse"][aria-expanded="true"]'
     expect(rendered).not_to have_selector '.card-header.collapsed'
     expect(rendered).to have_selector '.collapse.show .card-body'
   end