blacklight 8.3.0 → 8.5.0

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/component_spec.rb

@@ -1,43 +1,48 @@
 # frozen_string_literal: true
 
-RSpec.describe Blacklight::Component do
-  let(:component_class) { Blacklight::DocumentTitleComponent }
+RSpec.describe Blacklight::Component, type: :component do
+  let(:component_class) { Blacklight::System::ModalComponent }
 
-  context "subclassed" do
-    it "returns our Compiler implementation" do
-      expect(component_class.ancestors).to include described_class
-      expect(component_class.compiler).to be_a Blacklight::Component::EngineCompiler
+  before do
+    component_class.reset_compiler!
+    ViewComponent::CompileCache.invalidate!
+
+    component_class.class_eval do
+      undef :call if method_defined?(:call)
     end
   end
 
-  describe Blacklight::Component::EngineCompiler do
-    subject(:compiler) { described_class.new(component_class) }
+  after do
+    component_class.reset_compiler!
+    ViewComponent::CompileCache.invalidate!
 
-    let(:original_compiler) { ViewComponent::Compiler.new(component_class) }
-    let(:original_path) { original_compiler.send(:templates).first[:path] }
-    let(:resolved_path) { compiler.templates.first[:path] }
+    component_class.class_eval do
+      undef :call if method_defined?(:call)
+    end
+  end
 
-    context "without overrides" do
-      it "links to engine template" do
-        expect(resolved_path).not_to include(".internal_test_app")
-        expect(resolved_path).to eql(original_path)
-      end
+  context "without overrides" do
+    it "renders the engine template" do
+      render_inline(component_class.new)
+      expect(page).to have_css('.modal-header')
     end
+  end
 
-    context "with overrides" do
-      let(:path_match) do
-        Regexp.new(Regexp.escape(File.join(".internal_test_app", component_class.view_component_path)))
+  context "with overrides" do
+    around do |ex|
+      FileUtils.mkdir_p(Rails.root.join('app/components/blacklight/system'))
+      Rails.root.join("app/components/blacklight/system/modal_component.html.erb").open("w") do |f|
+        f.puts '<div class="custom-modal">Overridden</div>'
       end
 
-      before do
-        allow(File).to receive(:exist?).and_call_original
-        allow(File).to receive(:exist?).with(path_match).and_return(true)
-      end
+      ex.run
+    ensure
+      Rails.root.join('app/components/blacklight/system/modal_component.html.erb').unlink
+    end
 
-      it "links to application template" do
-        expect(resolved_path).to include(".internal_test_app")
-        expect(resolved_path).not_to eql(original_path)
-      end
+    it "renders to application template" do
+      render_inline(component_class.new)
+      expect(page).to have_css('.custom-modal')
     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

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

@@ -24,12 +24,12 @@ RSpec.describe Blacklight::Solr::Repository, :api do
       blacklight_config.document_solr_path = 'abc'
       blacklight_config.solr_path = 'xyz'
       allow(subject.connection).to receive(:send_and_receive).with('abc', anything).and_return(mock_response)
-      expect(subject.find("123")).to be_a_kind_of Blacklight::Solr::Response
+      expect(subject.find("123")).to be_a Blacklight::Solr::Response
     end
 
     it "uses a default :qt param" do
       allow(subject.connection).to receive(:send_and_receive).with('get', hash_including(params: hash_including(ids: '123'))).and_return(mock_response)
-      expect(subject.find("123", {})).to be_a_kind_of Blacklight::Solr::Response
+      expect(subject.find("123", {})).to be_a Blacklight::Solr::Response
     end
 
     context "without a document solr path configured" do
@@ -40,7 +40,7 @@ RSpec.describe Blacklight::Solr::Repository, :api do
       it "uses the default solr path" do
         blacklight_config.solr_path = 'xyz'
         allow(subject.connection).to receive(:send_and_receive).with('xyz', anything).and_return(mock_response)
-        expect(subject.find("123")).to be_a_kind_of Blacklight::Solr::Response
+        expect(subject.find("123")).to be_a Blacklight::Solr::Response
       end
     end
 
@@ -53,14 +53,14 @@ RSpec.describe Blacklight::Solr::Repository, :api do
       it "uses the provided :qt param" do
         blacklight_config.document_solr_request_handler = 'xyz'
         allow(subject.connection).to receive(:send_and_receive).with('select', hash_including(params: { id: '123', qt: 'abc' })).and_return(mock_response)
-        expect(subject.find("123", qt: 'abc')).to be_a_kind_of Blacklight::Solr::Response
+        expect(subject.find("123", qt: 'abc')).to be_a Blacklight::Solr::Response
       end
 
       it "uses the :qt parameter from the default_document_solr_params" do
         blacklight_config.default_document_solr_params[:qt] = 'abc'
         blacklight_config.document_solr_request_handler = 'xyz'
         allow(subject.connection).to receive(:send_and_receive).with('select', hash_including(params: { id: '123', qt: 'abc' })).and_return(mock_response)
-        expect(subject.find("123")).to be_a_kind_of Blacklight::Solr::Response
+        expect(subject.find("123")).to be_a Blacklight::Solr::Response
       end
     end
 
@@ -68,8 +68,26 @@ RSpec.describe Blacklight::Solr::Repository, :api do
       doc_params = ActiveSupport::HashWithIndifferentAccess.new
       allow(subject.connection).to receive(:send_and_receive).with('get', anything).and_return(mock_response)
       response = subject.find("123", doc_params)
-      expect(response).to be_a_kind_of Blacklight::Solr::Response
-      expect(response.params).to be_a_kind_of ActiveSupport::HashWithIndifferentAccess
+      expect(response).to be_a Blacklight::Solr::Response
+      expect(response.params).to be_a ActiveSupport::HashWithIndifferentAccess
+    end
+  end
+
+  describe '#find_many' do
+    context 'with a configured fetch_many_documents_path' do
+      it 'uses the path' do
+        blacklight_config.fetch_many_documents_path = 'documents'
+        allow(subject.connection).to receive(:send_and_receive).with('documents', anything).and_return(mock_response)
+        expect(subject.find_many({})).to be_a Blacklight::Solr::Response
+      end
+    end
+
+    context 'without a configured fetch_many_documents_path' do
+      it 'falls back to the search path' do
+        blacklight_config.solr_path = 'xyz'
+        allow(subject.connection).to receive(:send_and_receive).with('xyz', anything).and_return(mock_response)
+        expect(subject.find_many({})).to be_a Blacklight::Solr::Response
+      end
     end
   end
 
@@ -77,24 +95,24 @@ RSpec.describe Blacklight::Solr::Repository, :api do
     it "uses the search-specific solr path" do
       blacklight_config.solr_path = 'xyz'
       allow(subject.connection).to receive(:send_and_receive).with('xyz', anything).and_return(mock_response)
-      expect(subject.search({})).to be_a_kind_of Blacklight::Solr::Response
+      expect(subject.search({})).to be_a Blacklight::Solr::Response
     end
 
     it "uses the default solr path" do
       allow(subject.connection).to receive(:send_and_receive).with('select', anything).and_return(mock_response)
-      expect(subject.search({})).to be_a_kind_of Blacklight::Solr::Response
+      expect(subject.search({})).to be_a Blacklight::Solr::Response
     end
 
     it "uses a default :qt param" do
       blacklight_config.qt = 'xyz'
       allow(subject.connection).to receive(:send_and_receive).with('select', hash_including(params: { qt: 'xyz' })).and_return(mock_response)
-      expect(subject.search({})).to be_a_kind_of Blacklight::Solr::Response
+      expect(subject.search({})).to be_a Blacklight::Solr::Response
     end
 
     it "uses the provided :qt param" do
       blacklight_config.qt = 'xyz'
       allow(subject.connection).to receive(:send_and_receive).with('select', hash_including(params: { qt: 'abc' })).and_return(mock_response)
-      expect(subject.search(qt: 'abc')).to be_a_kind_of Blacklight::Solr::Response
+      expect(subject.search(qt: 'abc')).to be_a Blacklight::Solr::Response
     end
 
     it "preserves the class of the incoming params" do
@@ -103,8 +121,8 @@ RSpec.describe Blacklight::Solr::Repository, :api do
       allow(subject.connection).to receive(:send_and_receive).with('select', anything).and_return(mock_response)
 
       response = subject.search(search_params)
-      expect(response).to be_a_kind_of Blacklight::Solr::Response
-      expect(response.params).to be_a_kind_of ActiveSupport::HashWithIndifferentAccess
+      expect(response).to be_a Blacklight::Solr::Response
+      expect(response.params).to be_a ActiveSupport::HashWithIndifferentAccess
     end
 
     it "calls send_and_receive with params returned from request factory method" do

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

@@ -247,7 +247,7 @@ RSpec.describe Blacklight::Solr::Response::Facets, :api do
     it "converts the query facets into a double RSolr FacetField" do
       field = subject.aggregations['my_query_facet_field']
 
-      expect(field).to be_a_kind_of Blacklight::Solr::Response::Facets::FacetField
+      expect(field).to be_a Blacklight::Solr::Response::Facets::FacetField
 
       expect(field.name).to eq 'my_query_facet_field'
       expect(field.items.size).to eq 3
@@ -316,7 +316,7 @@ RSpec.describe Blacklight::Solr::Response::Facets, :api do
     it "converts the pivot facet into a double RSolr FacetField" do
       field = subject.aggregations['my_pivot_facet_field']
 
-      expect(field).to be_a_kind_of Blacklight::Solr::Response::Facets::FacetField
+      expect(field).to be_a Blacklight::Solr::Response::Facets::FacetField
 
       expect(field.name).to eq 'my_pivot_facet_field'
 

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

@@ -37,7 +37,7 @@ RSpec.describe Blacklight::Solr::Response::Group, :api do
   describe "#docs" do
     it "is a list of SolrDocuments" do
       subject.docs.each do |doc|
-        expect(doc).to be_a_kind_of SolrDocument
+        expect(doc).to be_a SolrDocument
       end
 
       expect(subject.docs.first.id).to eq 1

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

@@ -79,7 +79,7 @@ RSpec.describe Blacklight::Solr::Response, :api do
     if Kaminari.config.respond_to? :max_pages
       expect(r.max_pages).to be_nil
     end
-    expect(r).to be_a_kind_of Kaminari::PageScopeMethods
+    expect(r).to be_a Kaminari::PageScopeMethods
   end
 
   describe "FacetItem" do
@@ -101,7 +101,7 @@ RSpec.describe Blacklight::Solr::Response, :api do
 
       expect(item.hits).to eq 15
       expect(item.value).to eq 'value'
-      expect(item).to be_a_kind_of(OpenStruct)
+      expect(item).to be_a(OpenStruct)
     end
 
     it "provides a label accessor" do

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

@@ -591,7 +591,7 @@ RSpec.describe Blacklight::Solr::SearchBuilderBehavior, :api do
 
       subject.add_facet_fq_to_solr(solr_parameters)
 
-      expect(solr_parameters[:fq]).to be_a_kind_of Array
+      expect(solr_parameters[:fq]).to be_a Array
     end
 
     context "facet not defined in config" do

data/spec/models/bookmark_spec.rb

@@ -30,7 +30,7 @@ RSpec.describe Bookmark do
 
   describe "#document" do
     it "is a SolrDocument with just an id field" do
-      expect(subject.document).to be_a_kind_of SolrDocument
+      expect(subject.document).to be_a SolrDocument
       expect(subject.document.id).to eq 'u001'
     end
   end

data/spec/presenters/blacklight/document_presenter_spec.rb

@@ -50,14 +50,14 @@ RSpec.describe Blacklight::DocumentPresenter do
 
   describe '#thumbnail' do
     it 'returns a thumbnail presenter' do
-      expect(presenter.thumbnail).to be_a_kind_of(Blacklight::ThumbnailPresenter)
+      expect(presenter.thumbnail).to be_a(Blacklight::ThumbnailPresenter)
     end
 
     it 'use the configured thumbnail presenter' do
       custom_presenter_class = Class.new(Blacklight::ThumbnailPresenter)
       blacklight_config.index.thumbnail_presenter = custom_presenter_class
 
-      expect(presenter.thumbnail).to be_a_kind_of custom_presenter_class
+      expect(presenter.thumbnail).to be_a custom_presenter_class
     end
   end
 

data/spec/presenters/blacklight/facet_checkbox_item_presenter_spec.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Blacklight::FacetCheckboxItemPresenter, type: :presenter do
+  subject(:presenter) do
+    described_class.new(facet_item, facet_config, view_context, facet_field, search_state)
+  end
+
+  let(:facet_item) { Blacklight::Solr::Response::Facets::FacetItem.new(value: 'Book', hits: 30) }
+  let(:facet_config) { Blacklight::Configuration::FacetField.new(key: 'format') }
+  let(:view_context) { controller.view_context }
+  let(:filter_field) { Blacklight::SearchState::FilterField.new(facet_config, search_state) }
+  let(:facet_field) { Blacklight::Solr::Response::Facets::FacetField.new('format', [facet_item]) }
+  let(:params) { ActionController::Parameters.new(f_inclusive: { format: ["Book"] }) }
+  let(:blacklight_config) { Blacklight::Configuration.new }
+  let(:search_state) { Blacklight::SearchState.new(params, blacklight_config) }
+
+  before do
+    blacklight_config.add_facet_field 'format'
+  end
+
+  describe '#selected?' do
+    subject { presenter.selected? }
+
+    context 'with a matching inclusive filter' do
+      it { is_expected.to be true }
+    end
+
+    context 'with an inclusive filter that does not match' do
+      let(:params) { ActionController::Parameters.new(f_inclusive: { format: ["Manuscript"] }) }
+
+      it { is_expected.to be false }
+    end
+
+    context 'with a matching exclusive filter' do
+      let(:params) { ActionController::Parameters.new(f: { format: ["Book"] }) }
+
+      it { is_expected.to be false }
+    end
+  end
+end

data/spec/presenters/blacklight/facet_field_presenter_spec.rb

@@ -51,6 +51,20 @@ RSpec.describe Blacklight::FacetFieldPresenter, type: :presenter do
     it "is false if no value for facet is selected" do
       expect(presenter.active?).to be false
     end
+
+    context 'with an advanced search action' do
+      before { controller.params[:action] = 'advanced_search' }
+
+      it "is true if any value for inclusive facet is selected" do
+        search_state.params[:f_inclusive] = ActiveSupport::HashWithIndifferentAccess.new(key: [1])
+        expect(presenter.active?).to be true
+      end
+
+      it "is false if no value for inclusive facet is selected" do
+        search_state.params[:f] = ActiveSupport::HashWithIndifferentAccess.new(key: [1])
+        expect(presenter.active?).to be false
+      end
+    end
   end
 
   describe '#in_modal?' do

data/spec/requests/load_suggestions_spec.rb

@@ -6,11 +6,11 @@ RSpec.describe 'GET /catalog/suggest' do
   it 'returns suggestions' do
     get '/catalog/suggest?q=new'
     expect(response.body).to eq <<-RESULT
-  <li role="option"><span>new jersey</span></li>
-  <li role="option"><span>new jersey bridgeton biography</span></li>
-  <li role="option"><span>new jersey bridgeton history</span></li>
-  <li role="option"><span>new york</span></li>
-  <li role="option"><span>nuwākshūṭ</span></li>
+  <li role="option" class="dropdown-item"><span>new jersey</span></li>
+  <li role="option" class="dropdown-item"><span>new jersey bridgeton biography</span></li>
+  <li role="option" class="dropdown-item"><span>new jersey bridgeton history</span></li>
+  <li role="option" class="dropdown-item"><span>new york</span></li>
+  <li role="option" class="dropdown-item"><span>nuwākshūṭ</span></li>
     RESULT
   end
 end

data/spec/services/blacklight/search_service_spec.rb

@@ -77,7 +77,7 @@ RSpec.describe Blacklight::SearchService, :api do
       end
 
       it "returns a grouped response" do
-        expect(service.search_results).to be_a_kind_of Blacklight::Solr::Response::GroupResponse
+        expect(service.search_results).to be_a Blacklight::Solr::Response::GroupResponse
       end
     end
 
@@ -93,7 +93,7 @@ RSpec.describe Blacklight::SearchService, :api do
 
       it "returns a grouped response" do
         solr_response = service.search_results
-        expect(solr_response).to be_a_kind_of Blacklight::Solr::Response::GroupResponse
+        expect(solr_response).to be_a Blacklight::Solr::Response::GroupResponse
         expect(solr_response.group_field).to eq "title_si"
       end
     end

data/spec/spec_helper.rb

@@ -49,8 +49,11 @@ RSpec.configure do |config|
   # When we're testing the API, only run the api tests
   config.filter_run api: true if ENV['BLACKLIGHT_API_TEST'].present?
 
-  # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
-  config.fixture_path = Rails.root.join("spec/fixtures")
+  if Rails.version.to_f >= 7.1
+    config.fixture_paths = [Rails.root.join("spec/fixtures")]
+  else
+    config.fixture_path = Rails.root.join("spec/fixtures")
+  end
 
   # If you're not using ActiveRecord, or you'd prefer not to run each of your
   # examples within a transaction, remove the following line or assign false

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

@@ -39,7 +39,7 @@ class TestAppGenerator < Rails::Generators::Base
     src_template = File.join(Blacklight::Engine.root, 'app', 'components', 'blacklight', 'top_navbar_component.html.erb')
     target_template = File.join('app', 'components', 'blacklight', 'top_navbar_component.html.erb')
     create_file(target_template) do
-      File.read(src_template).gsub('role="navigation"', 'role="navigation" data-template-override="top_navbar_component"')
+      File.read(src_template).gsub('aria-label', 'data-template-override="top_navbar_component" aria-label')
     end
   end
 end

data/tasks/blacklight.rake

@@ -21,18 +21,18 @@ def system_with_error_handling(*args)
 end
 
 def with_solr(&block)
-  # We're being invoked by the app entrypoint script and solr is already up via docker-compose
+  # We're being invoked by the app entrypoint script and solr is already up via docker compose
   if ENV['SOLR_ENV'] == 'docker-compose'
     yield
-  elsif system('docker-compose -v')
-    # We're not running docker-compose up but still want to use a docker instance of solr.
+  elsif system('docker compose version')
+    # We're not running `docker compose up' but still want to use a docker instance of solr.
     begin
       puts "Starting Solr"
-      system_with_error_handling "docker-compose up -d solr"
+      system_with_error_handling "docker compose up -d solr"
       yield
     ensure
       puts "Stopping Solr"
-      system_with_error_handling "docker-compose stop solr"
+      system_with_error_handling "docker compose stop solr"
     end
   else
     SolrWrapper.wrap do |solr|
@@ -47,7 +47,7 @@ task ci: ['build:npm'] do
   with_solr do
     Rake::Task['blacklight:internal:seed'].invoke
     within_test_app do
-      # Precompiles the javascript
+      # Precompiles the assets
       system "bin/rake spec:prepare"
     end
     Rake::Task['blacklight:coverage'].invoke