blacklight 8.3.0 → 8.4.0

data/lib/blacklight/configuration.rb

@@ -5,24 +5,6 @@ module Blacklight
   # Blacklight::Configuration holds the configuration for a Blacklight::Controller, including
   # fields to display, facets to show, sort options, and search fields.
   class Configuration < OpenStructWithHashAccess
-    extend ActiveSupport::Autoload
-    eager_autoload do
-      autoload :Context
-      autoload :ViewConfig
-      autoload :ToolConfig
-      autoload :Fields
-      autoload :Field
-      autoload :NullField
-      autoload :NullDisplayField
-      autoload :SearchField
-      autoload :FacetField
-      autoload :SortField
-      autoload :DisplayField
-      autoload :IndexField
-      autoload :ShowField
-      autoload :SessionTrackingConfig
-    end
-
     class_attribute :default_values, default: {}
 
     # Set up Blacklight::Configuration.default_values to contain the basic, required Blacklight fields
@@ -59,6 +41,7 @@ module Blacklight
     # rubocop:disable Metrics/BlockLength
     default_configuration do
       property :logo_link, default: nil
+      property :skip_link_component, default: Blacklight::SkipLinkComponent
       property :header_component, default: Blacklight::HeaderComponent
       property :full_width_layout, default: false
 
@@ -99,6 +82,10 @@ module Blacklight
       # @!attribute default_document_solr_params
       # @return [Hash] Default values of parameters to send with every single-document request
       property :default_document_solr_params, default: {}
+      # @!attribute fetch_many_documents_path
+      # @since v8.4.0
+      # @return [String] The url path (relative to the solr base url) to use when requesting multiple documents by id
+      property :fetch_many_documents_path, default: nil
       # @!attribute fetch_many_document_params
       # @since v7.0.0
       # @return [Hash] Default values of parameters to send with every multi-document request
@@ -146,6 +133,12 @@ module Blacklight
       # @return [#partials]
       property :navbar, default: OpenStructWithHashAccess.new(partials: {})
 
+      # @!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
+
       # @!attribute index
       # General configuration for all views
       # @return [Blacklight::Configuration::ViewConfig::Index]
@@ -155,6 +148,7 @@ module Blacklight
         # component class used to render a document
         document_component: Blacklight::DocumentComponent,
         sidebar_component: Blacklight::Search::SidebarComponent,
+        dropdown_component: Blacklight::System::DropdownComponent,
         # solr field to use to render a document title
         title_field: nil,
         # solr field to use to render format-specific partials
@@ -191,6 +185,8 @@ module Blacklight
         # in Blacklight 9, the default show_tools_component configuration will
         # be Blacklight::Document::ShowToolsComponent
         show_tools_component: nil,
+        show_header_tools_component: nil,
+        document_header_component: Blacklight::Document::PageHeaderComponent,
         sidebar_component: Blacklight::Document::SidebarComponent,
         display_type_field: nil,
         # the "field access" key to use to look up the document display fields
@@ -201,7 +197,8 @@ module Blacklight
         route: nil,
         # partials to render for each document(see #render_document_partials)
         partials: [],
-        document_actions: NestedOpenStructWithHashAccess.new(ToolConfig)
+        document_actions: NestedOpenStructWithHashAccess.new(ToolConfig),
+        header_actions: NestedOpenStructWithHashAccess.new(ToolConfig)
       )
 
       # @!attribute action_mapping
@@ -548,6 +545,22 @@ module Blacklight
       add_action(show.document_actions, name, opts)
       klass && ActionBuilder.new(klass, name, opts).build
     end
+
+    # Add a partial to the show page header when rendering a document.
+    # @!macro partial_if_unless
+    #   @param name [String] the name of the document partial
+    #   @param opts [Hash]
+    #   @option opts [Class] :component draw a component
+    #   @option opts [String] :partial partial to draw if component is false
+    #   @option opts [Symbol,Proc] :if render this action if the method identified by the symbol or the proc evaluates to true. The proc will receive the action configuration and the document or documents for the action.
+    #   @option opts [Symbol,Proc] :unless render this action unless the method identified by the symbol or the proc evaluates to true. The proc will receive the action configuration and the document or documents for the action.
+    def add_show_header_tools_partial(name, opts = {})
+      opts[:partial] ||= 'document_action'
+
+      add_action(show.header_actions, name, opts)
+      klass && ActionBuilder.new(klass, name, opts).build
+    end
+
     # rubocop:enable Layout/LineLength
 
     # Add a tool for the search result list itself

data/lib/blacklight/parameters.rb

@@ -7,7 +7,7 @@ module Blacklight
     # from the provided parameters.
     # @param [Hash] params parameters
     def self.sanitize params
-      params.reject { |_k, v| v.nil? } # rubocop:disable Style/CollectionCompact not available in Rails 6.0
+      params.reject { |_k, v| v.nil? } # not available in Rails 6.0
             .except(:action, :controller, :id, :commit, :utf8)
     end
 

data/lib/blacklight/solr/repository.rb

@@ -17,13 +17,20 @@ module Blacklight::Solr
       solr_response
     end
 
+    # Find multiple documents by their ids
+    # @param [Hash] _params query parameters
+    def find_many(params)
+      search(params: params, path: blacklight_config.fetch_many_documents_path)
+    end
+
     ##
     # Execute a search query against solr
     # @param [Hash] params solr query parameters
-    def search params = {}
-      request_params = params.reverse_merge({ qt: blacklight_config.qt })
+    # @param [String] path solr request handler path
+    def search pos_params = {}, path: nil, params: nil, **kwargs
+      request_params = (params || pos_params).reverse_merge(kwargs).reverse_merge({ qt: blacklight_config.qt })
 
-      send_and_receive search_path(request_params), request_params
+      send_and_receive(path || default_search_path(request_params), request_params)
     end
 
     # @param [Hash] request_params
@@ -126,7 +133,7 @@ module Blacklight::Solr
     end
 
     # @return [String]
-    def search_path(solr_params)
+    def default_search_path(solr_params)
       return blacklight_config.json_solr_path if blacklight_config.json_solr_path && uses_json_query_dsl?(solr_params)
 
       blacklight_config.solr_path

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

@@ -98,7 +98,7 @@ module Blacklight::Solr::Response::Params
       json_params[json_key || key],
       json_params.dig(:params, key),
       json_params.dig(:params, "json.#{key}")
-    ].select(&:present?).inject([]) do |memo, arr|
+    ].compact_blank.inject([]) do |memo, arr|
       memo.concat(Array.wrap(arr))
     end
   end

data/lib/blacklight/solr/response.rb

@@ -1,18 +1,6 @@
 # frozen_string_literal: true
 
 class Blacklight::Solr::Response < ActiveSupport::HashWithIndifferentAccess
-  extend ActiveSupport::Autoload
-  eager_autoload do
-    autoload :PaginationMethods
-    autoload :Response
-    autoload :Spelling
-    autoload :Facets
-    autoload :MoreLikeThis
-    autoload :GroupResponse
-    autoload :Group
-    autoload :Params
-  end
-
   include PaginationMethods
   include Spelling
   include Facets

data/lib/blacklight/solr/search_builder_behavior.rb

@@ -161,7 +161,7 @@ module Blacklight::Solr
         limit: facet_limit_with_pagination(field_name)
       ).merge(additional_parameters)
 
-      solr_parameters[:json][:facet][field_name] = field_config.select { |_k, v| v.present? }
+      solr_parameters[:json][:facet][field_name] = field_config.compact_blank
     end
 
     ##

data/lib/blacklight/solr.rb

@@ -2,11 +2,5 @@
 
 module Blacklight
   module Solr
-    autoload :Document, 'blacklight/solr/document'
-    autoload :FacetPaginator, 'blacklight/solr/facet_paginator'
-    autoload :Repository, 'blacklight/solr/repository'
-    autoload :Request, 'blacklight/solr/request'
-    autoload :Response, 'blacklight/solr/response'
-    autoload :SearchBuilderBehavior, 'blacklight/solr/search_builder_behavior'
   end
 end

data/lib/blacklight.rb

@@ -1,23 +1,13 @@
 # frozen_string_literal: true
 
 require 'kaminari'
-require 'blacklight/open_struct_with_hash_access'
-require 'blacklight/nested_open_struct_with_hash_access'
 require 'jbuilder'
+require "zeitwerk"
+loader = Zeitwerk::Loader.for_gem
+loader.ignore("#{__dir__}/generators")
+loader.setup
 
 module Blacklight
-  autoload :AbstractRepository, 'blacklight/abstract_repository'
-  autoload :Component, 'blacklight/component'
-  autoload :Configuration, 'blacklight/configuration'
-  autoload :Exceptions,  'blacklight/exceptions'
-  autoload :Parameters,  'blacklight/parameters'
-  autoload :Routes,      'blacklight/routes'
-  autoload :RuntimeRegistry, 'blacklight/runtime_registry'
-  autoload :SearchBuilder, 'blacklight/search_builder'
-  autoload :SearchState, 'blacklight/search_state'
-  autoload :Solr, 'blacklight/solr'
-
-  require 'blacklight/version'
   require 'blacklight/engine' if defined?(Rails)
 
   def self.blacklight_config_file

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

@@ -5,9 +5,9 @@ module Blacklight
     class PropshaftGenerator < Rails::Generators::Base
       def add_package
         if ENV['CI']
-          run "yarn add blacklight-frontend:#{Blacklight::Engine.root}"
+          run "yarn add file:#{Blacklight::Engine.root}"
         else
-          run 'yarn add blacklight-frontend'
+          run "yarn add blacklight-frontend@#{Blacklight::VERSION}"
         end
       end
 

data/lib/generators/blacklight/models_generator.rb

@@ -36,7 +36,7 @@ module Blacklight
     concerns :exportable
   end
 
-  resources :bookmarks do
+  resources :bookmarks, only: [:index, :update, :create, :destroy] do
     concerns :exportable
 
     collection do

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "blacklight-frontend",
-  "version": "8.3.0",
+  "version": "8.4.0",
   "description": "The frontend code and styles for Blacklight",
   "main": "app/assets/javascripts/blacklight",
   "module": "app/assets/javascripts/blacklight/blacklight.esm.js",

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

@@ -36,7 +36,7 @@ RSpec.describe Blacklight::Document::ActionComponent, type: :component do
     let(:action) { Blacklight::Configuration::ToolConfig.new(name: '', partial: '/some/tool') }
 
     it 'render the partial' do
-      allow(view_context).to receive(:render).with(hash_including(partial: '/some/tool')).and_return('tool')
+      allow(view_context).to receive(:render).with(hash_including(partial: '/some/tool'), {}).and_return('tool')
 
       expect(rendered).to have_content 'tool'
     end

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

@@ -0,0 +1,92 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Blacklight::Document::PageHeaderComponent, type: :component do
+  subject(:component) { described_class.new(document: document, search_context: search_context, search_session: current_search_session) }
+
+  let(:show_header_tools_component) { Class.new(Blacklight::Document::ShowToolsComponent) }
+
+  let(:view_context) { controller.view_context }
+  let(:render) do
+    component.render_in(view_context)
+  end
+
+  let(:rendered) do
+    Capybara::Node::Simple.new(render)
+  end
+
+  let(:document) { SolrDocument.new(id: 'x', title_tsim: 'Title') }
+
+  let(:blacklight_config) do
+    CatalogController.blacklight_config.deep_copy
+  end
+
+  # rubocop:disable RSpec/SubjectStub
+  before do
+    # Every call to view_context returns a different object. This ensures it stays stable.
+    allow(controller).to receive_messages(blacklight_config: blacklight_config)
+    allow(controller).to receive(:current_search_session).and_return(double(id: document.id))
+    controller.class.helper_method :current_search_session
+    allow(controller).to receive_messages(controller_name: 'catalog', link_to_previous_document: '', link_to_next_document: '')
+    allow(view_context).to receive_messages(search_context: search_context, search_session: current_search_session, current_search_session: current_search_session)
+    allow(component).to receive(:render).and_call_original
+    allow(component).to receive(:render).with(an_instance_of(show_header_tools_component)).and_return('tool component content')
+    replace_hash = { 'application/_start_over.html.erb' => 'Start Over' }
+    if Rails.version.to_f >= 7.1
+      controller.prepend_view_path(RSpec::Rails::ViewExampleGroup::StubResolverCache.resolver_for(replace_hash))
+    else
+      view_context.view_paths.unshift(RSpec::Rails::ViewExampleGroup::StubResolverCache.resolver_for(replace_hash))
+    end
+  end
+  # rubocop:enable RSpec/SubjectStub
+
+  context "all variables are empty" do
+    let(:search_context) { nil }
+    let(:current_search_session) { {} }
+
+    it 'does not render' do
+      expect(rendered.native.inner_html).to be_blank
+    end
+
+    context 'has header tools' do
+      before do
+        blacklight_config.show.show_header_tools_component = show_header_tools_component
+      end
+
+      it 'renders the tools' do
+        expect(rendered).to have_text 'tool component content'
+        expect(rendered).to have_css '.row'
+      end
+    end
+  end
+
+  context "has pagination" do
+    let(:search_context) { { next: next_doc, prev: prev_doc } }
+    let(:prev_doc) { SolrDocument.new(id: '777') }
+    let(:next_doc) { SolrDocument.new(id: '888') }
+    let(:current_search_session) { { query_params: { q: 'abc' }, 'id' => '123', 'document_id' => document.id } }
+
+    it 'renders pagination' do
+      expect(rendered).to have_text 'Previous'
+      expect(rendered).to have_text 'Next'
+      expect(rendered).to have_text 'Start Over'
+      expect(rendered).to have_text 'Back to Search'
+    end
+
+    context 'has header tools' do
+      before do
+        blacklight_config.show.show_header_tools_component = show_header_tools_component
+      end
+
+      it 'renders the tools and pagination' do
+        expect(rendered).to have_text 'Previous'
+        expect(rendered).to have_text 'Next'
+        expect(rendered).to have_text 'Start Over'
+        expect(rendered).to have_text 'Back to Search'
+        expect(rendered).to have_text 'tool component content'
+        expect(rendered).to have_css '.row'
+      end
+    end
+  end
+end

data/spec/components/blacklight/document_component_spec.rb

@@ -158,6 +158,26 @@ RSpec.describe Blacklight::DocumentComponent, type: :component do
       expect(rendered).to have_content 'embed'
     end
 
+    context 'show view with custom translation' do
+      let!(:original_translations) { I18n.backend.send(:translations).deep_dup }
+
+      before do
+        controller.action_name = "show"
+        I18n.backend.store_translations(:en, blacklight: { search: { show: { label: "testing:%{label}" } } })
+      end
+
+      after do
+        I18n.backend.reload!
+        I18n.backend.store_translations(:en, original_translations[:en])
+      end
+
+      it 'renders with show-specific metadata with correct translation' do
+        expect(rendered).to have_css 'dl.document-metadata'
+        expect(rendered).to have_css 'dt', text: 'testing:ISBN'
+        expect(rendered).to have_css 'dd', text: 'Value'
+      end
+    end
+
     context 'with configured metadata component' do
       let(:custom_component_class) do
         Class.new(Blacklight::DocumentMetadataComponent) do

data/spec/components/blacklight/icons/icon_component_spec.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Blacklight::Icons::IconComponent, type: :component do
+  subject(:component) { sub_component.new }
+
+  let(:sub_component) do
+    Class.new(described_class) do
+      def self.name
+        'TestIconComponent'
+      end
+    end
+  end
+
+  context 'when no classes are passed in' do
+    subject(:component) { sub_component.new }
+
+    it "renders component" do
+      render_inline(component)
+      expect(page).to have_css "span[class='blacklight-icons blacklight-icons-test_icon']"
+    end
+  end
+
+  context 'when classes are passed in' do
+    subject(:component) { sub_component.new(classes: 'my-icon') }
+
+    it "renders component" do
+      render_inline(component)
+      expect(page).to have_css "span[class='my-icon blacklight-icons blacklight-icons-test_icon']"
+    end
+  end
+
+  context 'when name is passed in' do
+    subject(:component) { sub_component.new(name: 'my-icon') }
+
+    it "renders component" do
+      render_inline(component)
+      expect(page).to have_css "span[class='blacklight-icons blacklight-icons-my-icon']"
+    end
+  end
+end

data/spec/components/blacklight/search_context/server_item_pagination_component_spec.rb

@@ -35,7 +35,7 @@ RSpec.describe Blacklight::SearchContext::ServerItemPaginationComponent, type: :
     end
 
     it "renders content" do
-      expect(render.css('.pagination-search-widgets').to_html).not_to be_blank
+      expect(render.css('.search-context.page-links').to_html).not_to be_blank
     end
 
     context "session and document are out of sync" do

data/spec/controllers/blacklight/catalog_spec.rb

@@ -17,7 +17,7 @@ RSpec.describe Blacklight::Catalog do
     end
 
     it "creates a path object" do
-      expect(subject).to be_kind_of Blacklight::SearchState
+      expect(subject).to be_a Blacklight::SearchState
       expect(subject.params).to eq raw_params
     end
   end

data/spec/controllers/catalog_controller_spec.rb

@@ -611,10 +611,10 @@ RSpec.describe CatalogController, :api do
       it "is successful" do
         get :facet, params: { id: 'format' }
         expect(response).to be_successful
-        expect(assigns[:response]).to be_kind_of Blacklight::Solr::Response
-        expect(assigns[:facet]).to be_kind_of Blacklight::Configuration::FacetField
-        expect(assigns[:display_facet]).to be_kind_of Blacklight::Solr::Response::Facets::FacetField
-        expect(assigns[:pagination]).to be_kind_of Blacklight::Solr::FacetPaginator
+        expect(assigns[:response]).to be_a Blacklight::Solr::Response
+        expect(assigns[:facet]).to be_a Blacklight::Configuration::FacetField
+        expect(assigns[:display_facet]).to be_a Blacklight::Solr::Response::Facets::FacetField
+        expect(assigns[:pagination]).to be_a Blacklight::Solr::FacetPaginator
       end
     end
 
@@ -638,7 +638,7 @@ RSpec.describe CatalogController, :api do
 
         expect(response).to be_successful
 
-        expect(assigns[:facet]).to be_kind_of Blacklight::Configuration::FacetField
+        expect(assigns[:facet]).to be_a Blacklight::Configuration::FacetField
         expect(assigns[:facet].key).to eq 'params_key'
         expect(assigns[:facet].field).to eq 'format'
 

data/spec/features/advanced_search_spec.rb

@@ -105,11 +105,23 @@ RSpec.describe "Blacklight Advanced Search Form" do
 
   describe "prepopulated advanced search form" do
     before do
-      visit '/catalog/advanced?op=must&clause[0][field]=title&clause[0]query=medicine'
+      visit '/catalog/advanced?op=must&clause[1][field]=title&clause[1]query=medicine&f_inclusive[language_ssim][]=Tibetan&sort=author'
     end
 
-    it "does not create hidden inputs for search fields" do
+    it 'prepopulates the expected fields' do
       expect(page).to have_field 'Title', with: 'medicine'
+      expect(page).to have_field 'Tibetan', checked: true
+      expect(page).to have_select 'op', selected: 'all'
+      expect(page).to have_select 'sort', selected: 'author'
+    end
+
+    it "does not create hidden inputs for fields included in adv search form" do
+      within('form.advanced') do
+        expect(page).to have_no_field('clause[1][query]', type: :hidden, with: 'medicine')
+        expect(page).to have_no_field('f_inclusive[language_ssim][]', type: :hidden, with: 'Tibetan')
+        expect(page).to have_no_field('op', type: :hidden, with: 'must')
+        expect(page).to have_no_field('sort', type: :hidden, with: 'author')
+      end
     end
 
     it "does not have multiple parameters for a search field" do
@@ -121,8 +133,10 @@ RSpec.describe "Blacklight Advanced Search Form" do
 
     it "clears the prepopulated fields when the Start Over button is pressed" do
       expect(page).to have_field 'Title', with: 'medicine'
+      expect(page).to have_field 'Tibetan', checked: true
       click_on 'Start over'
       expect(page).to have_no_field 'Title', with: 'medicine'
+      expect(page).to have_no_field 'Tibetan', checked: true
     end
   end
 end

data/spec/features/bookmarks_spec.rb

@@ -81,4 +81,19 @@ RSpec.describe "Bookmarks" do
     expect(page).to have_content 'Strong Medicine speaks'
     expect(page).to have_content 'Ci an zhou bian'
   end
+
+  context "has bookmark icon" do
+    before do
+      CatalogController.blacklight_config.bookmark_icon_component = Blacklight::Icons::BookmarkIconComponent
+    end
+
+    it 'shows bookmark icon instead of checkbox', :js do
+      visit solr_document_path('2007020969')
+      expect(page).to have_css('.blacklight-icons-bookmark')
+      find('.blacklight-icons-bookmark').click
+
+      expect(find('.toggle-bookmark[type="checkbox"]', visible: false)).to be_checked
+      find('.blacklight-icons-bookmark').click
+    end
+  end
 end

data/spec/helpers/blacklight/facets_helper_behavior_spec.rb

@@ -13,7 +13,7 @@ RSpec.describe Blacklight::FacetsHelperBehavior do
 
     it 'wraps the facet data in a presenter' do
       presenter = helper.facet_field_presenter(facet_config, display_facet)
-      expect(presenter).to be_a_kind_of Blacklight::FacetFieldPresenter
+      expect(presenter).to be_a Blacklight::FacetFieldPresenter
       expect(presenter.facet_field).to eq facet_config
       expect(presenter.display_facet).to eq display_facet
       expect(presenter.view_context).to eq helper
@@ -23,7 +23,7 @@ RSpec.describe Blacklight::FacetsHelperBehavior do
       stub_const('SomePresenter', Class.new(Blacklight::FacetFieldPresenter))
       facet_config.presenter = SomePresenter
       presenter = helper.facet_field_presenter(facet_config, display_facet)
-      expect(presenter).to be_a_kind_of SomePresenter
+      expect(presenter).to be_a SomePresenter
     end
   end
 end

data/spec/lib/blacklight/nested_open_struct_with_hash_access_spec.rb

@@ -23,7 +23,7 @@ RSpec.describe Blacklight::NestedOpenStructWithHashAccess do
 
   describe "#deep_dup" do
     it "preserves the current class" do
-      expect(described_class.new(described_class).deep_dup).to be_a_kind_of described_class
+      expect(described_class.new(described_class).deep_dup).to be_a described_class
     end
 
     it "preserves the default proc" do

data/spec/lib/blacklight/open_struct_with_hash_access_spec.rb

@@ -36,7 +36,7 @@ RSpec.describe Blacklight::OpenStructWithHashAccess do
     end
 
     it "exposes the internal hash table" do
-      expect(@h.to_h).to be_a_kind_of(Hash)
+      expect(@h.to_h).to be_a(Hash)
       expect(@h.to_h[:a]).to eq 1
     end
 

data/spec/models/blacklight/configuration_spec.rb

@@ -14,7 +14,7 @@ RSpec.describe "Blacklight::Configuration", :api do
 
   describe "initialization" do
     it "is an OpenStructWithHashAccess" do
-      expect(config).to be_a_kind_of Blacklight::OpenStructWithHashAccess
+      expect(config).to be_a Blacklight::OpenStructWithHashAccess
     end
 
     it "accepts a block for configuration" do
@@ -30,22 +30,22 @@ RSpec.describe "Blacklight::Configuration", :api do
 
   describe "defaults" do
     it "has a hash of default rsolr query parameters" do
-      expect(config.default_solr_params).to be_a_kind_of Hash
+      expect(config.default_solr_params).to be_a Hash
     end
 
     it "has openstruct values for show and index parameters" do
-      expect(config.show).to be_a_kind_of OpenStruct
-      expect(config.index).to be_a_kind_of OpenStruct
+      expect(config.show).to be_a OpenStruct
+      expect(config.index).to be_a OpenStruct
     end
 
     it "has ordered hashes for field configuration" do
-      expect(config.facet_fields).to be_a_kind_of Hash
-      expect(config.index_fields).to be_a_kind_of Hash
-      expect(config.show_fields).to be_a_kind_of Hash
-      expect(config.search_fields).to be_a_kind_of Hash
-      expect(config.show_fields).to be_a_kind_of Hash
-      expect(config.search_fields).to be_a_kind_of Hash
-      expect(config.sort_fields).to be_a_kind_of Hash
+      expect(config.facet_fields).to be_a Hash
+      expect(config.index_fields).to be_a Hash
+      expect(config.show_fields).to be_a Hash
+      expect(config.search_fields).to be_a Hash
+      expect(config.show_fields).to be_a Hash
+      expect(config.search_fields).to be_a Hash
+      expect(config.sort_fields).to be_a Hash
     end
   end
 
@@ -197,7 +197,7 @@ RSpec.describe "Blacklight::Configuration", :api do
         config.add_my_custom_facet_field 'qwerty', label: "asdf"
       end
 
-      expect(config.my_custom_facet_fields['qwerty']).to be_a_kind_of(Blacklight::Configuration::FacetField)
+      expect(config.my_custom_facet_fields['qwerty']).to be_a(Blacklight::Configuration::FacetField)
     end
   end
 

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

@@ -231,7 +231,7 @@ RSpec.describe "Blacklight::Solr::Document", :api do
     end
 
     it "returns an array even for a single-value field" do
-      expect(@doc1.to_semantic_values[:title]).to be_kind_of(Array)
+      expect(@doc1.to_semantic_values[:title]).to be_a(Array)
     end
 
     it "returns complete array for a multi-value field" do
@@ -290,7 +290,7 @@ RSpec.describe "Blacklight::Solr::Document", :api do
 
     it "plucks the MoreLikeThis results from the Solr Response" do
       expect(result).to have(1).item
-      expect(result.first).to be_a_kind_of(MockDocument)
+      expect(result.first).to be_a(MockDocument)
       expect(result.first.id).to eq 'abc'
       expect(result.first.solr_response).to eq response
     end