blacklight 8.13.0 → 9.0.0.beta1

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

@@ -4,9 +4,11 @@
      from this file.  Please refer to http://wiki.apache.org/solr/SolrConfigXml,
      as well as the default solrconfig file included with Solr -->
 
-  <luceneMatchVersion>9.0.0</luceneMatchVersion>
+  <abortOnConfigurationError>${solr.abortOnConfigurationError:true}</abortOnConfigurationError>
 
-  <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.StandardDirectoryFactory}" />
+  <luceneMatchVersion>6.1.0</luceneMatchVersion>
+
+  <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.StandardDirectoryFactory}"/>
 
   <updateHandler class="solr.DirectUpdateHandler2">
     <updateLog>
@@ -14,11 +16,17 @@
     </updateLog>
   </updateHandler>
 
+  <!-- solr lib dirs, which are needed for Solr 8 compatibility but ignored in solr 9.8 and above -->
   <lib dir="${solr.install.dir:../../../..}/modules/analysis-extras/lib" />
+  <lib dir="${solr.install.dir:../../../..}/contrib/analysis-extras/lib" />
+  <lib dir="${solr.install.dir:../../../..}/contrib/analysis-extras/lucene-libs" />
 
   <dataDir>${solr.data.dir:}</dataDir>
 
-  <requestHandler name="/select" class="solr.SearchHandler">
+  <requestHandler name="search" class="solr.SearchHandler" default="true">
+    <!-- default values for query parameters can be specified, these
+         will be overridden by parameters in the request
+      -->
      <lst name="defaults">
        <str name="defType">edismax</str>
        <str name="echoParams">explicit</str>
@@ -39,6 +47,7 @@
           full_title_tsim
           short_title_tsim
           alternative_title_tsim
+          active_fedora_model_ssi
           title_tsim
           author_tsim
           subject_tsim
@@ -75,6 +84,7 @@
        <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>
@@ -106,6 +116,7 @@
           full_title_tsim
           short_title_tsim
           alternative_title_tsim
+          active_fedora_model_ssi
           title_tsim
           author_tsim
           subject_tsim
@@ -142,6 +153,7 @@
        <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>
@@ -157,7 +169,7 @@
     </arr>
   </requestHandler>
 
-  <requestHandler name="permissions" class="solr.SearchHandler">
+  <requestHandler name="permissions" class="solr.SearchHandler" >
     <lst name="defaults">
       <str name="facet">off</str>
       <str name="echoParams">all</str>
@@ -245,8 +257,8 @@
 
   <requestHandler name="/replication" class="solr.ReplicationHandler" startup="lazy" />
 
-  <requestDispatcher>
-    <requestParsers multipartUploadLimitInKB="2048" />
+  <requestDispatcher handleSelect="true" >
+    <requestParsers enableRemoteStreaming="true" multipartUploadLimitInKB="2048" />
   </requestDispatcher>
 
   <requestHandler name="/analysis/field" startup="lazy" class="solr.FieldAnalysisRequestHandler" />

data/lib/generators/blacklight/user_generator.rb

@@ -34,13 +34,6 @@ module Blacklight
       generate "devise", model_name.classify
       generate "devise_guests", model_name.classify
 
-      # add the #to_s to the model.
-      insert_into_file("app/models/#{model_name}.rb", before: /end(\n| )*$/) do
-        "\n  # Configuration added by Blacklight; Blacklight::User uses a method key on your\n" \
-          "  # user class to get a user-displayable login/identifier for\n" \
-          "  # the account.\n" \
-          "  self.string_display_key ||= :email\n"
-      end
       gsub_file("config/initializers/devise.rb", "config.sign_out_via = :delete", "config.sign_out_via = :get")
       # Work around for https://github.com/heartcombo/devise/issues/5720
       gsub_file("config/initializers/devise.rb", "# config.reload_routes = true", "config.reload_routes = false")
@@ -51,13 +44,19 @@ module Blacklight
       file_path = "app/models/#{model_name.underscore}.rb"
       if File.exist?(File.expand_path(file_path, destination_root))
         inject_into_class file_path, model_name.classify do
-          "\n  # Connects this user object to Blacklights Bookmarks." \
-            "\n  include Blacklight::User\n"
+          <<~EOS
+            # Connects this user object to Blacklights Bookmarks.
+            include Blacklight::User
+
+            # Blacklight::User uses a method on your User class to get a user-displayable
+            # label (e.g. login or identifier) for the account. Blacklight uses `email' by default.
+            # self.string_display_key = :email
+          EOS
         end
       else
         say_status "warning", <<~EOS, :yellow
           Blacklight authenticated user functionality not installed, as a user model
-          could not be found at /app/models/user.rb. If you used a different name,
+          could not be found at #{file_path}. If you used a different name,
           please re-run the migration and provide that name as an argument. E.g.:
 
             `rails -g blacklight:user client`

data/package.json

@@ -1,11 +1,19 @@
 {
   "name": "blacklight-frontend",
-  "version": "8.13.0",
+  "version": "9.0.0-beta1",
   "description": "The frontend code and styles for Blacklight",
-  "main": "app/assets/javascripts/blacklight",
+  "exports": {
+    "./blacklight.esm.js": "./app/assets/javascripts/blacklight/blacklight.esm.js",
+    "./stylesheets/*": "./app/assets/stylesheets/blacklight/*",
+    ".": {
+      "import": "./app/javascript/blacklight-frontend/index.js",
+      "require": "./app/assets/javascripts/blacklight.js"
+    },
+    "./*": "./app/javascript/blacklight-frontend/*.js"
+  },
   "type": "module",
-  "module": "app/assets/javascripts/blacklight/blacklight.esm.js",
   "scripts": {
+    "build": "sass ./app/assets/stylesheets/blacklight/build.scss:./app/assets/builds/blacklight.css --no-source-map --load-path=node_modules --quiet-deps",
     "prepare": "rollup --config rollup.config.js --sourcemap && ESM=true rollup --config rollup.config.js --sourcemap"
   },
   "repository": {
@@ -24,7 +32,9 @@
   "homepage": "https://github.com/projectblacklight/blacklight#readme",
   "devDependencies": {
     "rollup": "^4.24.0",
-    "rollup-plugin-includepaths": "^0.2.4"
+    "rollup-plugin-includepaths": "^0.2.4",
+    "sass": "^1.80.3",
+    "bootstrap": "^5.3.3"
   },
   "browserslist": [
     "defaults",

data/rollup.config.js

@@ -16,7 +16,7 @@ let includePathOptions = {
 };
 
 const rollupConfig = {
-  input: 'app/javascript/blacklight/index.js',
+  input: 'app/javascript/blacklight-frontend/index.js',
   output: {
     file: `app/assets/javascripts/blacklight/${fileDest}.js`,
     format: ESM ? 'es' : 'umd',

data/spec/components/blacklight/document/action_component_spec.rb

@@ -23,11 +23,7 @@ RSpec.describe Blacklight::Document::ActionComponent, type: :component do
   end
 
   it 'renders an action link' do
-    if Rails.version >= '6'
-      allow(view_context).to receive(:some_tool_solr_document_path).with(document, { only_path: true }).and_return('/asdf')
-    else
-      allow(view_context).to receive(:some_tool_solr_document_path).with(document).and_return('/asdf')
-    end
+    allow(view_context).to receive(:some_tool_solr_document_path).with(document, { only_path: true }).and_return('/asdf')
 
     expect(rendered).to have_link 'Some tool', href: '/asdf'
   end
@@ -38,7 +34,7 @@ RSpec.describe Blacklight::Document::ActionComponent, type: :component do
     it 'render the partial' do
       allow(view_context).to receive(:render).with(hash_including(partial: '/some/tool'), {}).and_return('tool')
 
-      expect(rendered).to have_text 'tool'
+      expect(rendered).to have_content 'tool'
     end
   end
 end

data/spec/components/blacklight/document/group_component_spec.rb

@@ -32,7 +32,7 @@ RSpec.describe Blacklight::Document::GroupComponent, type: :component do
   end
 
   it 'renders the group documents' do
-    expect(rendered).to have_text 'results'
+    expect(rendered).to have_content 'results'
   end
 
   context 'with a limit applied' do

data/spec/components/blacklight/document/sidebar_component_spec.rb

@@ -33,29 +33,14 @@ RSpec.describe Blacklight::Document::SidebarComponent, type: :component do
     # rubocop:disable RSpec/SubjectStub
     before do
       allow(component).to receive(:render).with(an_instance_of(Blacklight::Document::MoreLikeThisComponent)).and_return("")
+      blacklight_config.show.show_tools_component = show_tools_component
+      allow(component).to receive(:render).with(an_instance_of(show_tools_component)).and_return(expected_html)
     end
 
-    context "without a configured ShowTools component" do
-      before do
-        allow(component).to receive(:render).with('show_tools', document: presented_document, silence_deprecation: false).and_return(expected_html)
-      end
+    let(:show_tools_component) { Class.new(Blacklight::Document::ShowToolsComponent) }
 
-      it 'renders show_tools partial' do
-        expect(rendered).to have_css 'div[@class="expected-show_tools"]'
-      end
-    end
-
-    context "with a configured ShowTools component" do
-      let(:show_tools_component) { Class.new(Blacklight::Document::ShowToolsComponent) }
-
-      before do
-        blacklight_config.show.show_tools_component = show_tools_component
-        allow(component).to receive(:render).with(an_instance_of(show_tools_component)).and_return(expected_html)
-      end
-
-      it 'renders configured show_tools component' do
-        expect(rendered).to have_css 'div[@class="expected-show_tools"]'
-      end
+    it 'renders configured show_tools component' do
+      expect(rendered).to have_css 'div[@class="expected-show_tools"]'
     end
     # rubocop:enable RSpec/SubjectStub
   end

data/spec/components/blacklight/document_component_spec.rb

@@ -41,23 +41,21 @@ 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
-
-    expect(rendered).to have_text 'Title'
-    expect(rendered).to have_text 'Embed'
-    expect(rendered).to have_text 'Metadata'
-    expect(rendered).to have_text 'Thumbnail'
-    expect(rendered).to have_text 'Actions'
+    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'
+    expect(rendered).to have_content 'Metadata'
+    expect(rendered).to have_content 'Thumbnail'
+    expect(rendered).to have_content 'Actions'
   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,10 +63,9 @@ 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_text 'Body content'
+      expect(rendered).to have_content 'Body content'
       expect(rendered).to have_no_css 'header'
       expect(rendered).to have_no_css 'dl'
     end
@@ -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
@@ -160,7 +155,7 @@ RSpec.describe Blacklight::DocumentComponent, type: :component do
       end)
 
       blacklight_config.show.embed_component = StubComponent
-      expect(rendered).to have_text 'embed'
+      expect(rendered).to have_content 'embed'
     end
 
     context 'show view with custom translation' do
@@ -226,7 +221,7 @@ RSpec.describe Blacklight::DocumentComponent, type: :component do
 
   it 'renders partials' do
     component.with_partial { 'Partials' }
-    expect(rendered).to have_text 'Partials'
+    expect(rendered).to have_content 'Partials'
   end
 
   it 'has no partials by default' do
@@ -245,7 +240,7 @@ RSpec.describe Blacklight::DocumentComponent, type: :component do
     end
 
     it 'shows the prefix' do
-      expect(rendered).to have_text "Prefix!"
+      expect(rendered).to have_content "Prefix!"
     end
   end
 end

data/spec/components/blacklight/facet_component_spec.rb

@@ -36,7 +36,7 @@ RSpec.describe Blacklight::FacetComponent, type: :component do
     end
 
     it 'renders the provided component' do
-      expect(rendered).to have_text 'Custom facet rendering'
+      expect(rendered).to have_content 'Custom facet rendering'
     end
   end
 
@@ -60,7 +60,7 @@ RSpec.describe Blacklight::FacetComponent, type: :component do
     end
 
     it 'renders the partial' do
-      expect(rendered).to have_text 'facet partial'
+      expect(rendered).to have_content 'facet partial'
     end
   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'
@@ -133,7 +133,7 @@ RSpec.describe Blacklight::FacetFieldListComponent, type: :component do
     let(:params) { { f_inclusive: { field: %w[a b c] } } }
 
     it 'displays the constraint above the list' do
-      expect(rendered).to have_text 'Any of:'
+      expect(rendered).to have_content 'Any of:'
       expect(rendered).to have_css '.inclusive_or .facet-label', text: 'a'
       expect(rendered).to have_link '[remove]', href: 'http://test.host/catalog?f_inclusive%5Bfield%5D%5B%5D=b&f_inclusive%5Bfield%5D%5B%5D=c'
       expect(rendered).to have_css '.inclusive_or .facet-label', text: 'b'

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

@@ -440,7 +440,7 @@ RSpec.describe CatalogController, :api do
       it "responds to an extension-registered format properly" do
         get :show, params: { id: doc_id, format: 'mock' }
         expect(response).to be_successful
-        expect(response.body).to include('mock_export')
+        expect(response.body).to match /mock_export/
       end
     end # dynamic export formats
   end # describe show action
@@ -595,7 +595,7 @@ RSpec.describe CatalogController, :api do
 
     it "does not show user util links" do
       get :index
-      expect(response.body).not_to include('Login')
+      expect(response.body).not_to match /Login/
     end
   end
 
@@ -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/advanced_search_spec.rb

@@ -53,7 +53,7 @@ RSpec.describe "Blacklight Advanced Search Form" do
         expect(page).to have_css('.blacklight-language_ssim')
 
         within('.blacklight-language_ssim') do
-          expect(page).to have_text 'Language'
+          expect(page).to have_content 'Language'
         end
       end
     end
@@ -61,8 +61,8 @@ RSpec.describe "Blacklight Advanced Search Form" do
     it 'scopes searches to fields' do
       fill_in 'Title', with: 'Medicine'
       click_on 'advanced-search-submit'
-      expect(page).to have_text 'Remove constraint Title: Medicine'
-      expect(page).to have_text 'Strong Medicine speaks'
+      expect(page).to have_content 'Remove constraint Title: Medicine'
+      expect(page).to have_content 'Strong Medicine speaks'
       expect(page).to have_css('article.document', count: 1)
     end
 
@@ -71,16 +71,16 @@ RSpec.describe "Blacklight Advanced Search Form" do
       click_on 'Language'
       check 'Urdu 3'
       click_on 'advanced-search-submit'
-      expect(page).to have_text 'Pākistānī ʻaurat dorāhe par'
-      expect(page).to have_no_text 'Ajikto kŭrŏk chŏrŏk sasimnikka : and 아직도　그럭　저럭　사십니까'
+      expect(page).to have_content 'Pākistānī ʻaurat dorāhe par'
+      expect(page).to have_no_content 'Ajikto kŭrŏk chŏrŏk sasimnikka : and 아직도　그럭　저럭　사십니까'
       expect(page).to have_css('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_text('Ci an zhou bian')
-      expect(page).to have_no_text('Strong Medicine speaks')
+      expect(page).to have_content('Ci an zhou bian')
+      expect(page).to have_no_content('Strong Medicine speaks')
       expect(page).to have_css('article.document', count: 10)
     end
 
@@ -88,7 +88,7 @@ RSpec.describe "Blacklight Advanced Search Form" do
       fill_in 'All Fields', with: 'history'
       fill_in 'Author', with: 'hearth'
       click_on 'advanced-search-submit'
-      expect(page).to have_text('Strong Medicine speaks')
+      expect(page).to have_content('Strong Medicine speaks')
       expect(page).to have_css('article.document', count: 1)
     end
 
@@ -97,8 +97,8 @@ RSpec.describe "Blacklight Advanced Search Form" do
       fill_in 'All Fields', with: 'history'
       fill_in 'Subject', with: 'women'
       click_on 'advanced-search-submit'
-      expect(page).to have_text('Ci an zhou bian')
-      expect(page).to have_text('Pākistānī ʻaurat dorāhe par')
+      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_css('article.document', count: 10)
     end
   end
@@ -127,8 +127,8 @@ RSpec.describe "Blacklight Advanced Search Form" do
     it "does not have multiple parameters for a search field" do
       fill_in 'Title', with: 'bread'
       click_on 'advanced-search-submit'
-      expect(page.current_url).to include('bread')
-      expect(page.current_url).not_to include('medicine')
+      expect(page.current_url).to match(/bread/)
+      expect(page.current_url).not_to match(/medicine/)
     end
 
     it "clears the prepopulated fields when the Start Over button is pressed" do

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