blacklight 7.13.2 → 7.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f57c80d2b77a3b8bd0d536f3800fad183aa43d5aec10b71f921dfb23cbb6b26c
-  data.tar.gz: 9748a16edba74f0a1f24b1d6813987196088e1d217dd621b6455ca235aec37be
+  metadata.gz: 125e5713e43315d9fdbae35677048bb1a1bb9830970f8ff43101ecaed9979385
+  data.tar.gz: 34d83a1474edd010642bc2ddf9f72a5409dd66f80bd28f3e6576fafdaa119475
 SHA512:
-  metadata.gz: af48c90bc958243c5177660307c059a974c647f27b1fd890061e6efbba253b68d4690e46547b488fee11fe92140db88d39051a0a666e656f478d89e9650fd541
-  data.tar.gz: '019a8e8383aff4582a98a74348c2b40cf7e57aa121213fbd43702c13ff66f2f30c455d43c06dfa0f26c39ebc74f9d34ff40f72b72ed30bdd180384f58deb25cb'
+  metadata.gz: ab411c9cd2690a01b3d61fa1c8f602b910686b920e26ac638eddfb08e4b43af86d6beca036509056f510a2d56041059dadcfa0ee92cccedcbe238bfe5d7abc4b
+  data.tar.gz: ed2cea2667023dbe7720c4939f4dc4b3cd98d26be0e7a1bc89dba416d0b077bf3792b810fe9e479ef5890f2cad3b3003154822778722b5528051df106f570e51

data/.github/workflows/ruby.yml

@@ -30,7 +30,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: [2.6, 2.7]
+        ruby: [2.7, 3.0]
     steps:
     - uses: actions/checkout@v2
     - name: Set up Ruby
@@ -43,11 +43,31 @@ jobs:
       run: bundle exec rake ci
       env:
         ENGINE_CART_RAILS_OPTIONS: '--skip-git --skip-listen --skip-spring --skip-keeps --skip-action-cable --skip-coffee --skip-test'
-  test_rails5:
+  test_rails6_0:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: [2.5, 2.6]
+        ruby: [2.6]
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+    - name: Install dependencies
+      run: bundle install
+      env:
+        RAILS_VERSION: 6.0.3.4
+    - name: Run tests
+      run: bundle exec rake ci
+      env:
+        RAILS_VERSION: 6.0.3.4
+        ENGINE_CART_RAILS_OPTIONS: '--skip-git --skip-listen --skip-spring --skip-keeps --skip-action-cable --skip-coffee --skip-test'
+  test_rails5_2:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby: [2.5]
     steps:
     - uses: actions/checkout@v2
     - name: Set up Ruby

data/README.md

@@ -1,6 +1,6 @@
 # Blacklight
 
-[![Build Status](https://travis-ci.org/projectblacklight/blacklight.png?branch=master)](https://travis-ci.org/projectblacklight/blacklight) [![Gem Version](https://badge.fury.io/rb/blacklight.png)](http://badge.fury.io/rb/blacklight) [![Test Coverage](https://api.codeclimate.com/v1/badges/83fd270492c136594e59/test_coverage)](https://codeclimate.com/github/projectblacklight/blacklight/test_coverage)
+[![Build Status](https://travis-ci.com/projectblacklight/blacklight.png?branch=master)](https://travis-ci.com/projectblacklight/blacklight) [![Gem Version](https://badge.fury.io/rb/blacklight.png)](http://badge.fury.io/rb/blacklight) [![Test Coverage](https://api.codeclimate.com/v1/badges/83fd270492c136594e59/test_coverage)](https://codeclimate.com/github/projectblacklight/blacklight/test_coverage)
 
 Blacklight is an open source Solr user interface discovery platform.
 You can use Blacklight to enable searching and browsing of your collections.

data/VERSION

@@ -1 +1 @@
-7.13.2
+7.14.0

data/app/assets/javascripts/blacklight/blacklight.js

@@ -99,6 +99,7 @@ Blacklight.onLoad(function () {
 Blacklight.onLoad(function () {
   // Button clicks should change focus. As of 10/3/19, Firefox for Mac and
   // Safari both do not set focus to a button on button click.
+  // See https://zellwk.com/blog/inconsistent-button-behavior/ for background information
   document.querySelectorAll('button.collapse-toggle').forEach(button => {
     button.addEventListener('click', () => {
       event.target.focus();
@@ -349,8 +350,9 @@ Blacklight.modal.modalCloseSelector = '[data-blacklight-modal~=close]'; // Calle
 // to show to user in modal.  Right now called only for extreme
 // network errors.
 
-Blacklight.modal.onFailure = function (data) {
-  var contents = '<div class="modal-header">' + '<div class="modal-title">Network Error</div>' + '<button type="button" class="blacklight-modal-close close" data-dismiss="modal" aria-label="Close">' + '  <span aria-hidden="true">&times;</span>' + '</button>';
+Blacklight.modal.onFailure = function (jqXHR, textStatus, errorThrown) {
+  console.error('Server error:', this.url, jqXHR.status, errorThrown);
+  var contents = '<div class="modal-header">' + '<div class="modal-title">There was a problem with your request.</div>' + '<button type="button" class="blacklight-modal-close close" data-dismiss="modal" aria-label="Close">' + '  <span aria-hidden="true">&times;</span>' + '</button></div>' + ' <div class="modal-body"><p>Expected a successful response from the server, but got an error</p>' + '<pre>' + this.type + ' ' + this.url + "\n" + jqXHR.status + ': ' + errorThrown + '</pre></div>';
   $(Blacklight.modal.modalSelector).find('.modal-content').html(contents);
   $(Blacklight.modal.modalSelector).modal('show');
 };

data/app/components/blacklight/constraints_component.rb

@@ -22,7 +22,7 @@ module Blacklight
           @query_constraint_component.new(
             search_state: @search_state,
             value: @search_state.query_param,
-            label: @view_context.constraint_query_label(@search_state.params),
+            label: label,
             remove_path: @view_context.remove_constraint_url(@search_state),
             classes: 'query'
           )
@@ -46,6 +46,12 @@ module Blacklight
 
     private
 
+    def label
+      Deprecation.silence(Blacklight::ConfigurationHelperBehavior) do
+        @view_context.constraint_query_label(@search_state.params)
+      end
+    end
+
     def facet_item_presenters
       Deprecation.silence(Blacklight::SearchState) do
         @search_state.filter_params.each_pair.flat_map do |facet, values|

data/app/components/blacklight/document/thumbnail_component.html.erb

@@ -6,7 +6,7 @@
       <% warn_about_deprecated_behavior %>
       <%= value %>
     <% else %>
-      <%= @view_context.link_to_document(@presenter.document, value, 'aria-hidden': true, tabindex: -1, counter: @counter) %>
+      <%= helpers.link_to_document(@presenter.document, value, 'aria-hidden': true, tabindex: -1, counter: @counter) %>
     <% end %>
   </div>
 <% end %>

data/app/components/blacklight/document/thumbnail_component.rb

@@ -10,7 +10,7 @@ module Blacklight
       def initialize(presenter:, counter:)
         @presenter = presenter
         @counter = counter
-        @use_thumbnail_tag = @presenter.thumbnail != Blacklight::ThumbnailPresenter
+        @use_thumbnail_tag = !@presenter.thumbnail.instance_of?(Blacklight::ThumbnailPresenter)
       end
 
       def render?

data/app/components/blacklight/hidden_search_state_component.rb

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+module Blacklight
+  # Writes out zero or more <input type="hidden"> elements, completely
+  # representing a hash passed in using Rails-style request parameters
+  # for hashes nested with arrays and other hashes.
+  class HiddenSearchStateComponent < ::ViewComponent::Base
+    # @param [Hash] hash
+    def initialize(params:)
+      Deprecation.warn(self, "Passing page as a parameter to HiddenSearchStateComponent is deprecated and will not be supported in Blacklight 8") if params.key?(:page)
+      @params = params.except(:utf8)
+    end
+
+    def call
+      hidden_fields = []
+      flatten_hash(@params).each do |name, value|
+        value = Array.wrap(value)
+        value.each do |v|
+          hidden_fields << hidden_field_tag(name, v.to_s, id: nil)
+        end
+      end
+
+      safe_join(hidden_fields, "\n")
+    end
+
+    private
+
+    def flatten_hash(hash = params, ancestor_names = [])
+      flat_hash = {}
+      hash.each do |k, v|
+        names = Array.new(ancestor_names)
+        names << k
+        if v.is_a?(Hash)
+          flat_hash.merge!(flatten_hash(v, names))
+        else
+          key = flat_hash_key(names)
+          key += "[]" if v.is_a?(Array)
+          flat_hash[key] = v
+        end
+      end
+
+      flat_hash
+    end
+
+    def flat_hash_key(names)
+      names = Array.new(names)
+      name = names.shift.to_s.dup
+      names.each do |n|
+        name << "[#{n}]"
+      end
+      name
+    end
+  end
+end

data/app/helpers/blacklight/component_helper_behavior.rb

@@ -10,7 +10,7 @@ module Blacklight
     deprecation_deprecate :document_action_label
 
     # @deprecated
-    def document_action_path action_opts, url_opts = nil
+    def document_action_path action_opts, url_opts = {}
       if action_opts.path
         send(action_opts.path, url_opts)
       elsif url_opts[:id].class.respond_to?(:model_name)

data/app/helpers/blacklight/hash_as_hidden_fields_helper_behavior.rb

@@ -21,43 +21,7 @@ module Blacklight::HashAsHiddenFieldsHelperBehavior
   # @param [Hash] hash
   # @return [String]
   def render_hash_as_hidden_fields(hash)
-    hidden_fields = []
-    flatten_hash(hash).each do |name, value|
-      value = Array.wrap(value)
-      value.each do |v|
-        hidden_fields << hidden_field_tag(name, v.to_s, id: nil)
-      end
-    end
-
-    safe_join(hidden_fields, "\n")
-  end
-  deprecation_deprecate render_hash_as_hidden_fields: 'Moving to a private method of Blacklight::SearchBarComponent'
-
-  private
-
-  def flatten_hash(hash = params, ancestor_names = [])
-    flat_hash = {}
-    hash.each do |k, v|
-      names = Array.new(ancestor_names)
-      names << k
-      if v.is_a?(Hash)
-        flat_hash.merge!(flatten_hash(v, names))
-      else
-        key = flat_hash_key(names)
-        key += "[]" if v.is_a?(Array)
-        flat_hash[key] = v
-      end
-    end
-
-    flat_hash
-  end
-
-  def flat_hash_key(names)
-    names = Array.new(names)
-    name = names.shift.to_s.dup
-    names.each do |n|
-      name << "[#{n}]"
-    end
-    name
+    render Blacklight::HiddenSearchStateComponent.new(params: hash)
   end
+  deprecation_deprecate render_hash_as_hidden_fields: 'Use Blacklight::HiddenSearchStateComponent instead'
 end

data/app/helpers/blacklight/icon_helper_behavior.rb

@@ -12,7 +12,7 @@ module Blacklight::IconHelperBehavior
   def blacklight_icon(icon_name, options = {})
     Rails.cache.fetch([:blacklight_icons, icon_name, options]) do
       icon = Blacklight::Icon.new(icon_name, **options)
-      tag.span(icon.svg.html_safe, icon.options)
+      tag.span(icon.svg.html_safe, **icon.options)
     end
   end
 end

data/app/javascript/blacklight/button_focus.js

@@ -1,6 +1,7 @@
 Blacklight.onLoad(function() {
   // Button clicks should change focus. As of 10/3/19, Firefox for Mac and
   // Safari both do not set focus to a button on button click.
+  // See https://zellwk.com/blog/inconsistent-button-behavior/ for background information
   document.querySelectorAll('button.collapse-toggle').forEach((button) => {
     button.addEventListener('click', () => {
       event.target.focus();

data/app/javascript/blacklight/modal.js

@@ -101,12 +101,18 @@ Blacklight.modal.modalCloseSelector   = '[data-blacklight-modal~=close]';
 // Called on fatal failure of ajax load, function returns content
 // to show to user in modal.  Right now called only for extreme
 // network errors.
-Blacklight.modal.onFailure = function(data) {
-  var contents =  '<div class="modal-header">' +
-            '<div class="modal-title">Network Error</div>' +
+Blacklight.modal.onFailure = function(jqXHR, textStatus, errorThrown) {
+  console.error('Server error:', this.url, jqXHR.status, errorThrown);
+
+  var contents = '<div class="modal-header">' +
+            '<div class="modal-title">There was a problem with your request.</div>' +
             '<button type="button" class="blacklight-modal-close close" data-dismiss="modal" aria-label="Close">' +
             '  <span aria-hidden="true">&times;</span>' +
-            '</button>';
+            '</button></div>' +
+            ' <div class="modal-body"><p>Expected a successful response from the server, but got an error</p>' +
+            '<pre>' +
+            this.type + ' ' + this.url + "\n" + jqXHR.status + ': ' + errorThrown +
+            '</pre></div>';
   $(Blacklight.modal.modalSelector).find('.modal-content').html(contents);
   $(Blacklight.modal.modalSelector).modal('show');
 }

data/app/presenters/blacklight/facet_item_presenter.rb

@@ -46,7 +46,7 @@ module Blacklight
         facet_config.query[value][:label]
       elsif facet_config.date
         localization_options = facet_config.date == true ? {} : facet_config.date
-        I18n.l(Time.zone.parse(value), localization_options)
+        I18n.l(Time.zone.parse(value), **localization_options)
       else
         value
       end

data/app/views/bookmarks/_tools.html.erb

@@ -1,5 +1,5 @@
 <% if render_show_doc_actions_method_from_blacklight? %>
-  <%= render(Blacklight::Document::ActionsComponent.new(document: nil, tag: 'ul', classes: "#{controller_name}Tools nav nav-pills", wrapping_tag: 'li', wrapping_classes: 'nav-item', actions: document_actions(document_list), options: { document_list: @response.documents }, url_opts: Blacklight::Parameters.sanitize(params.to_unsafe_h))) %>
+  <%= render(Blacklight::Document::ActionsComponent.new(document: nil, tag: 'ul', classes: "#{controller_name}Tools nav nav-pills", wrapping_tag: 'li', wrapping_classes: 'nav-item', actions: document_actions(document_list, options: { document: nil }), options: { document_list: @response.documents }, url_opts: Blacklight::Parameters.sanitize(params.to_unsafe_h))) %>
 <% else %>
   <% Deprecation.warn(self, '#render_show_doc_actions is deprecated; use ActionComponents instead') %>
   <ul class="<%= controller_name %>Tools nav nav-pills">

data/blacklight.gemspec

@@ -23,22 +23,23 @@ Gem::Specification.new do |s|
   s.executables   = s.files.grep(%r{^exe/}) { |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.required_ruby_version = '~> 2.1'
+  s.required_ruby_version = '>= 2.3'
 
   s.add_dependency "rails", '>= 5.1', '< 7'
   s.add_dependency "globalid"
   s.add_dependency "jbuilder", '~> 2.7'
   s.add_dependency "kaminari", ">= 0.15" # the pagination (page 1,2,3, etc..) of our search results
   s.add_dependency "deprecation"
-  s.add_dependency "view_component"
+  s.add_dependency "i18n", '>= 1.7.0' # added named parameters
+  s.add_dependency "ostruct", '>= 0.3.2'
+  s.add_dependency "view_component", '>= 2.23.0'
 
   s.add_development_dependency "rsolr", ">= 1.0.6", "< 3"  # Library for interacting with rSolr.
   s.add_development_dependency "rspec-rails", "~> 4.0.0.beta2"
   s.add_development_dependency "rspec-its"
   s.add_development_dependency "rspec-collection_matchers", ">= 1.0"
   s.add_development_dependency "capybara", '~> 3'
-  s.add_development_dependency 'webdrivers', '~> 3.0'
-  s.add_development_dependency "selenium-webdriver", '>= 3.13.1'
+  s.add_development_dependency 'apparition'
   s.add_development_dependency 'engine_cart', '~> 2.1'
   s.add_development_dependency "equivalent-xml"
   s.add_development_dependency "simplecov"

data/package.json

@@ -1,7 +1,7 @@
 {
   "name": "blacklight-frontend",
   "version": "7.10.0",
-  "description": "[![Build Status](https://travis-ci.org/projectblacklight/blacklight.png?branch=master)](https://travis-ci.org/projectblacklight/blacklight) [![Gem Version](https://badge.fury.io/rb/blacklight.png)](http://badge.fury.io/rb/blacklight) [![Coverage Status](https://coveralls.io/repos/github/projectblacklight/blacklight/badge.svg?branch=master)](https://coveralls.io/github/projectblacklight/blacklight?branch=master)",
+  "description": "[![Build Status](https://travis-ci.com/projectblacklight/blacklight.png?branch=master)](https://travis-ci.com/projectblacklight/blacklight) [![Gem Version](https://badge.fury.io/rb/blacklight.png)](http://badge.fury.io/rb/blacklight) [![Coverage Status](https://coveralls.io/repos/github/projectblacklight/blacklight/badge.svg?branch=master)](https://coveralls.io/github/projectblacklight/blacklight?branch=master)",
   "main": "app/assets/javascripts/blacklight",
   "scripts": {
     "js-compile-bundle": "shx cat app/javascript/blacklight/core.js app/javascript/blacklight/autocomplete.js app/javascript/blacklight/bookmark_toggle.js app/javascript/blacklight/button_focus.js app/javascript/blacklight/checkbox_submit.js app/javascript/blacklight/facet_load.js app/javascript/blacklight/modal.js app/javascript/blacklight/search_context.js | shx sed \"s/^(import|export).*//\" | babel --filename app/javascript/blacklight/blacklight.js > app/assets/javascripts/blacklight/blacklight.js"

data/spec/components/blacklight/constraint_layout_component_spec.rb

@@ -4,7 +4,7 @@ require 'spec_helper'
 
 RSpec.describe Blacklight::ConstraintLayoutComponent, type: :component do
   subject(:render) do
-    render_inline(described_class.new(params))
+    render_inline(described_class.new(**params))
   end
 
   let(:rendered) do

data/spec/components/blacklight/document_component_spec.rb

@@ -33,6 +33,8 @@ RSpec.describe Blacklight::DocumentComponent, type: :component do
   end
 
   before do
+    # Every call to view_context returns a different object. This ensures it stays stable.
+    allow(controller).to receive(:view_context).and_return(view_context)
     allow(controller).to receive(:current_or_guest_user).and_return(User.new)
     allow(controller).to receive(:blacklight_config).and_return(blacklight_config)
     allow(view_context).to receive(:search_session).and_return({})

data/spec/components/blacklight/hidden_search_state_component_spec.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+RSpec.describe Blacklight::HiddenSearchStateComponent, type: :component do
+  subject(:render) { render_inline(instance) }
+
+  let(:params) do
+    { q: "query",
+      search_field: "search_field",
+      per_page: 10,
+      extra_arbitrary_key: "arbitrary_value",
+      f: { field1: %w[a b], field2: ["z"] } }
+  end
+  let(:instance) { described_class.new(params: params) }
+  let(:generated) { Capybara::Node::Simple.new("<div>#{render.to_html}</div>") }
+
+  it "converts a hash with nested complex data to Rails-style hidden form fields" do
+    expect(generated).to have_selector("input[type='hidden'][name='q'][value='query']", visible: :hidden)
+    expect(generated).to have_selector("input[type='hidden'][name='per_page'][value='10']", visible: :hidden)
+    expect(generated).to have_selector("input[type='hidden'][name='extra_arbitrary_key'][value='arbitrary_value']", visible: :hidden)
+    expect(generated).to have_selector("input[type='hidden'][name='f[field2][]'][value='z']", visible: :hidden)
+    expect(generated).to have_selector("input[type='hidden'][name='f[field1][]'][value='a']", visible: :hidden)
+    expect(generated).to have_selector("input[type='hidden'][name='f[field1][]'][value='b']", visible: :hidden)
+  end
+end

data/spec/features/facets_spec.rb

@@ -56,10 +56,6 @@ RSpec.describe "Facets" do
 
     expect(page).to have_css('#facet-format', visible: false)
 
-    within('#facets .facets-header') do
-      page.find('button.navbar-toggler').click
-    end
-
     page.find('h3.facet-field-heading button', text: 'Format').click
 
     sleep(1) # let facet animation finish and wait for it to potentially re-collapse
@@ -70,14 +66,10 @@ RSpec.describe "Facets" do
   it 'is able to expand pivot facets when javascript is enabled', js: true do
     visit root_path
 
-    within('#facets .facets-header') do
-      page.find('button.navbar-toggler').click
-    end
-
     page.find('h3.facet-field-heading button', text: 'Pivot Field').click
 
     within '#facet-example_pivot_field' do
-      expect(page).to have_css('.facet-leaf-node', text: 'Book 30')
+      expect(page).to have_css('.facet-leaf-node', text: "Book\t30")
       expect(page).not_to have_css('.facet-select', text: 'Tibetan')
       page.find('.facet-toggle-handle').click
       click_link 'Tibetan'
@@ -88,15 +80,8 @@ RSpec.describe "Facets" do
   end
 
   describe 'heading button focus with Firefox' do
-    before do
-      Capybara.current_driver = :selenium_headless
-    end
-
-    after do
-      Capybara.current_driver = :rack_test
-    end
-
     it 'changes to the button on button click in Firefox' do
+      pending 'Capybara::NotSupportedByDriverError: Capybara::Driver::Base#evaluate_script'
       visit root_path
       page.find('h3.facet-field-heading button', text: 'Format').click
       focused_element_data_target = page.evaluate_script("document.activeElement")['data-target']

data/spec/features/search_filters_spec.rb

@@ -168,26 +168,16 @@ RSpec.describe "Facets" do
   end
 
   it "is collapsed when not selected", js: true do
-    skip("Test passes locally but not on Travis.") if ENV['TRAVIS']
     visit root_path
 
-    within('#facets .facets-header') do
-      page.find('button.navbar-toggler').click
-    end
-
     within(".blacklight-subject_ssim") do
       expect(page).not_to have_selector(".card-body", visible: true)
     end
   end
 
   it "expands when the heading button is clicked", js: true do
-    skip("Test passes locally but not on Travis.") if ENV['TRAVIS']
     visit root_path
 
-    within('#facets .facets-header') do
-      page.find('button.navbar-toggler').click
-    end
-
     within(".blacklight-subject_ssim") do
       expect(page).not_to have_selector(".card-body", visible: true)
       find(".card-header button").click
@@ -196,13 +186,8 @@ RSpec.describe "Facets" do
   end
 
   it "expands when the button is clicked", js: true do
-    skip("Test passes locally but not on Travis.") if ENV['TRAVIS']
     visit root_path
 
-    within('#facets .facets-header') do
-      page.find('button.navbar-toggler').click
-    end
-
     within(".blacklight-subject_ssim") do
       expect(page).not_to have_selector(".card-body", visible: true)
       find(".card-header").click
@@ -211,13 +196,8 @@ RSpec.describe "Facets" do
   end
 
   it "keeps selected facets expanded on page load", js: true do
-    skip("Test passes locally but not on Travis.") if ENV['TRAVIS']
     visit root_path
 
-    within('#facets .facets-header') do
-      page.find('button.navbar-toggler').click
-    end
-
     within(".blacklight-subject_ssim") do
       page.find('h3.facet-field-heading', text: 'Topic').click
       expect(page).to have_selector(".panel-collapse", visible: true)

data/spec/helpers/blacklight/hash_as_hidden_fields_behavior_spec.rb

@@ -14,6 +14,7 @@ RSpec.describe Blacklight::HashAsHiddenFieldsHelperBehavior do
   let(:generated) { helper.render_hash_as_hidden_fields(params) }
 
   it "converts a hash with nested complex data to Rails-style hidden form fields" do
+    allow(Deprecation).to receive(:warn)
     expect(generated).to have_selector("input[type='hidden'][name='q'][value='query']", visible: false)
     expect(generated).to have_selector("input[type='hidden'][name='per_page'][value='10']", visible: false)
     expect(generated).to have_selector("input[type='hidden'][name='page'][value='5']", visible: false)

data/spec/helpers/blacklight/url_helper_behavior_spec.rb

@@ -13,6 +13,7 @@ RSpec.describe Blacklight::UrlHelperBehavior do
   let(:parameter_class) { ActionController::Parameters }
 
   before do
+    allow(controller).to receive(:controller_name).and_return('test')
     allow(helper).to receive(:search_action_path) do |*args|
       search_catalog_url *args
     end

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

@@ -109,7 +109,7 @@ RSpec.describe Blacklight::Solr::Response::Facets, api: true do
     let(:facet) { { name: "foo", value: "bar", hits: 1 } }
 
     before do
-      response.merge_facet(facet)
+      response.merge_facet(**facet)
     end
 
     context "facet does not already exist" do

data/spec/spec_helper.rb

@@ -20,12 +20,17 @@ require 'rspec/rails'
 require 'rspec/its'
 require 'rspec/collection_matchers'
 require 'capybara/rspec'
-require 'selenium-webdriver'
+require 'capybara/apparition'
 require 'equivalent-xml'
-require 'webdrivers'
 
-Capybara.javascript_driver = :selenium_chrome_headless
+Capybara.javascript_driver = :apparition
 Capybara.disable_animation = true
+# Capybara.enable_aria_label = true
+
+# Uncomment for a headed browser
+# Capybara.register_driver :apparition do |app|
+#   Capybara::Apparition::Driver.new(app, headless: false)
+# end
 
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.

data/spec/test_app_templates/Gemfile.extra

@@ -1,2 +1,2 @@
 gem 'rails-controller-testing'
-gem 'thor', '~> 0.20'
+gem 'thor', '~> 0.20' if /^5.[12]/.match?(ENV['RAILS_VERSION'])

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

@@ -5,6 +5,7 @@ RSpec.describe "catalog/_document" do
   let(:blacklight_config) { Blacklight::Configuration.new }
 
   before do
+    allow(controller).to receive(:controller_name).and_return('test')
     allow(view).to receive(:render_grouped_response?).and_return(false)
     allow(view).to receive(:blacklight_config).and_return(blacklight_config)
     assign(:response, instance_double(Blacklight::Solr::Response, start: 20))

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

@@ -16,6 +16,8 @@ RSpec.describe "catalog/_thumbnail" do
   end
 
   before do
+    # Every call to view_context returns a different object. This ensures it stays stable.
+    allow(controller).to receive(:view_context).and_return(view)
     allow(controller).to receive(:action_name).and_return('index')
     assign :response, instance_double(Blacklight::Solr::Response, start: 0)
     allow(view).to receive(:render_grouped_response?).and_return false

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 7.13.2
+  version: 7.14.0
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -14,10 +14,10 @@ authors:
 - Dan Funk
 - Naomi Dushay
 - Justin Coyne
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-11-07 00:00:00.000000000 Z
+date: 2021-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -95,20 +95,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: i18n
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.7.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.7.0
+- !ruby/object:Gem::Dependency
+  name: ostruct
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.2
 - !ruby/object:Gem::Dependency
   name: view_component
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.23.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.23.0
 - !ruby/object:Gem::Dependency
   name: rsolr
   requirement: !ruby/object:Gem::Requirement
@@ -186,33 +214,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3'
 - !ruby/object:Gem::Dependency
-  name: webdrivers
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: selenium-webdriver
+  name: apparition
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.13.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.13.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: engine_cart
   requirement: !ruby/object:Gem::Requirement
@@ -415,6 +429,7 @@ files:
 - app/components/blacklight/facet_field_pagination_component.rb
 - app/components/blacklight/facet_item_component.rb
 - app/components/blacklight/facet_item_pivot_component.rb
+- app/components/blacklight/hidden_search_state_component.rb
 - app/components/blacklight/metadata_field_component.html.erb
 - app/components/blacklight/metadata_field_component.rb
 - app/components/blacklight/metadata_field_layout_component.html.erb
@@ -712,6 +727,7 @@ files:
 - spec/components/blacklight/facet_field_list_component_spec.rb
 - spec/components/blacklight/facet_item_component_spec.rb
 - spec/components/blacklight/facet_item_pivot_component_spec.rb
+- spec/components/blacklight/hidden_search_state_component_spec.rb
 - spec/components/blacklight/metadata_field_component_spec.rb
 - spec/components/blacklight/system/flash_message_component_spec.rb
 - spec/controllers/alternate_controller_spec.rb
@@ -848,23 +864,23 @@ homepage: http://projectblacklight.org/
 licenses:
 - Apache 2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '2.1'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Blacklight provides a discovery interface for any Solr (http://lucene.apache.org/solr)
   index.
@@ -877,6 +893,7 @@ test_files:
 - spec/components/blacklight/facet_field_list_component_spec.rb
 - spec/components/blacklight/facet_item_component_spec.rb
 - spec/components/blacklight/facet_item_pivot_component_spec.rb
+- spec/components/blacklight/hidden_search_state_component_spec.rb
 - spec/components/blacklight/metadata_field_component_spec.rb
 - spec/components/blacklight/system/flash_message_component_spec.rb
 - spec/controllers/alternate_controller_spec.rb