blacklight 7.18.1 → 7.20.0

data/lib/blacklight/search_builder.rb

@@ -45,7 +45,7 @@ module Blacklight
     ##
     # Update the :q (query) parameter
     def where(conditions)
-      Deprecation.warn("SearchBuilder#where must be called with a hash, received #{conditions.inspect}.") unless conditions.is_a? Hash
+      Deprecation.warn(Blacklight::SearchBuilder, "SearchBuilder#where must be called with a hash, received #{conditions.inspect}.") unless conditions.is_a? Hash
       params_will_change!
       @search_state = @search_state.reset(@search_state.params.merge(q: conditions))
       @blacklight_params = @search_state.params.dup

data/lib/blacklight/search_state/filter_field.rb

@@ -83,10 +83,19 @@ module Blacklight
           Deprecation.warn(self, 'Normalizing parameters in FilterField#remove is deprecated')
           collection = collection.values
         end
+
         params[param][key] = collection - Array(value)
         params[param].delete(key) if params[param][key].empty?
         params.delete(param) if params[param].empty?
 
+        # Handle missing field queries.
+        missing = I18n.t("blacklight.search.facets.missing")
+        if (item.respond_to?(:fq) && item.fq == "-#{key}:[* TO *]") ||
+           item == missing
+          params[param].delete("-#{key}:")
+          params[param].delete(key) if params[param][key] == [""]
+        end
+
         new_state.reset(params)
       end
 

data/lib/blacklight/solr/request.rb

@@ -2,7 +2,10 @@
 class Blacklight::Solr::InvalidParameter < ArgumentError; end
 
 class Blacklight::Solr::Request < ActiveSupport::HashWithIndifferentAccess
+  # @deprecated
   SINGULAR_KEYS = %w(facet fl q qt rows start spellcheck spellcheck.q sort per_page wt hl group defType)
+
+  # @deprecated
   ARRAY_KEYS = %w(facet.field facet.query facet.pivot fq hl.fl)
 
   def initialize(constructor = {})
@@ -12,9 +15,6 @@ class Blacklight::Solr::Request < ActiveSupport::HashWithIndifferentAccess
     else
       super(constructor)
     end
-    ARRAY_KEYS.each do |key|
-      self[key] ||= []
-    end
   end
 
   def append_query(query)
@@ -49,26 +49,29 @@ class Blacklight::Solr::Request < ActiveSupport::HashWithIndifferentAccess
   end
 
   def append_filter_query(query)
+    self['fq'] ||= []
+    self['fq'] = Array(self['fq']) if self['fq'].is_a? String
+
     self['fq'] << query
   end
 
   def append_facet_fields(values)
+    self['facet.field'] ||= []
     self['facet.field'] += Array(values)
   end
 
   def append_facet_query(values)
+    self['facet.query'] ||= []
     self['facet.query'] += Array(values)
   end
 
   def append_facet_pivot(query)
+    self['facet.pivot'] ||= []
     self['facet.pivot'] << query
   end
 
   def append_highlight_field(query)
+    self['hl.fl'] ||= []
     self['hl.fl'] << query
   end
-
-  def to_hash
-    reject { |key, value| ARRAY_KEYS.include?(key) && value.blank? }
-  end
 end

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

@@ -45,8 +45,9 @@ class Blacklight::Solr::Response::GroupResponse
   def entry_name(options)
     I18n.t(
       "blacklight.entry_name.grouped.#{key}",
-      default: :'blacklight.entry_name.grouped.default'
-    ).pluralize(options[:count])
+      default: :'blacklight.entry_name.grouped.default',
+      count: options[:count]
+    )
   end
 
   def method_missing meth, *args, &block

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

@@ -24,6 +24,6 @@ module Blacklight::Solr::Response::PaginationMethods
   ##
   # Meant to have the same signature as Kaminari::PaginatableArray#entry_name
   def entry_name(options)
-    I18n.t('blacklight.entry_name.default').pluralize(options[:count])
+    I18n.t('blacklight.entry_name.default', count: options[:count])
   end
 end

data/lib/blacklight/solr/search_builder_behavior.rb

@@ -5,10 +5,12 @@ module Blacklight::Solr
 
     included do
       self.default_processor_chain = [
-        :default_solr_parameters, :add_query_to_solr, :add_facet_fq_to_solr,
+        :default_solr_parameters, :add_search_field_default_parameters,
+        :add_query_to_solr, :add_facet_fq_to_solr,
         :add_facetting_to_solr, :add_solr_fields_to_query, :add_paging_to_solr,
         :add_sorting_to_solr, :add_group_config_to_solr,
         :add_facet_paging_to_solr, :add_adv_search_clauses,
+        :add_missing_field_query,
         :add_additional_filters
       ]
     end
@@ -18,22 +20,17 @@ module Blacklight::Solr
     # merge to dup values, to avoid later mutating the original by mistake.
     def default_solr_parameters(solr_parameters)
       blacklight_config.default_solr_params.each do |key, value|
-        solr_parameters[key] = if value.respond_to? :deep_dup
-                                 value.deep_dup
-                               elsif value.respond_to?(:dup) && value.duplicable?
-                                 value.dup
-                               else
-                                 value
-                               end
+        solr_parameters[key] ||= if value.respond_to? :deep_dup
+                                   value.deep_dup
+                                 elsif value.respond_to?(:dup) && value.duplicable?
+                                   value.dup
+                                 else
+                                   value
+                                 end
       end
     end
 
-    ##
-    # Take the user-entered query, and put it in the solr params,
-    # including config's "search field" params for current search field.
-    # also include setting spellcheck.q.
-    # rubocop:disable Metrics/CyclomaticComplexity
-    def add_query_to_solr(solr_parameters)
+    def add_search_field_default_parameters(solr_parameters)
       ###
       # legacy behavior of user param :qt is passed through, but over-ridden
       # by actual search field config if present. We might want to remove
@@ -47,10 +44,21 @@ module Blacklight::Solr
       ###
       # Merge in search field configured values, if present, over-writing general
       # defaults
-
       if search_field
         solr_parameters[:qt] = search_field.qt if search_field.qt
-        solr_parameters.merge!(search_field.solr_parameters) if search_field.solr_parameters
+
+        solr_parameters.deep_merge!(search_field.solr_parameters) if search_field.solr_parameters
+      end
+    end
+
+    ##
+    # Take the user-entered query, and put it in the solr params,
+    # including config's "search field" params for current search field.
+    # also include setting spellcheck.q.
+    def add_query_to_solr(solr_parameters)
+      unless processor_chain.include?(:add_search_field_default_parameters)
+        Deprecation.warn(Blacklight::Solr::SearchBuilderBehavior, 'Please include :add_search_field_default_parameters in your process chain')
+        add_search_field_default_parameters(solr_parameters)
       end
 
       ##
@@ -66,14 +74,26 @@ module Blacklight::Solr
         add_search_field_with_local_parameters(solr_parameters)
       elsif search_state.query_param.is_a? Hash
         if search_state.query_param == @additional_filters && !processor_chain.include?(:add_additional_filters)
-          Deprecation.warn('Expecting to see the processor step add_additional_filters; falling back to legacy query handling')
+          Deprecation.warn(Blacklight::Solr::SearchBuilderBehavior, 'Expecting to see the processor step add_additional_filters; falling back to legacy query handling')
           add_additional_filters(solr_parameters, search_state.query_param)
         end
       elsif search_state.query_param
         solr_parameters.append_query search_state.query_param
       end
     end
-    # rubocop:enable Metrics/CyclomaticComplexity
+
+    ##
+    # Build and append a missing field query.
+    ##
+    def add_missing_field_query(solr_parameters)
+      return unless solr_parameters["facet.missing"]
+
+      solr_parameters[:fq] = [] if solr_parameters[:fq].blank?
+
+      solr_parameters[:fq].append(*(blacklight_params["f"] || [])
+        .select { |f| f.match(/^-/) }
+        .map { |k, _v| "#{k}[* TO *]" })
+    end
 
     def add_additional_filters(solr_parameters, additional_filters = nil)
       q = additional_filters || @additional_filters

data/lib/blacklight.rb

@@ -96,7 +96,11 @@ module Blacklight
     end
 
     begin
-      @blacklight_yml = YAML.safe_load(blacklight_erb)
+      @blacklight_yml = if RUBY_VERSION > '2.6'
+                          YAML.safe_load(blacklight_erb, aliases: true)
+                        else
+                          YAML.safe_load(blacklight_erb, [], [], true)
+                        end
     rescue => e
       raise("#{blacklight_config_file} was found, but could not be parsed.\n#{e.inspect}")
     end

data/lib/generators/blacklight/assets_generator.rb

@@ -3,9 +3,11 @@ module Blacklight
   class Assets < Rails::Generators::Base
     source_root File.expand_path('../templates', __FILE__)
 
+    class_option :'bootstrap-version', type: :string, default: ENV.fetch('BOOTSTRAP_VERSION', '~> 4.0'), desc: "Set the generated app's bootstrap version"
+
     # This could be skipped if you want to use webpacker
     def add_javascript_dependencies
-      gem 'bootstrap', '~> 4.0'
+      gem 'bootstrap', options[:'bootstrap-version']
       gem 'twitter-typeahead-rails', '0.11.1.pre.corejavascript'
     end
 
@@ -15,7 +17,7 @@ module Blacklight
 
       create_file 'app/assets/javascripts/application.js' do
         <<~CONTENT
-          //= require jquery
+          //= require jquery3
           //= require rails-ujs
           //= require turbolinks
         CONTENT

data/lib/generators/blacklight/install_generator.rb

@@ -10,6 +10,7 @@ module Blacklight
 
     class_option :devise, type: :boolean, default: false, aliases: "-d", desc: "Use Devise as authentication logic."
     class_option :marc, type: :boolean, default: false, aliases: "-m", desc: "Generate MARC-based demo."
+    class_option :'bootstrap-version', type: :string, default: nil, desc: "Set the generated app's bootstrap version"
     class_option :'skip-assets', type: :boolean, default: !defined?(Sprockets), desc: "Skip generating javascript and css assets into the application"
     class_option :'skip-solr', type: :boolean, default: false, desc: "Skip generating solr configurations."
 
@@ -33,7 +34,9 @@ module Blacklight
     # Call external generator in AssetsGenerator, so we can
     # leave that callable seperately too.
     def copy_public_assets
-      generate "blacklight:assets" unless options[:'skip-assets']
+      generated_options = "--bootstrap-version #{options[:'bootstrap-version']}" if options[:'bootstrap-version']
+
+      generate "blacklight:assets", generated_options unless options[:'skip-assets']
     end
 
     def bundle_install

data/lib/generators/blacklight/user_generator.rb

@@ -22,7 +22,7 @@ module Blacklight
       return unless options[:devise]
 
       gem "devise"
-      gem "devise-guests", "~> 0.6"
+      gem "devise-guests", "~> 0.8"
 
       inside destination_root do
         Bundler.with_clean_env do

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "blacklight-frontend",
-  "version": "7.10.0",
+  "version": "7.20.0",
   "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": {
@@ -27,7 +27,7 @@
   },
   "dependencies": {
     "bloodhound-js": "^1.2.3",
-    "bootstrap": "^4.3.1",
+    "bootstrap": ">=4.3.1 <6.0.0",
     "jquery": "^3.5.1",
     "typeahead.js": "^0.11.1"
   }

data/spec/components/blacklight/constraint_layout_component_spec.rb

@@ -3,12 +3,8 @@
 require 'spec_helper'
 
 RSpec.describe Blacklight::ConstraintLayoutComponent, type: :component do
-  subject(:render) do
-    render_inline(described_class.new(**params))
-  end
-
-  let(:rendered) do
-    Capybara::Node::Simple.new(render)
+  subject(:rendered) do
+    render_inline_to_capybara_node(described_class.new(**params))
   end
 
   describe "for simple display" do
@@ -39,7 +35,7 @@ RSpec.describe Blacklight::ConstraintLayoutComponent, type: :component do
 
     it "has an accessible remove label" do
       expect(rendered).to have_selector(".remove") do |s|
-        expect(s).to have_selector('.sr-only', text: 'Remove constraint my label: my value')
+        expect(s).to have_selector('.visually-hidden', text: 'Remove constraint my label: my value')
       end
     end
   end

data/spec/components/blacklight/facet_field_checkboxes_component_spec.rb

@@ -3,12 +3,8 @@
 require 'spec_helper'
 
 RSpec.describe Blacklight::FacetFieldCheckboxesComponent, type: :component do
-  subject(:render) do
-    render_inline(described_class.new(facet_field: facet_field))
-  end
-
-  let(:rendered) do
-    Capybara::Node::Simple.new(render)
+  subject(:rendered) do
+    render_inline_to_capybara_node(described_class.new(facet_field: facet_field))
   end
 
   let(:facet_field) do
@@ -40,7 +36,7 @@ RSpec.describe Blacklight::FacetFieldCheckboxesComponent, type: :component do
   it 'renders a collapsible card' do
     expect(rendered).to have_selector '.card'
     expect(rendered).to have_button 'Field'
-    expect(rendered).to have_selector 'button[data-target="#facet-field"]'
+    expect(rendered).to have_selector 'button[data-bs-target="#facet-field"]'
     expect(rendered).to have_selector '#facet-field.collapse.show'
   end
 

data/spec/components/blacklight/facet_field_list_component_spec.rb

@@ -3,12 +3,8 @@
 require 'spec_helper'
 
 RSpec.describe Blacklight::FacetFieldListComponent, type: :component do
-  subject(:render) do
-    render_inline(described_class.new(facet_field: facet_field))
-  end
-
-  let(:rendered) do
-    Capybara::Node::Simple.new(render)
+  subject(:rendered) do
+    render_inline_to_capybara_node(described_class.new(facet_field: facet_field))
   end
 
   let(:facet_field) do
@@ -35,7 +31,7 @@ RSpec.describe Blacklight::FacetFieldListComponent, type: :component do
   it 'renders a collapsible card' do
     expect(rendered).to have_selector '.card'
     expect(rendered).to have_button 'Field'
-    expect(rendered).to have_selector 'button[data-target="#facet-field"]'
+    expect(rendered).to have_selector 'button[data-bs-target="#facet-field"]'
     expect(rendered).to have_selector '#facet-field.collapse.show'
   end
 

data/spec/components/blacklight/facet_item_component_spec.rb

@@ -3,12 +3,8 @@
 require 'spec_helper'
 
 RSpec.describe Blacklight::FacetItemComponent, type: :component do
-  subject(:render) do
-    render_inline(described_class.new(facet_item: facet_item))
-  end
-
-  let(:rendered) do
-    Capybara::Node::Simple.new(render)
+  subject(:rendered) do
+    render_inline_to_capybara_node(described_class.new(facet_item: facet_item))
   end
 
   let(:facet_item) do
@@ -24,7 +20,9 @@ RSpec.describe Blacklight::FacetItemComponent, type: :component do
 
   it 'links to the facet and shows the number of hits' do
     expect(rendered).to have_selector 'li'
-    expect(rendered).to have_link 'x', href: '/catalog?f=x'
+    expect(rendered).to have_link 'x', href: '/catalog?f=x' do |link|
+      link['rel'] == 'nofollow'
+    end
     expect(rendered).to have_selector '.facet-count', text: '10'
   end
 
@@ -43,7 +41,9 @@ RSpec.describe Blacklight::FacetItemComponent, type: :component do
     it 'links to the facet and shows the number of hits' do
       expect(rendered).to have_selector 'li'
       expect(rendered).to have_selector '.selected', text: 'x'
-      expect(rendered).to have_link '[remove]', href: '/catalog'
+      expect(rendered).to have_link '[remove]', href: '/catalog' do |link|
+        link['rel'] == 'nofollow'
+      end
       expect(rendered).to have_selector '.selected.facet-count', text: '10'
     end
   end

data/spec/components/blacklight/facet_item_pivot_component_spec.rb

@@ -3,12 +3,8 @@
 require 'spec_helper'
 
 RSpec.describe Blacklight::FacetItemPivotComponent, type: :component do
-  subject(:render) do
-    render_inline(described_class.new(facet_item: facet_item))
-  end
-
-  let(:rendered) do
-    Capybara::Node::Simple.new(render)
+  subject(:rendered) do
+    render_inline_to_capybara_node(described_class.new(facet_item: facet_item))
   end
 
   let(:search_state) do
@@ -31,7 +27,7 @@ RSpec.describe Blacklight::FacetItemPivotComponent, type: :component do
 
   it 'links to the facet and shows the number of hits' do
     expect(rendered).to have_selector 'li'
-    expect(rendered).to have_link 'x', href: '/catalog?f[z]=x'
+    expect(rendered).to have_link 'x', href: '/catalog?f%5Bz%5D=x'
     expect(rendered).to have_selector '.facet-count', text: '10'
   end
 

data/spec/components/blacklight/hidden_search_state_component_spec.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 RSpec.describe Blacklight::HiddenSearchStateComponent, type: :component do
-  subject(:render) { render_inline(instance) }
+  subject(:rendered) { render_inline_to_capybara_node(instance) }
 
   let(:params) do
     { q: "query",
@@ -11,14 +11,13 @@ RSpec.describe Blacklight::HiddenSearchStateComponent, type: :component do
       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)
+    expect(rendered).to have_selector("input[type='hidden'][name='q'][value='query']", visible: :hidden)
+    expect(rendered).to have_selector("input[type='hidden'][name='per_page'][value='10']", visible: :hidden)
+    expect(rendered).to have_selector("input[type='hidden'][name='extra_arbitrary_key'][value='arbitrary_value']", visible: :hidden)
+    expect(rendered).to have_selector("input[type='hidden'][name='f[field2][]'][value='z']", visible: :hidden)
+    expect(rendered).to have_selector("input[type='hidden'][name='f[field1][]'][value='a']", visible: :hidden)
+    expect(rendered).to have_selector("input[type='hidden'][name='f[field1][]'][value='b']", visible: :hidden)
   end
 end

data/spec/components/blacklight/metadata_field_component_spec.rb

@@ -3,8 +3,8 @@
 require 'spec_helper'
 
 RSpec.describe Blacklight::MetadataFieldComponent, type: :component do
-  subject(:render) do
-    render_inline(described_class.new(field: field))
+  subject(:rendered) do
+    render_inline_to_capybara_node(described_class.new(field: field))
   end
 
   let(:view_context) { controller.view_context }
@@ -15,10 +15,6 @@ RSpec.describe Blacklight::MetadataFieldComponent, type: :component do
     Blacklight::FieldPresenter.new(view_context, document, field_config)
   end
 
-  let(:rendered) do
-    Capybara::Node::Simple.new(render)
-  end
-
   it 'renders the field label' do
     expect(rendered).to have_selector 'dt.blacklight-field', text: 'Field label'
   end
@@ -28,8 +24,8 @@ RSpec.describe Blacklight::MetadataFieldComponent, type: :component do
   end
 
   context 'from a show view' do
-    subject(:render) do
-      render_inline(described_class.new(field: field, show: true))
+    subject(:rendered) do
+      render_inline_to_capybara_node(described_class.new(field: field, show: true))
     end
 
     it 'renders the right field label' do

data/spec/features/axe_spec.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+RSpec.describe 'Accessibility testing', api: false, js: true do
+  xit 'validates the home page' do
+    visit root_path
+    expect(page).to be_accessible
+  end
+
+  xit 'validates the catalog page' do
+    visit root_path
+    fill_in "q", with: 'history'
+    click_button 'search'
+
+    # aria-allowed-role doesn't like nav[role="region"]
+    expect(page).to be_accessible(skipping: ['aria-allowed-role'])
+
+    within '.card.blacklight-language_ssim' do
+      click_button 'Language'
+      click_link "Tibetan"
+    end
+
+    expect(page).to be_accessible(skipping: ['aria-allowed-role'])
+  end
+
+  xit 'validates the single results page' do
+    visit solr_document_path('2007020969')
+    expect(page).to be_accessible
+  end
+
+  def be_accessible(skipping: [])
+    # typeahead does funny things with the search bar
+    be_axe_clean.excluding('.tt-hint').skipping(skipping + [('color-contrast' if Bootstrap::VERSION < '5')])
+  end
+end

data/spec/features/facet_missing_spec.rb

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+RSpec.describe "Facet missing" do
+  before do
+    CatalogController.blacklight_config[:default_solr_params]["facet.missing"] = true
+  end
+
+  after do
+    CatalogController.blacklight_config[:default_solr_params].delete("facet.missing")
+  end
+
+  context "selecting missing field in facets" do
+    it "adds facet missing query and constraints" do
+      visit root_path
+
+      within "#facet-subject_geo_ssim" do
+        click_link "[Missing]"
+      end
+
+      within "#facet-subject_geo_ssim" do
+        expect(page).to have_selector("span.selected", text: "[Missing")
+        expect(page).to have_selector("span.facet-count.selected", text: "13")
+      end
+
+      within "#sortAndPerPage" do
+        expect(page).to have_content "1 - 10 of 13"
+      end
+
+      expect(page).to have_css(".constraint-value", text: "Region")
+      expect(page).to have_css(".constraint-value", text: "[Missing]")
+    end
+  end
+
+  context "unselecting the facet missing facet" do
+    it "unselects the missig field facet" do
+      visit root_path + "?f[-subject_geo_ssim:[* TO *]][]=&f[subject_geo_ssim][]="
+
+      within "#facet-subject_geo_ssim" do
+        click_link "remove"
+      end
+
+      expect(page).not_to have_link "remove"
+      expect(page).to have_content("Welcome!")
+    end
+  end
+
+  context "unselecting the facet missing constraint" do
+    it "unselects the missig field facet" do
+      visit root_path + "?f[-subject_geo_ssim:[* TO *]][]=&f[subject_geo_ssim][]="
+
+      within ".filter-subject_geo_ssim" do
+        click_link "Remove constraint Region: [Missing]"
+      end
+
+      expect(page).not_to have_link "remove"
+      expect(page).to have_content("Welcome!")
+    end
+  end
+end

data/spec/features/facets_spec.rb

@@ -69,7 +69,7 @@ RSpec.describe "Facets" do
     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\t30")
+      expect(page).to have_css('.facet-leaf-node', text: "Book 30")
       expect(page).not_to have_css('.facet-select', text: 'Tibetan')
       page.find('.facet-toggle-handle').click
       click_link 'Tibetan'
@@ -84,13 +84,13 @@ RSpec.describe "Facets" 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']
+      focused_element_data_target = page.evaluate_script("document.activeElement")['data-bs-target']
       expect(focused_element_data_target).to eq '#facet-format'
     end
   end
 
   describe '"More" links' do
-    it 'has default more link with sr-only text' do
+    it 'has default more link with visually-hidden text' do
       visit root_path
       within '#facet-language_ssim' do
         expect(page).to have_css 'div.more_facets', text: 'more Language'

data/spec/helpers/blacklight/configuration_helper_behavior_spec.rb

@@ -194,9 +194,9 @@ RSpec.describe Blacklight::ConfigurationHelperBehavior do
   describe "#per_page_options_for_select" do
     it "is the per-page values formatted as options_for_select" do
       allow(helper).to receive_messages(blacklight_config: double(per_page: [11, 22, 33]))
-      expect(helper.per_page_options_for_select).to include ["11<span class=\"sr-only\"> per page</span>", 11]
-      expect(helper.per_page_options_for_select).to include ["22<span class=\"sr-only\"> per page</span>", 22]
-      expect(helper.per_page_options_for_select).to include ["33<span class=\"sr-only\"> per page</span>", 33]
+      expect(helper.per_page_options_for_select).to include ["11<span class=\"sr-only visually-hidden\"> per page</span>", 11]
+      expect(helper.per_page_options_for_select).to include ["22<span class=\"sr-only visually-hidden\"> per page</span>", 22]
+      expect(helper.per_page_options_for_select).to include ["33<span class=\"sr-only visually-hidden\"> per page</span>", 33]
     end
   end
 

data/spec/helpers/blacklight/facets_helper_behavior_spec.rb

@@ -314,7 +314,7 @@ RSpec.describe Blacklight::FacetsHelperBehavior do
     end
 
     describe "simple case" do
-      let(:expected_html) { '<span class="facet-label"><a class="facet-select" href="/catalog">Z</a></span><span class="facet-count">10</span>' }
+      let(:expected_html) { '<span class="facet-label"><a class="facet-select" rel="nofollow" href="/catalog">Z</a></span><span class="facet-count">10</span>' }
 
       it "uses facet_display_value" do
         result = helper.render_facet_value('simple_field', item)
@@ -323,7 +323,7 @@ RSpec.describe Blacklight::FacetsHelperBehavior do
     end
 
     describe "when :url_method is set" do
-      let(:expected_html) { '<span class="facet-label"><a class="facet-select" href="/blabla">Z</a></span><span class="facet-count">10</span>' }
+      let(:expected_html) { '<span class="facet-label"><a class="facet-select" rel="nofollow" href="/blabla">Z</a></span><span class="facet-count">10</span>' }
 
       it "uses that method" do
         allow(helper).to receive(:facet_configuration_for_field).with('simple_field').and_return(Blacklight::Configuration::FacetField.new(key: 'simple_field', query: nil, date: nil, helper_method: nil, single: false, url_method: :test_method))