blacklight 7.20.1 → 7.22.0

data/app/views/record_mailer/sms_record.text.erb

@@ -1,4 +1,4 @@
 <% @documents.each do |document| %>
-<%= document.to_sms_text %>
+<%= document.to_sms_text(@config) %>
 <%= t('blacklight.sms.text.url', :url => polymorphic_url(document, @url_gen_params) ) %>
 <% end %>

data/config/locales/blacklight.de.yml

@@ -232,7 +232,7 @@ de:
     entry_name:
       default:
         one: Eintrag
-        other: Enträge
+        other: Einträge
       grouped:
         default: 'gruppiertes Ergebnis'
 

data/docker-compose.yml

@@ -7,8 +7,9 @@ services:
       dockerfile: .docker/app/Dockerfile
       args:
         - ALPINE_RUBY_VERSION
-    volumes:
-      - .:/app
+    # mounting . is causing seg-fault on macosx
+    #volumes:
+      #- .:/app
     depends_on:
       - solr
     ports:
@@ -16,6 +17,8 @@ services:
     environment:
       - SOLR_URL # Set via environment variable or use default defined in .env file
       - RAILS_VERSION # Set via environment variable or use default defined in .env file
+      - SOLR_ENV=docker-compose
+      - ENGINE_CART_RAILS_OPTIONS=--skip-git --skip-listen --skip-spring --skip-keeps --skip-action-cable --skip-coffee --skip-test --skip-solr
 
   solr:
     environment:

data/lib/blacklight/configuration/facet_field.rb

@@ -58,6 +58,8 @@ module Blacklight
     # Rendering:
     # @!attribute presenter
     #   @return [Blacklight::FacetFieldPresenter]
+    # @!attribute item_presenter
+    #   @return [Blacklight::FacetItemPresenter]
     # @!attribute component
     #   @return [Blacklight::FacetFieldListComponent]
     # @!attribute item_component

data/lib/blacklight/configuration.rb

@@ -101,6 +101,9 @@ module Blacklight
             show: { top_level_config: :show },
             citation: { parent_config: :show }
           ),
+          # SMS and Email configurations.
+          sms: ViewConfig.new,
+          email: ViewConfig.new,
           # Configurations for specific types of index views
           view: NestedOpenStructWithHashAccess.new(ViewConfig,
                                                    list: {},
@@ -167,6 +170,12 @@ module Blacklight
     # solr fields to use for sorting results
     define_field_access :sort_field
 
+    # solr fields to use in text message
+    define_field_access :sms_field
+
+    # solr fields to use in email message
+    define_field_access :email_field
+
     def initialize(hash = {})
       super(self.class.default_values.deep_dup.merge(hash))
       yield(self) if block_given?

data/lib/blacklight/engine.rb

@@ -48,5 +48,7 @@ module Blacklight
     config.action_dispatch.rescue_responses["Blacklight::Exceptions::RecordNotFound"] = :not_found
 
     config.enable_search_bar_autofocus = false
+
+    config.facet_missing_param = '[* TO *]'
   end
 end

data/lib/blacklight/search_state/filter_field.rb

@@ -4,6 +4,8 @@ module Blacklight
   class SearchState
     # Modeling access to filter query parameters
     class FilterField
+      MISSING = { missing: true }.freeze
+
       # @param [Blacklight::Configuration::FacetField] config
       attr_reader :config
 
@@ -25,7 +27,9 @@ module Blacklight
       def add(item)
         new_state = search_state.reset_search
 
-        if item.respond_to?(:fq)
+        if item.try(:missing)
+          # if this is a 'missing' facet value, the :fq is only for backwards compatibility
+        elsif item.respond_to?(:fq)
           Array(item.fq).each do |f, v|
             new_state = new_state.filter(f).add(v)
           end
@@ -35,21 +39,28 @@ module Blacklight
           return new_state.filter(item.field).add(item)
         end
 
+        url_key = key
         params = new_state.params
         param = :f
         value = as_url_parameter(item)
+
+        if value == Blacklight::SearchState::FilterField::MISSING
+          url_key = "-#{key}"
+          value = Blacklight::Engine.config.facet_missing_param
+        end
+
         param = :f_inclusive if value.is_a?(Array)
 
         # value could be a string
         params[param] = (params[param] || {}).dup
 
         if value.is_a? Array
-          params[param][key] = value
+          params[param][url_key] = value
         elsif config.single
-          params[param][key] = [value]
+          params[param][url_key] = [value]
         else
-          params[param][key] = Array(params[param][key] || []).dup
-          params[param][key].push(value)
+          params[param][url_key] = Array(params[param][url_key] || []).dup
+          params[param][url_key].push(value)
         end
 
         new_state.reset(params)
@@ -63,19 +74,26 @@ module Blacklight
           return new_state.filter(item.field).remove(item)
         end
 
+        url_key = config.key
         params = new_state.params
 
         param = :f
         value = as_url_parameter(item)
+
+        if value == Blacklight::SearchState::FilterField::MISSING
+          url_key = "-#{key}"
+          value = Blacklight::Engine.config.facet_missing_param
+        end
+
         param = :f_inclusive if value.is_a?(Array)
 
         # need to dup the facet values too,
         # if the values aren't dup'd, then the values
         # from the session will get remove in the show view...
         params[param] = (params[param] || {}).dup
-        params[param][key] = (params[param][key] || []).dup
+        params[param][url_key] = (params[param][url_key] || []).dup
 
-        collection = params[param][key]
+        collection = params[param][url_key]
         # collection should be an array, because we link to ?f[key][]=value,
         # however, Facebook (and maybe some other PHP tools) tranform that parameters
         # into ?f[key][0]=value, which Rails interprets as a Hash.
@@ -84,18 +102,10 @@ module Blacklight
           collection = collection.values
         end
 
-        params[param][key] = collection - Array(value)
-        params[param].delete(key) if params[param][key].empty?
+        params[param][url_key] = collection - Array(value)
+        params[param].delete(url_key) if params[param][url_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
 
@@ -104,8 +114,9 @@ module Blacklight
         params = search_state.params
         f = Array(params.dig(:f, key))
         f_inclusive = [params.dig(:f_inclusive, key)] if params.dig(:f_inclusive, key).present?
+        f_missing = [Blacklight::SearchState::FilterField::MISSING] if params.dig(:f, "-#{key}")&.any? { |v| v == Blacklight::Engine.config.facet_missing_param }
 
-        f + (f_inclusive || [])
+        f + (f_inclusive || []) + (f_missing || [])
       end
       delegate :any?, to: :values
 
@@ -121,6 +132,8 @@ module Blacklight
 
         if value.is_a?(Array)
           (params.dig(:f_inclusive, key) || []).to_set == value.to_set
+        elsif value == Blacklight::SearchState::FilterField::MISSING
+          (params.dig(:f, "-#{key}") || []).include?(Blacklight::Engine.config.facet_missing_param)
         else
           (params.dig(:f, key) || []).include?(value)
         end
@@ -130,7 +143,9 @@ module Blacklight
 
       # TODO: this code is duplicated in Blacklight::FacetsHelperBehavior
       def as_url_parameter(item)
-        if item.respond_to? :value
+        if item.respond_to?(:missing) && item.missing
+          Blacklight::SearchState::FilterField::MISSING
+        elsif item.respond_to? :value
           item.value
         else
           item

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

@@ -61,6 +61,10 @@ module Blacklight::Solr::Response::Facets
       @options[:data] || {}
     end
 
+    def response
+      @options[:response]
+    end
+
     def index?
       sort == 'index'
     end
@@ -171,7 +175,8 @@ module Blacklight::Solr::Response::Facets
         # legacy solr facet.missing serialization
         if value.nil?
           i.label = I18n.t(:"blacklight.search.fields.facet.missing.#{facet_field_name}", default: [:"blacklight.search.facets.missing"])
-          i.fq = "-#{facet_field_name}:[* TO *]"
+          i.fq = "-#{facet_field_name}:[* TO *]" # this explicit fq is deprecated; the missing attribute below is a better thing to check for this case
+          i.value = Blacklight::SearchState::FilterField::MISSING
           i.missing = true
         end
 
@@ -179,7 +184,7 @@ module Blacklight::Solr::Response::Facets
       end
 
       options = facet_field_aggregation_options(facet_field_name)
-      facet_field = FacetField.new(facet_field_name, items, options)
+      facet_field = FacetField.new(facet_field_name, items, options.merge(response: self))
 
       if values[nil]
         facet_field.missing = items.find(&:missing)
@@ -212,7 +217,9 @@ module Blacklight::Solr::Response::Facets
 
       items = items.sort_by(&:hits).reverse if facet_field.sort && facet_field.sort.to_sym == :count
 
-      hash[field_name] = Blacklight::Solr::Response::Facets::FacetField.new field_name, items
+      facet_field = Blacklight::Solr::Response::Facets::FacetField.new field_name, items, response: response
+
+      hash[field_name] = facet_field
     end
   end
 
@@ -243,7 +250,9 @@ module Blacklight::Solr::Response::Facets
 
       # alias all the possible blacklight config names..
       blacklight_config.facet_fields.select { |_k, v| v.pivot && v.pivot.join(",") == field_name }.each_key do |key|
-        hash[key] = Blacklight::Solr::Response::Facets::FacetField.new key, items
+        facet_field = Blacklight::Solr::Response::Facets::FacetField.new key, items, response: self
+
+        hash[key] = facet_field
       end
     end
   end
@@ -287,7 +296,7 @@ module Blacklight::Solr::Response::Facets
         i
       end
 
-      options = facet_field_aggregation_options(facet_field_name).merge(data: data)
+      options = facet_field_aggregation_options(facet_field_name).merge(data: data, response: self)
       facet_field = FacetField.new(facet_field_name, items, options)
 
       facet_field.missing = Blacklight::Solr::Response::Facets::FacetItem.new(

data/lib/blacklight/solr/search_builder_behavior.rb

@@ -10,7 +10,6 @@ module Blacklight::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
@@ -82,19 +81,6 @@ module Blacklight::Solr
       end
     end
 
-    ##
-    # 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
 
@@ -384,6 +370,8 @@ module Blacklight::Solr
       elsif value.is_a?(Range)
         prefix = "{!#{local_params.join(' ')}}" unless local_params.empty?
         "#{prefix}#{solr_field}:[#{value.first} TO #{value.last}]"
+      elsif value == Blacklight::SearchState::FilterField::MISSING
+        "-#{solr_field}:[* TO *]"
       else
         "{!term f=#{solr_field}#{(' ' + local_params.join(' ')) unless local_params.empty?}}#{convert_to_term_value(value)}"
       end

data/package.json

@@ -1,7 +1,7 @@
 {
   "name": "blacklight-frontend",
-  "version": "7.20.1",
-  "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)",
+  "version": "7.21.2",
+  "description": "[![Build Status](https://travis-ci.com/projectblacklight/blacklight.png?branch=main)](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=main)](https://coveralls.io/github/projectblacklight/blacklight?branch=main)",
   "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"
@@ -23,8 +23,10 @@
   "devDependencies": {
     "@babel/cli": "^7.2.3",
     "@babel/core": "^7.2.3",
+    "@babel/preset-env": "^7.16.0",
     "shx": "^0.3.2"
   },
+  "browserslist": "> 0.25%, not dead",
   "dependencies": {
     "bloodhound-js": "^1.2.3",
     "bootstrap": ">=4.3.1 <6.0.0",

data/spec/controllers/catalog_controller_spec.rb

@@ -501,6 +501,12 @@ RSpec.describe CatalogController, api: true do
     end
 
     describe "email", api: false do
+      let(:config) { Blacklight::Configuration.new }
+
+      before do
+        allow(controller).to receive(:blacklight_config).and_return(config)
+      end
+
       it "gives error if no TO parameter" do
         post :email, params: { id: doc_id }
         expect(request.flash[:error]).to eq "You must enter a recipient in order to send this message"
@@ -518,7 +524,7 @@ RSpec.describe CatalogController, api: true do
 
       it "redirects back to the record upon success" do
         allow(RecordMailer).to receive(:email_record)
-          .with(anything, { to: 'test_email@projectblacklight.org', message: 'xyz' }, hash_including(host: 'test.host'))
+          .with(anything, { to: 'test_email@projectblacklight.org', message: 'xyz', config: config }, hash_including(host: 'test.host'))
           .and_return double(deliver: nil)
         post :email, params: { id: doc_id, to: 'test_email@projectblacklight.org', message: 'xyz' }
         expect(request.flash[:error]).to be_nil
@@ -533,6 +539,12 @@ RSpec.describe CatalogController, api: true do
     end
 
     describe "sms", api: false do
+      let(:config) { Blacklight::Configuration.new }
+
+      before do
+        allow(controller).to receive(:blacklight_config).and_return(config)
+      end
+
       it "gives error if no phone number is given" do
         post :sms, params: { id: doc_id, carrier: 'att' }
         expect(request.flash[:error]).to eq "You must enter a recipient's phone number in order to send this message"
@@ -562,7 +574,7 @@ RSpec.describe CatalogController, api: true do
       it "sends to the appropriate carrier email address" do
         expect(RecordMailer)
           .to receive(:sms_record)
-          .with(anything, { to: '5555555555@txt.att.net' }, hash_including(host: 'test.host'))
+          .with(anything, { to: '5555555555@txt.att.net', config: config }, hash_including(host: 'test.host'))
           .and_return double(deliver: nil)
         post :sms, params: { id: doc_id, to: '5555555555', carrier: 'txt.att.net' }
       end

data/spec/features/axe_spec.rb

@@ -1,34 +1,33 @@
 # frozen_string_literal: true
 
 RSpec.describe 'Accessibility testing', api: false, js: true do
-  xit 'validates the home page' do
+  it 'validates the home page' do
     visit root_path
     expect(page).to be_accessible
   end
 
-  xit 'validates the catalog page' do
+  it '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'])
+    expect(page).to be_accessible
 
     within '.card.blacklight-language_ssim' do
       click_button 'Language'
       click_link "Tibetan"
     end
 
-    expect(page).to be_accessible(skipping: ['aria-allowed-role'])
+    expect(page).to be_accessible
   end
 
-  xit 'validates the single results page' do
+  it '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')])
+    be_axe_clean.excluding('.tt-hint').skipping(skipping + [('color-contrast' if Bootstrap::VERSION < '5')].compact)
   end
 end

data/spec/features/facet_missing_spec.rb

@@ -32,8 +32,12 @@ RSpec.describe "Facet missing" do
   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][]="
+    it "unselects the missing field facet" do
+      visit root_path
+
+      within "#facet-subject_geo_ssim" do
+        click_link "[Missing]"
+      end
 
       within "#facet-subject_geo_ssim" do
         click_link "remove"
@@ -45,8 +49,12 @@ RSpec.describe "Facet missing" do
   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][]="
+    it "unselects the missing field facet" do
+      visit root_path
+
+      within "#facet-subject_geo_ssim" do
+        click_link "[Missing]"
+      end
 
       within ".filter-subject_geo_ssim" do
         click_link "Remove constraint Region: [Missing]"

data/spec/helpers/blacklight/facets_helper_behavior_spec.rb

@@ -305,7 +305,7 @@ RSpec.describe Blacklight::FacetsHelperBehavior do
     let(:search_state) { double(has_facet?: false, add_facet_params_and_redirect: { controller: 'catalog' }) }
 
     before 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: nil))
+      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: nil, item_presenter: nil))
       allow(helper).to receive(:facet_display_value).and_return('Z')
       allow(helper).to receive(:search_state).and_return(search_state)
       allow(helper).to receive(:search_action_path) do |*args|
@@ -326,7 +326,7 @@ RSpec.describe Blacklight::FacetsHelperBehavior do
       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))
+        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, item_presenter: nil))
         allow(helper).to receive(:test_method).with('simple_field', item).and_return('/blabla')
         result = helper.render_facet_value('simple_field', item)
         expect(result).to be_equivalent_to(expected_html).respecting_element_order
@@ -345,28 +345,28 @@ RSpec.describe Blacklight::FacetsHelperBehavior do
 
   describe "#facet_display_value" do
     it "justs be the facet value for an ordinary facet" do
-      allow(helper).to receive(:facet_configuration_for_field).with('simple_field').and_return(double(query: nil, date: nil, helper_method: nil, url_method: nil))
+      allow(helper).to receive(:facet_configuration_for_field).with('simple_field').and_return(double(query: nil, date: nil, helper_method: nil, url_method: nil, item_presenter: nil))
       expect(helper.facet_display_value('simple_field', 'asdf')).to eq 'asdf'
     end
 
     it "allows you to pass in a :helper_method argument to the configuration" do
-      allow(helper).to receive(:facet_configuration_for_field).with('helper_field').and_return(double(query: nil, date: nil, url_method: nil, helper_method: :my_facet_value_renderer))
+      allow(helper).to receive(:facet_configuration_for_field).with('helper_field').and_return(double(query: nil, date: nil, url_method: nil, helper_method: :my_facet_value_renderer, item_presenter: nil))
       allow(helper).to receive(:my_facet_value_renderer).with('qwerty').and_return('abc')
       expect(helper.facet_display_value('helper_field', 'qwerty')).to eq 'abc'
     end
 
     it "extracts the configuration label for a query facet" do
-      allow(helper).to receive(:facet_configuration_for_field).with('query_facet').and_return(double(query: { 'query_key' => { label: 'XYZ' } }, date: nil, helper_method: nil, url_method: nil))
+      allow(helper).to receive(:facet_configuration_for_field).with('query_facet').and_return(double(query: { 'query_key' => { label: 'XYZ' } }, date: nil, helper_method: nil, url_method: nil, item_presenter: nil))
       expect(helper.facet_display_value('query_facet', 'query_key')).to eq 'XYZ'
     end
 
     it "localizes the label for date-type facets" do
-      allow(helper).to receive(:facet_configuration_for_field).with('date_facet').and_return(double('date' => true, :query => nil, :helper_method => nil, :url_method => nil))
+      allow(helper).to receive(:facet_configuration_for_field).with('date_facet').and_return(double('date' => true, :query => nil, :helper_method => nil, :url_method => nil, :item_presenter => nil))
       expect(helper.facet_display_value('date_facet', '2012-01-01')).to eq 'Sun, 01 Jan 2012 00:00:00 +0000'
     end
 
     it "localizes the label for date-type facets with the supplied localization options" do
-      allow(helper).to receive(:facet_configuration_for_field).with('date_facet').and_return(double('date' => { format: :short }, :query => nil, :helper_method => nil, :url_method => nil))
+      allow(helper).to receive(:facet_configuration_for_field).with('date_facet').and_return(double('date' => { format: :short }, :query => nil, :helper_method => nil, :url_method => nil, :item_presenter => nil))
       expect(helper.facet_display_value('date_facet', '2012-01-01')).to eq '01 Jan 00:00'
     end
   end

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

@@ -162,28 +162,14 @@ RSpec.describe Blacklight::SearchState::FilterField do
 
     context "With facet.missing field" do
       let(:params) do
-        { f: { some_field: [""], "-some_field:": [""] } }
+        { f: { "-some_field": ["[* TO *]"] } }
       end
 
       it "removes facet.missing facet params" do
         filter = search_state.filter("some_field")
-        new_state = filter.remove(OpenStruct.new(fq: "-some_field:[* TO *]"))
+        new_state = filter.remove(OpenStruct.new(key: 'some_field', missing: true))
 
-        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" => {})
+        expect(new_state.params).to eq({})
       end
     end
   end

data/spec/models/blacklight/configuration_spec.rb

@@ -543,6 +543,98 @@ RSpec.describe "Blacklight::Configuration", api: true do
     end
   end
 
+  describe "add_sms_field" do
+    it "takes hash form" do
+      config.add_sms_field("title_tsim", label: "Title")
+
+      expect(config.sms_fields["title_tsim"]).not_to be_nil
+      expect(config.sms_fields["title_tsim"].label).to eq "Title"
+    end
+
+    it "takes ShowField argument" do
+      config.add_sms_field("title_tsim", Blacklight::Configuration::SmsField.new(field: "title_display", label: "Title"))
+
+      expect(config.sms_fields["title_tsim"]).not_to be_nil
+      expect(config.sms_fields["title_tsim"].label).to eq "Title"
+    end
+
+    it "takes block form" do
+      config.add_sms_field("title_tsim") do |f|
+        f.label = "Title"
+      end
+
+      expect(config.sms_fields["title_tsim"]).not_to be_nil
+      expect(config.sms_fields["title_tsim"].label).to eq "Title"
+    end
+
+    it "creates default label humanized from field" do
+      config.add_sms_field("my_custom_field")
+
+      expect(config.sms_fields["my_custom_field"].label).to eq "My Custom Field"
+    end
+
+    it "raises on nil solr field name" do
+      expect { config.add_sms_field(nil) }.to raise_error ArgumentError
+    end
+
+    it "takes wild-carded field names and dereference them to solr fields" do
+      allow(config).to receive(:reflected_fields).and_return(
+        "some_field_display" => {},
+        "another_field_display" => {},
+        "a_facet_field" => {}
+      )
+      config.add_sms_field "*_display"
+
+      expect(config.sms_fields.keys).to eq %w[some_field_display another_field_display]
+    end
+  end
+
+  describe "add_email_field" do
+    it "takes hash form" do
+      config.add_email_field("title_tsim", label: "Title")
+
+      expect(config.email_fields["title_tsim"]).not_to be_nil
+      expect(config.email_fields["title_tsim"].label).to eq "Title"
+    end
+
+    it "takes ShowField argument" do
+      config.add_email_field("title_tsim", Blacklight::Configuration::EmailField.new(field: "title_display", label: "Title"))
+
+      expect(config.email_fields["title_tsim"]).not_to be_nil
+      expect(config.email_fields["title_tsim"].label).to eq "Title"
+    end
+
+    it "takes block form" do
+      config.add_email_field("title_tsim") do |f|
+        f.label = "Title"
+      end
+
+      expect(config.email_fields["title_tsim"]).not_to be_nil
+      expect(config.email_fields["title_tsim"].label).to eq "Title"
+    end
+
+    it "creates default label humanized from field" do
+      config.add_email_field("my_custom_field")
+
+      expect(config.email_fields["my_custom_field"].label).to eq "My Custom Field"
+    end
+
+    it "raises on nil solr field name" do
+      expect { config.add_email_field(nil) }.to raise_error ArgumentError
+    end
+
+    it "takes wild-carded field names and dereference them to solr fields" do
+      allow(config).to receive(:reflected_fields).and_return(
+        "some_field_display" => {},
+        "another_field_display" => {},
+        "a_facet_field" => {}
+      )
+      config.add_email_field "*_display"
+
+      expect(config.email_fields.keys).to eq %w[some_field_display another_field_display]
+    end
+  end
+
   describe "#default_search_field" do
     it "uses the field with a :default key" do
       config.add_search_field('search_field_1')