blacklight 7.18.1 → 7.20.0

data/spec/helpers/blacklight_helper_spec.rb

@@ -320,6 +320,24 @@ RSpec.describe BlacklightHelper do
       response = helper.render_document_index_with_view :view_type, [obj1, obj1]
       expect(response).to have_selector "div#documents"
     end
+
+    context 'with a template partial provided by the view config' do
+      before do
+        blacklight_config.view.gallery(template: '/my/partial')
+      end
+
+      def stub_template(hash)
+        view.view_paths.unshift(ActionView::FixtureResolver.new(hash))
+      end
+
+      it 'renders that template' do
+        stub_template 'my/_partial.html.erb' => 'some content'
+
+        response = helper.render_document_index_with_view :gallery, [obj1, obj1]
+
+        expect(response).to eq 'some content'
+      end
+    end
   end
 
   describe "#document_index_view_type" do

data/spec/lib/blacklight/nested_open_struct_with_hash_access_spec.rb

@@ -1,6 +1,26 @@
 # frozen_string_literal: true
 
 RSpec.describe Blacklight::NestedOpenStructWithHashAccess do
+  subject { described_class.new(Blacklight::OpenStructWithHashAccess) }
+
+  describe '#key' do
+    context 'for an object provided by the initializer' do
+      subject { described_class.new(Blacklight::OpenStructWithHashAccess, a: { b: 1 }) }
+
+      it 'copies the key to the initialized value' do
+        expect(subject.a).to have_attributes key: :a, b: 1
+      end
+    end
+
+    context 'for an object provided through assignment' do
+      it 'copies the key to the initialized value' do
+        subject.a!
+
+        expect(subject.a).to have_attributes key: :a
+      end
+    end
+  end
+
   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
@@ -28,13 +48,15 @@ RSpec.describe Blacklight::NestedOpenStructWithHashAccess do
     subject { described_class.new(Blacklight::Configuration::Field) }
 
     it 'strips the trailing !' do
-      subject.blaH!
+      subject.blah!
       expect(subject.blah).to have_attributes(key: :blah)
+      expect(subject.keys).to eq [:blah]
     end
 
     it 'supports direct assignment' do
       subject.blah = '123'
       expect(subject.blah).to eq '123'
+      expect(subject.keys).to eq [:blah]
     end
   end
 end

data/spec/lib/blacklight/search_state/filter_field_spec.rb

@@ -159,6 +159,33 @@ RSpec.describe Blacklight::SearchState::FilterField do
         expect(new_state.filter('another_field').values).to eq ['3']
       end
     end
+
+    context "With facet.missing field" do
+      let(:params) do
+        { f: { some_field: [""], "-some_field:": [""] } }
+      end
+
+      it "removes facet.missing facet params" do
+        filter = search_state.filter("some_field")
+        new_state = filter.remove(OpenStruct.new(fq: "-some_field:[* TO *]"))
+
+        expect(new_state.params).to eq("f" => {})
+      end
+    end
+
+    context "With facet.missing field value" do
+      let(:params) do
+        { f: { some_field: [""], "-some_field:": [""] } }
+      end
+
+      it "removes facet.missing facet params" do
+        missing = I18n.t("blacklight.search.facets.missing")
+        filter = search_state.filter("some_field")
+        new_state = filter.remove(missing)
+
+        expect(new_state.params).to eq("f" => {})
+      end
+    end
   end
 
   describe '#values' do

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/response/group_response_spec.rb

@@ -69,8 +69,9 @@ RSpec.describe Blacklight::Solr::Response::GroupResponse, api: true do
     it "accesses a custom field grouped i18n key" do
       allow(I18n).to receive(:t).with(
         'blacklight.entry_name.grouped.result_group_ssi',
-        default: :'blacklight.entry_name.grouped.default'
-      ).and_return('cool group')
+        default: :'blacklight.entry_name.grouped.default',
+        count: 2
+      ).and_return('cool groups')
       expect(group.entry_name(count: 2)).to eq 'cool groups'
     end
 

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

@@ -27,6 +27,24 @@ RSpec.describe Blacklight::Solr::SearchBuilderBehavior, api: true do
     it "uses the class-level default_processor_chain" do
       expect(subject.processor_chain).to eq search_builder_class.default_processor_chain
     end
+
+    it "appends the :add_missing_field_query processor" do
+      expect(subject.processor_chain).to include(:add_missing_field_query)
+    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
@@ -304,7 +322,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
@@ -809,4 +826,13 @@ RSpec.describe Blacklight::Solr::SearchBuilderBehavior, api: true do
       expect(subject.to_hash).to include q: '{!lucene}id:(1 OR 2 OR 3)'
     end
   end
+
+  describe "#add_missing_field_query" do
+    it "precesses facet.missing query" do
+      subject.with("f" => { "-hello:" => [""] })
+      solr_params = { "facet.missing" => true, fq: [] }
+
+      expect(subject.add_missing_field_query(solr_params)).to eq(["-hello:[* TO *]"])
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -19,18 +19,24 @@ EngineCart.load_application!
 require 'rspec/rails'
 require 'rspec/its'
 require 'rspec/collection_matchers'
-require 'capybara/rspec'
-require 'capybara/apparition'
+require 'capybara/rails'
+require 'webdrivers'
+require 'selenium-webdriver'
 require 'equivalent-xml'
+require 'axe-rspec'
 
-Capybara.javascript_driver = :apparition
-Capybara.disable_animation = true
-# Capybara.enable_aria_label = true
+Capybara.javascript_driver = :headless_chrome
 
-# Uncomment for a headed browser
-# Capybara.register_driver :apparition do |app|
-#   Capybara::Apparition::Driver.new(app, headless: false)
-# end
+Capybara.register_driver :headless_chrome do |app|
+  Capybara::Selenium::Driver.load_selenium
+  browser_options = ::Selenium::WebDriver::Chrome::Options.new.tap do |opts|
+    opts.args << '--headless'
+    opts.args << '--disable-gpu'
+    opts.args << '--no-sandbox'
+    opts.args << '--window-size=1280,1696'
+  end
+  Capybara::Selenium::Driver.new(app, browser: :chrome, options: browser_options)
+end
 
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.
@@ -62,6 +68,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/test_app_templates/lib/generators/test_app_generator.rb

@@ -17,9 +17,6 @@ class TestAppGenerator < Rails::Generators::Base
     options = '--devise'
     if ENV['BLACKLIGHT_API_TEST']
       options += ' --skip-assets'
-      inject_into_class 'app/controllers/application_controller.rb', 'ApplicationController' do
-        "  include ActionController::MimeResponds\n" # see https://github.com/projectblacklight/blacklight/issues/1894
-      end
     end
 
     generate 'blacklight:install', options

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 7.18.1
+  version: 7.20.0
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -14,10 +14,10 @@ authors:
 - Dan Funk
 - Naomi Dushay
 - Justin Coyne
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-04-26 00:00:00.000000000 Z
+date: 2021-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -127,16 +127,16 @@ dependencies:
   name: view_component
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.28.0
+        version: 2.42.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.28.0
+        version: 2.42.0
 - !ruby/object:Gem::Dependency
   name: rsolr
   requirement: !ruby/object:Gem::Requirement
@@ -199,6 +199,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: axe-core-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -214,7 +228,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3'
 - !ruby/object:Gem::Dependency
-  name: apparition
+  name: webdrivers
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -762,8 +790,10 @@ files:
 - spec/features/advanced_search_spec.rb
 - spec/features/alternate_controller_spec.rb
 - spec/features/autocomplete_spec.rb
+- spec/features/axe_spec.rb
 - spec/features/bookmarks_spec.rb
 - spec/features/did_you_mean_spec.rb
+- spec/features/facet_missing_spec.rb
 - spec/features/facets_spec.rb
 - spec/features/record_view_spec.rb
 - spec/features/search_context_spec.rb
@@ -849,6 +879,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
@@ -887,7 +918,7 @@ homepage: http://projectblacklight.org/
 licenses:
 - Apache 2.0
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -902,8 +933,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
-signing_key:
+rubygems_version: 3.1.2
+signing_key: 
 specification_version: 4
 summary: Blacklight provides a discovery interface for any Solr (http://lucene.apache.org/solr)
   index.
@@ -933,8 +964,10 @@ test_files:
 - spec/features/advanced_search_spec.rb
 - spec/features/alternate_controller_spec.rb
 - spec/features/autocomplete_spec.rb
+- spec/features/axe_spec.rb
 - spec/features/bookmarks_spec.rb
 - spec/features/did_you_mean_spec.rb
+- spec/features/facet_missing_spec.rb
 - spec/features/facets_spec.rb
 - spec/features/record_view_spec.rb
 - spec/features/search_context_spec.rb
@@ -1020,6 +1053,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