blacklight 8.8.0 → 9.0.0.beta1

data/config/locales/blacklight.zh.yml

@@ -90,7 +90,7 @@ zh:
           close: 隐藏方面
           open: 显示方面
         missing: "[未找到]"
-        more_html: 更多 <span class="sr-only visually-hidden">%{field_name}</span> »
+        more_html: 更多 <span class="visually-hidden">%{field_name}</span> »
         pivot:
           hide: 关
           show: 打开
@@ -100,8 +100,8 @@ zh:
           count: 按数量排序
           index: 按字母排序
         suggest:
-          label: 过滤器 %{field_label}
-          placeholder: 筛选...
+          label: Filter %{field_label}
+          placeholder: Filter...
         title: 限定搜索
       filters:
         label: "%{label}:"
@@ -139,7 +139,7 @@ zh:
         aria_label: 结果导航
         button_label: "%{count} 每页"
         button_label_html: '%{count}<span class="d-none d-sm-inline"> 每页</span>'
-        label: '%{count}<span class="sr-only visually-hidden"> 每页</span>'
+        label: '%{count}<span class="visually-hidden"> 每页</span>'
         submit: 更新
         title: 每页显示结果数
       rss_feed: 搜索结果RSS

data/lib/blacklight/configuration/display_field.rb

@@ -2,7 +2,7 @@
 
 module Blacklight
   class Configuration::DisplayField < Blacklight::Configuration::Field
-    def initialize(*args, **kwargs, &block)
+    def initialize(*args, **kwargs, &)
       super
 
       self.presenter ||= Blacklight::FieldPresenter

data/lib/blacklight/configuration/fields.rb

@@ -81,7 +81,7 @@ module Blacklight
       #
       #     add_blacklight_field :index_field, [{ :field => 'format', :label => 'Format' }, IndexField.new(:field => 'date', :label => 'Date')]
       #
-      def add_blacklight_field config_key, *args, &block
+      def add_blacklight_field(config_key, *args, &)
         field_config = case args.first
                        when String
                          field_config_from_key_and_hash(config_key, *args)
@@ -89,7 +89,7 @@ module Blacklight
                          args[0] = args[0].to_s
                          field_config_from_key_and_hash(config_key, *args)
                        when Array
-                         field_config_from_array(config_key, *args, &block)
+                         field_config_from_array(config_key, *args, &)
                          return # we've iterated over the array above.
                        else
                          field_config_from_field_or_hash(config_key, *args)
@@ -101,7 +101,7 @@ module Blacklight
 
         # look up any dynamic fields
         if field_config.match
-          handle_matching_fields(config_key, field_config, &block)
+          handle_matching_fields(config_key, field_config, &)
           return
         end
 

data/lib/blacklight/configuration/view_config.rb

@@ -4,8 +4,6 @@ class Blacklight::Configuration
   class ViewConfig < Blacklight::OpenStructWithHashAccess
     # @!attribute template
     #   @return [String] partial to render around the documents
-    # @!attribute partials
-    #   @return [Array<String>] partials to render for each document(see #render_document_partials)
     # @!attribute document_presenter_class
     #   @return [Class] document presenter class used by helpers and views
     # @!attribute document_component

data/lib/blacklight/configuration.rb

@@ -43,6 +43,7 @@ module Blacklight
     default_configuration do
       property :logo_link, default: nil
       property :skip_link_component, default: Blacklight::SkipLinkComponent
+      property :skip_link_item_component, default: Blacklight::SkipLinkItemComponent
       property :header_component, default: Blacklight::HeaderComponent
       property :full_width_layout, default: false
 
@@ -137,8 +138,8 @@ module Blacklight
       # @!attribute bookmark_icon_component
       # @since v8.3.1
       # component class used to render a document
-      # set to Blacklight::Icons::BookmarkIconComponent to replace checkbox with icon
-      property :bookmark_icon_component, default: nil
+      # set to nil if a checkbox is prefered to the icon
+      property :bookmark_icon_component, default: Blacklight::Icons::BookmarkIconComponent
 
       # @!attribute index
       # General configuration for all views
@@ -156,8 +157,6 @@ module Blacklight
         display_type_field: nil,
         # the "field access" key to use to look up the document display fields
         document_fields_key: :index_fields,
-        # partials to render for each document(see #render_document_partials)
-        partials: [],
         document_actions: NestedOpenStructWithHashAccess.new(ToolConfig),
         collection_actions: NestedOpenStructWithHashAccess.new(ToolConfig),
         # what field, if any, to use to render grouped results
@@ -165,9 +164,9 @@ module Blacklight
         # additional response formats for search results
         respond_to: OpenStructWithHashAccess.new,
         # component class used to render the facet grouping
-        facet_group_component: nil,
+        facet_group_component: Blacklight::Response::FacetGroupComponent,
         # component class used to render search constraints
-        constraints_component: nil,
+        constraints_component: Blacklight::ConstraintsComponent,
         # component class used to render the search bar
         search_bar_component: nil,
         # component class used to render the header above the documents
@@ -183,9 +182,7 @@ module Blacklight
         # document presenter class used by helpers and views
         document_presenter_class: nil,
         document_component: Blacklight::DocumentComponent,
-        # in Blacklight 9, the default show_tools_component configuration will
-        # be Blacklight::Document::ShowToolsComponent
-        show_tools_component: nil,
+        show_tools_component: Blacklight::Document::ShowToolsComponent,
         show_header_tools_component: nil,
         document_header_component: Blacklight::Document::PageHeaderComponent,
         sidebar_component: Blacklight::Document::SidebarComponent,
@@ -196,8 +193,6 @@ module Blacklight
         # Set this to a hash with additional arguments to merge into the route,
         # or set `controller: :current` to route to the current controller.
         route: nil,
-        # partials to render for each document(see #render_document_partials)
-        partials: [],
         document_actions: NestedOpenStructWithHashAccess.new(ToolConfig),
         header_actions: NestedOpenStructWithHashAccess.new(ToolConfig)
       )
@@ -584,7 +579,7 @@ module Blacklight
 
     ##
     # Add a section of config that only applies to documents with a matching display type
-    def for_display_type display_type, &_block
+    def for_display_type(display_type, &)
       fields_for_type[display_type] ||= self.class.new
 
       fields_for_type[display_type].tap do |conf|

data/lib/blacklight/engine.rb

@@ -72,12 +72,6 @@ module Blacklight
       outer_window: 2
     }
 
-    # Blacklight 9 moves the next button after the page numbers. This behavior can be configured
-    # in Blacklight 8 by setting the next_button_position to :after
-    bl_global_config.paginator = {
-      next_button_position: :before
-    }
-
     bl_global_config.search_params_permitted_classes = [ActiveSupport::HashWithIndifferentAccess, Symbol]
 
     # Anything that goes into Blacklight::Engine.config is stored as a class

data/lib/blacklight/open_struct_with_hash_access.rb

@@ -53,14 +53,14 @@ module Blacklight
       self.class.new @table.deep_dup
     end
 
-    def deep_transform_values(&method)
-      self.class.new @table.deep_transform_values(&method)
+    def deep_transform_values(&)
+      self.class.new @table.deep_transform_values(&)
     end
 
-    def try(method_name = nil, *args, &block)
+    def try(method_name = nil, *args, &)
       if method_name.nil? && block_given?
         if b.arity.zero?
-          instance_eval(&block)
+          instance_eval(&)
         else
           yield self
         end

data/lib/blacklight/search_builder.rb

@@ -95,20 +95,20 @@ module Blacklight
 
     ##
     # Merge additional, repository-specific parameters
-    def merge(extra_params, &block)
+    def merge(extra_params, &)
       if extra_params
         params_will_change!
-        @merged_params.merge!(extra_params.to_hash, &block)
+        @merged_params.merge!(extra_params.to_hash, &)
       end
       self
     end
 
     ##
     # "Reverse merge" additional, repository-specific parameters
-    def reverse_merge(extra_params, &block)
+    def reverse_merge(extra_params, &)
       if extra_params
         params_will_change!
-        @reverse_merged_params.reverse_merge!(extra_params.to_hash, &block)
+        @reverse_merged_params.reverse_merge!(extra_params.to_hash, &)
       end
       self
     end

data/lib/blacklight/solr/request.rb

@@ -3,12 +3,6 @@
 class Blacklight::Solr::InvalidParameter < ArgumentError; end
 
 class Blacklight::Solr::Request < ActiveSupport::HashWithIndifferentAccess
-  # @deprecated
-  SINGULAR_KEYS = %w(facet fl q qt rows start spellcheck spellcheck.q sort per_page wt hl group defType)
-
-  # @deprecated
-  ARRAY_KEYS = %w(facet.field facet.query facet.pivot fq hl.fl)
-
   def initialize(constructor = {})
     if constructor.is_a?(Hash)
       super()
@@ -42,7 +36,7 @@ class Blacklight::Solr::Request < ActiveSupport::HashWithIndifferentAccess
     self[:json][:query] ||= { bool: { bool_operator => [] } }
     self[:json][:query][:bool][bool_operator] ||= []
 
-    if self['q']
+    if self['q'].present?
       self[:json][:query][:bool][:must] ||= []
       self[:json][:query][:bool][:must] << self['q']
       delete 'q'

data/lib/blacklight/solr/response/group_response.rb

@@ -51,9 +51,9 @@ class Blacklight::Solr::Response::GroupResponse
     )
   end
 
-  def method_missing meth, *args, &block
+  def method_missing(meth, *args, &)
     if response.respond_to? meth
-      response.send(meth, *args, &block)
+      response.send(meth, *args, &)
     else
       super
     end

data/lib/blacklight.rb

@@ -116,7 +116,7 @@ module Blacklight
 
   # returns the full path the the blacklight plugin installation
   def self.root
-    @root ||= File.expand_path(File.dirname(File.dirname(__FILE__)))
+    @root ||= File.expand_path(File.dirname(__FILE__, 2))
   end
 
   def self.deprecation

data/lib/generators/blacklight/assets/importmap_generator.rb

@@ -5,18 +5,12 @@ module Blacklight
     class ImportmapGenerator < Rails::Generators::Base
       class_option :'bootstrap-version', type: :string, default: ENV.fetch('BOOTSTRAP_VERSION', '~> 5.3'), desc: "Set the generated app's bootstrap version"
 
-      # This could be skipped if you want to use webpacker
-      def add_javascript_dependencies
-        gem 'bootstrap', options[:'bootstrap-version'].presence # in rails 7, only for stylesheets
-        gem 'jquery-rails' if bootstrap_4? # Bootstrap 4 has a dependency on jquery
-      end
-
       def import_javascript_assets
         append_to_file 'config/importmap.rb' do
           <<~CONTENT
             pin "@github/auto-complete-element", to: "https://cdn.skypack.dev/@github/auto-complete-element"
             pin "@popperjs/core", to: "https://ga.jspm.io/npm:@popperjs/core@2.11.6/dist/umd/popper.min.js"
-            pin "bootstrap", to: "https://ga.jspm.io/npm:bootstrap@#{(defined?(Bootstrap) && Bootstrap::VERSION) || '5.3.2'}/dist/js/bootstrap.js"
+            pin "bootstrap", to: "https://ga.jspm.io/npm:bootstrap@#{(defined?(Bootstrap) && Bootstrap::VERSION) || '5.3.3'}/dist/js/bootstrap.js"
           CONTENT
         end
 
@@ -40,39 +34,29 @@ module Blacklight
         append_to_file 'app/javascript/application.js' do
           <<~CONTENT
             import githubAutoCompleteElement from "@github/auto-complete-element"
-            import Blacklight from "blacklight"
+            import Blacklight from "blacklight-frontend"
           CONTENT
         end
       end
 
       def add_stylesheet
         if File.exist? 'app/assets/stylesheets/application.bootstrap.scss'
-          if ENV['CI']
-            run "yarn add file:#{Blacklight::Engine.root}"
-          else
-            run "yarn add blacklight-frontend@#{Blacklight::VERSION}"
-          end
-
           append_to_file 'app/assets/stylesheets/application.bootstrap.scss' do
             <<~CONTENT
-              @import "blacklight-frontend/app/assets/stylesheets/blacklight/blacklight";
+              @import url("blacklight.css");
             CONTENT
           end
         else
-          gem "sassc-rails", "~> 2.1"
-
-          create_file 'app/assets/stylesheets/blacklight.scss' do
+          append_to_file 'app/assets/stylesheets/application.css' do
             <<~CONTENT
-              @import 'bootstrap';
-              @import 'blacklight/blacklight';
+              /*
+               *= require blacklight
+               */
+              @import url(https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css);
             CONTENT
           end
         end
       end
-
-      def bootstrap_4?
-        options[:'bootstrap-version'].match?(/\A[^0-9]*4\./)
-      end
     end
   end
 end

data/lib/generators/blacklight/assets/propshaft_generator.rb

@@ -18,7 +18,7 @@ module Blacklight
       def add_package_assets
         append_to_file 'app/assets/stylesheets/application.bootstrap.scss' do
           <<~CONTENT
-            @import "blacklight-frontend/app/assets/stylesheets/blacklight/blacklight";
+            @import url("blacklight.css");
           CONTENT
         end
 

data/lib/generators/blacklight/assets_generator.rb

@@ -2,7 +2,7 @@
 
 module Blacklight
   class AssetsGenerator < Rails::Generators::Base
-    class_option :'bootstrap-version', type: :string, default: ENV.fetch('BOOTSTRAP_VERSION', '~> 5.3'), desc: "Set the generated app's bootstrap version"
+    class_option :'bootstrap-version', type: :string, default: ENV.fetch('BOOTSTRAP_VERSION', '5.3.3'), desc: "Set the generated app's bootstrap version"
 
     def run_asset_pipeline_specific_generator
       generated_options = "--bootstrap-version='#{options[:'bootstrap-version']}'" if options[:'bootstrap-version']
@@ -11,8 +11,8 @@ module Blacklight
                     'blacklight:assets:importmap'
                   elsif defined?(Propshaft)
                     'blacklight:assets:propshaft'
-                  elsif defined?(Sprockets)
-                    'blacklight:assets:sprockets'
+                  else
+                    raise "Unsupported path"
                   end
 
       generate generator, generated_options if generator

data/lib/generators/blacklight/controller_generator.rb

@@ -16,9 +16,9 @@ module Blacklight
     # Add Blacklight to the application controller
     def inject_blacklight_controller_behavior
       inject_into_class "app/controllers/application_controller.rb", "ApplicationController" do
-        "  # Adds a few additional behaviors into the application controller\n" \
-          "  include Blacklight::Controller\n" \
-          "  layout :determine_layout if respond_to? :layout\n\n"
+        "  # Adds a few additional behaviors into the application controller\n  " \
+          "include Blacklight::Controller\n  " \
+          "layout :determine_layout if respond_to? :layout\n\n"
       end
     end
 

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

@@ -16,7 +16,7 @@
     </updateLog>
   </updateHandler>
 
-  <!-- solr lib dirs -->
+  <!-- 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" />

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.8.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

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/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,7 +3,7 @@
 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) }
 
   before do
@@ -26,24 +26,8 @@ RSpec.describe Blacklight::Search::FacetSuggestInput, type: :component do
     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/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