blacklight 7.17.2 → 7.19.2

data/spec/models/blacklight/configuration_spec.rb

@@ -621,4 +621,14 @@ RSpec.describe "Blacklight::Configuration", api: true do
       end
     end
   end
+
+  describe '#freeze' do
+    it 'freezes the configuration' do
+      config.freeze
+
+      expect(config.a).to be_nil
+      expect { config.a = '123' }.to raise_error(FrozenError)
+      expect { config.view.a = '123' }.to raise_error(FrozenError)
+    end
+  end
 end

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

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

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

@@ -29,6 +29,20 @@ RSpec.describe Blacklight::Solr::SearchBuilderBehavior, api: true do
     end
   end
 
+  context 'with merged parameters from the defaults + the search field' do
+    before do
+      blacklight_config.default_solr_params = { json: { whatever: [1, 2, 3] } }
+      blacklight_config.search_fields['all_fields'].solr_parameters = { json: { and_also: [4, 5, 6] } }
+    end
+
+    let(:user_params) { { search_field: 'all_fields' } }
+
+    it 'deep merges hash values' do
+      expect(subject.to_hash.dig(:json, :whatever)).to eq [1, 2, 3]
+      expect(subject.to_hash.dig(:json, :and_also)).to eq [4, 5, 6]
+    end
+  end
+
   context "with a complex parameter environment" do
     subject { search_builder.with(user_params).processed_parameters }
 
@@ -304,7 +318,6 @@ RSpec.describe Blacklight::Solr::SearchBuilderBehavior, api: true do
 
       it "does not include weird keys not in field definition" do
         expect(subject[:phrase_filters]).to be_nil
-        expect(subject[:fq]).to eq []
         expect(subject[:commit]).to be_nil
         expect(subject[:action]).to be_nil
         expect(subject[:controller]).to be_nil
@@ -800,4 +813,13 @@ RSpec.describe Blacklight::Solr::SearchBuilderBehavior, api: true do
       expect(subject.to_hash.with_indifferent_access.dig(:json, :query, :bool, :must, 1, :edismax, :qf)).to eq '${author_qf}'
     end
   end
+
+  describe '#where' do
+    let(:user_params) { {} }
+
+    it 'adds additional query filters on the search' do
+      subject.where(id: [1, 2, 3])
+      expect(subject.to_hash).to include q: '{!lucene}id:(1 OR 2 OR 3)'
+    end
+  end
 end

data/spec/services/blacklight/search_service_spec.rb

@@ -477,7 +477,7 @@ RSpec.describe Blacklight::SearchService, api: true do
     end
 
     before do
-      blacklight_config.view.opensearch.title_field = :field
+      blacklight_config.view.opensearch(title_field: :field)
       allow(repository).to receive(:search).and_return(mock_response)
     end
 

data/spec/spec_helper.rb

@@ -62,6 +62,7 @@ RSpec.configure do |config|
   config.infer_spec_type_from_file_location!
   config.include PresenterTestHelpers, type: :presenter
   config.include ViewComponent::TestHelpers, type: :component
+  config.include ViewComponentCapybaraTestHelpers, type: :component
 
   config.include(ControllerLevelHelpers, type: :helper)
   config.before(:each, type: :helper) { initialize_controller_helpers(helper) }

data/spec/support/view_component_capybara_test_helpers.rb

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

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

@@ -3,7 +3,7 @@
 RSpec.describe "catalog/constraints" do
   let :blacklight_config do
     Blacklight::Configuration.new do |config|
-      config.view.xyz
+      config.view.xyz({})
     end
   end
 

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

@@ -46,4 +46,13 @@ RSpec.describe "catalog/_document" do
     expect(rendered).to have_selector 'article.document header', text: '22. xyz'
     expect(rendered).not_to match(/partial/)
   end
+
+  it 'renders the partial using a provided view config' do
+    view_config = Blacklight::Configuration::ViewConfig.new partials: %w[a]
+    stub_template "catalog/_a_default.html.erb" => "partial"
+
+    render partial: "catalog/document", locals: { document: document, document_counter: 1, view_config: view_config }
+
+    expect(rendered).to match(/partial/)
+  end
 end

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

@@ -2,7 +2,7 @@
 
 RSpec.describe "catalog/_document_list", type: :view do
   before do
-    allow(view).to receive_messages(document_index_view_type: "some-view", documents: [])
+    allow(view).to receive_messages(document_index_view_type: "some-view", documents: [], blacklight_config: nil)
   end
 
   it "includes a class for the current view" do

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

@@ -27,14 +27,14 @@ RSpec.describe "catalog/facet_layout" do
 
   it "is collapsable" do
     render partial: 'catalog/facet_layout', locals: { facet_field: facet_field }
-    expect(rendered).to have_selector 'button.collapsed[data-toggle="collapse"][aria-expanded="false"]'
+    expect(rendered).to have_selector 'button.collapsed[data-toggle="collapse"][data-bs-toggle="collapse"][aria-expanded="false"]'
     expect(rendered).to have_selector '.collapse .card-body'
   end
 
   it "is configured to be open by default" do
     allow(facet_field).to receive_messages(collapse: false)
     render partial: 'catalog/facet_layout', locals: { facet_field: facet_field }
-    expect(rendered).to have_selector 'button[data-toggle="collapse"][aria-expanded="true"]'
+    expect(rendered).to have_selector 'button[data-toggle="collapse"][data-bs-toggle="collapse"][aria-expanded="true"]'
     expect(rendered).not_to have_selector '.card-header.collapsed'
     expect(rendered).to have_selector '.collapse.show .card-body'
   end

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

@@ -20,9 +20,9 @@ RSpec.describe "catalog/_view_type_group" do
   it "displays the group" do
     blacklight_config.configure do |config|
       config.view.delete(:list)
-      config.view.a.icon = :list
-      config.view.b.icon = :list
-      config.view.c.icon = :list
+      config.view.a(icon: :list)
+      config.view.b(icon: :list)
+      config.view.c(icon: :list)
     end
     render partial: 'catalog/view_type_group'
     expect(rendered).to have_selector('.btn-group.view-type-group')
@@ -37,8 +37,8 @@ RSpec.describe "catalog/_view_type_group" do
   it "sets the current view to 'active'" do
     blacklight_config.configure do |config|
       config.view.delete(:list)
-      config.view.a.icon = :list
-      config.view.b.icon = :list
+      config.view.a(icon: :list)
+      config.view.b(icon: :list)
     end
     render partial: 'catalog/view_type_group'
     expect(rendered).to have_selector('.active', text: 'a')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 7.17.2
+  version: 7.19.2
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -17,7 +17,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-04-22 00:00:00.000000000 Z
+date: 2021-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -849,6 +849,7 @@ files:
 - spec/support/features.rb
 - spec/support/features/session_helpers.rb
 - spec/support/presenter_test_helpers.rb
+- spec/support/view_component_capybara_test_helpers.rb
 - spec/test_app_templates/Gemfile.extra
 - spec/test_app_templates/lib/generators/test_app_generator.rb
 - spec/views/catalog/_constraints.html.erb_spec.rb
@@ -1020,6 +1021,7 @@ test_files:
 - spec/support/features.rb
 - spec/support/features/session_helpers.rb
 - spec/support/presenter_test_helpers.rb
+- spec/support/view_component_capybara_test_helpers.rb
 - spec/test_app_templates/Gemfile.extra
 - spec/test_app_templates/lib/generators/test_app_generator.rb
 - spec/views/catalog/_constraints.html.erb_spec.rb