blacklight 6.21.0 → 7.0.0

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

@@ -1,21 +1,18 @@
 # frozen_string_literal: true
 
-describe "catalog/index.html.erb" do
-
+RSpec.describe "catalog/index.html.erb" do
   describe "with no search parameters" do
     before do
       allow(view).to receive(:has_search_parameters?).and_return(false)
       allow(view).to receive(:blacklight_config).and_return(Blacklight::Configuration.new)
     end
-    it "renders the sidebar and content panes" do
-      render
-      expect(rendered).to match /id="sidebar"/
-      expect(rendered).to match /id="content"/
-    end
+
+    let(:sidebar) { view.content_for(:sidebar) }
+
     it "renders the search_sidebar partial" do
       stub_template "catalog/_search_sidebar.html.erb" => "sidebar_content"
       render
-      expect(rendered).to match /sidebar_content/
+      expect(sidebar).to match /sidebar_content/
     end
   end
 
@@ -28,6 +25,7 @@ describe "catalog/index.html.erb" do
       allow(view).to receive(:render_opensearch_response_metadata).and_return("")
       assign(:response, instance_double(Blacklight::Solr::Response, empty?: true))
     end
+
     it "renders the search_header partial" do
       render
       expect(rendered).to match /header_content/

data/spec/views/catalog/index.json.jbuilder_spec.rb

@@ -1,30 +1,123 @@
 # frozen_string_literal: true
-describe "catalog/index.json" do
-  let(:response) { instance_double(Blacklight::Solr::Response) }
-  let(:docs) { [{ id: '123', title_t: 'Book1' }, { id: '456', title_t: 'Book2' }] }
-  let(:facets) { double("facets") }
-  let(:config) { instance_double(Blacklight::Configuration) }
-  let(:presenter) { Blacklight::JsonPresenter.new(response, docs, facets, config) }
-
-  it "renders index json" do
-    allow(presenter).to receive(:pagination_info).and_return({ current_page: 1, next_page: 2,
-                                                               prev_page: nil })
-    allow(presenter).to receive(:search_facets_as_json).and_return(
-          [{ name: "format", label: "Format",
-             items: [{ value: 'Book', hits: 30, label: 'Book' }] }])
-    assign :presenter, presenter
+
+RSpec.describe "catalog/index.json", api: true do
+  let(:response) { instance_double(Blacklight::Solr::Response, documents: docs, prev_page: nil, next_page: 2, total_pages: 3) }
+  let(:docs) do
+    [
+      SolrDocument.new(id: '123', title_tsim: 'Book1', author_tsim: 'Julie', format: 'Book'),
+      SolrDocument.new(id: '456', title_tsim: 'Article1', author_tsim: 'Rosie', format: 'Article')
+    ]
+  end
+  let(:config) do
+    Blacklight::Configuration.new do |config|
+      config.add_index_field 'title', label: 'Title', field: 'title_tsim'
+    end
+  end
+  let(:presenter) { Blacklight::JsonPresenter.new(response, config) }
+
+  let(:hash) do
     render template: "catalog/index.json", format: :json
-    hash = JSON.parse(rendered)
-    expect(hash).to eq('response' => { 'docs' => [{ 'id' => '123', 'title_t' => 'Book1' },
-                                                  { 'id' => '456', 'title_t' => 'Book2' }],
-                                       'facets' => [{ 'name' => "format", 'label' => "Format",
-                                                      'items' => [
-                                                        { 'value' => 'Book',
-                                                          'hits' => 30,
-                                                          'label' => 'Book' }] }],
-                                       'pages' => { 'current_page' =>  1,
-                                                    'next_page' => 2,
-                                                    'prev_page' => nil } }
-                      )
+    JSON.parse(rendered).with_indifferent_access
+  end
+
+  let(:book_facet_item) do
+    Blacklight::Solr::Response::Facets::FacetItem.new('value' => 'Book', 'hits' => 30, 'label' => 'Book')
+  end
+
+  let(:format_facet) do
+    Blacklight::Solr::Response::Facets::FacetField.new('format',
+                                                       [book_facet_item],
+                                                       'label' => 'Format')
+  end
+
+  before do
+    allow(view).to receive(:blacklight_config).and_return(config)
+    allow(view).to receive(:search_action_path).and_return('http://test.host/some/search/url')
+    allow(view).to receive(:search_facet_path).and_return('http://test.host/some/facet/url')
+    allow(presenter).to receive(:pagination_info).and_return(current_page: 1,
+                                                             next_page: 2,
+                                                             prev_page: nil)
+    allow(presenter).to receive(:search_facets).and_return([format_facet])
+    assign :presenter, presenter
+    assign :response, response
+  end
+
+  it "has pagination links" do
+    expect(hash).to include(links: hash_including(
+      self: 'http://test.host/',
+      next: 'http://test.host/?page=2',
+      last: 'http://test.host/?page=3'
+    ))
+  end
+
+  it "has pagination information" do
+    expect(hash).to include(meta: hash_including(pages:
+      {
+        'current_page' => 1,
+        'next_page' => 2,
+        'prev_page' => nil
+      }))
+  end
+
+  it "includes documents, links, and their attributes" do
+    expect(hash).to include(data: [
+                              {
+                                id: '123',
+                                type: 'Book',
+                                attributes: {
+                                  'title': {
+                                    id: 'http://test.host/catalog/123#title',
+                                    type: 'document_value',
+                                    attributes: {
+                                      value: 'Book1',
+                                      label: 'Title'
+                                    }
+                                  }
+                                },
+                                links: { self: 'http://test.host/catalog/123' }
+                              },
+                              {
+                                id: '456',
+                                type: 'Article',
+                                attributes: {
+                                  'title': {
+                                    id: 'http://test.host/catalog/456#title',
+                                    type: 'document_value',
+                                    attributes: {
+                                      value: 'Article1',
+                                      label: 'Title'
+                                    }
+                                  }
+                                },
+                                links: { self: 'http://test.host/catalog/456' }
+                              }
+                            ])
+  end
+
+  describe 'facets' do
+    let(:facets) { hash[:included].select { |x| x['type'] == 'facet' } }
+    let(:format) { facets.find { |x| x['id'] == 'format' } }
+    let(:format_items) { format['attributes']['items'] }
+    let(:format_item_attributes) { format_items.map { |x| x['attributes'] } }
+
+    context 'when no facets have been selected' do
+      it 'has facet information and links' do
+        expect(facets).to be_present
+        expect(facets.map { |x| x['id'] }).to include 'format'
+        expect(format['links']).to include self: 'http://test.host/some/facet/url'
+        expect(format['attributes']['label']).to eq 'Format'
+        expect(format_item_attributes).to match_array [{ value: 'Book', hits: 30, label: 'Book' }]
+      end
+    end
+
+    context 'when facets have been selected' do
+      before do
+        params[:f] = { format: ['Book'] }
+      end
+
+      it 'has a link to remove the selected value' do
+        expect(format_items.first['links']).to eq('remove' => 'http://test.host/some/search/url')
+      end
+    end
   end
 end

data/spec/views/catalog/opensearch.xml.builder_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-describe 'catalog/opensearch.xml.builder' do
+RSpec.describe 'catalog/opensearch.xml.builder' do
   it "renders an OpenSearch description document" do
     render
     doc = Nokogiri::XML.parse(rendered)

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

@@ -1,14 +1,14 @@
 # frozen_string_literal: true
 
-describe "catalog/show.html.erb" do
-  let(:document) { SolrDocument.new :id => 'xyz', :format => 'a' }
+RSpec.describe "catalog/show.html.erb" do
+  let(:document) { SolrDocument.new id: 'xyz', format: 'a' }
   let(:blacklight_config) { Blacklight::Configuration.new }
 
-  before :each do
+  before do
     allow(view).to receive(:action_name).and_return('show')
-    allow(view).to receive_messages(:has_user_authentication_provider? => false)
-    allow(view).to receive_messages(:render_document_sidebar_partial => "Sidebar")
-    allow(view).to receive_messages(current_search_session: nil)
+    allow(view).to receive_messages(has_user_authentication_provider?: false)
+    allow(view).to receive_messages(render_document_sidebar_partial: "Sidebar")
+    allow(view).to receive_messages(current_search_session: nil, search_session: {})
     assign :document, document
     allow(view).to receive(:blacklight_config).and_return(blacklight_config)
   end
@@ -23,7 +23,7 @@ describe "catalog/show.html.erb" do
 
   it "includes schema.org itemscope/type properties" do
     allow(view).to receive(:document_show_html_title).and_return("Heading")
-    allow(document).to receive_messages(:itemtype => 'some-item-type-uri')
+    allow(document).to receive_messages(itemtype: 'some-item-type-uri')
     render
     expect(rendered).to have_selector('div#document[@itemscope]')
     expect(rendered).to have_selector('div#document[@itemtype="some-item-type-uri"]')
@@ -40,7 +40,7 @@ describe "catalog/show.html.erb" do
 
   it "uses the show.partials parameter to determine the partials to render" do
     allow(view).to receive(:render_grouped_response?).and_return(false)
-    blacklight_config.show.partials = ['a', 'b', 'c']
+    blacklight_config.show.partials = %w[a b c]
     stub_template "catalog/_a_default.html.erb" => "a_partial"
     stub_template "catalog/_b_default.html.erb" => "b_partial"
     stub_template "catalog/_c_default.html.erb" => "c_partial"

data/spec/views/catalog/show.json.jbuilder_spec.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+RSpec.describe "catalog/show.json" do
+  let(:document) do
+    SolrDocument.new(id: '123', title_tsim: 'Book1', author_tsim: 'Julie', format: 'Book')
+  end
+  let(:config) do
+    Blacklight::Configuration.new do |config|
+      config.add_show_field 'title', label: 'Title', field: 'title_tsim'
+    end
+  end
+
+  let(:hash) do
+    render template: "catalog/show.json", format: :json
+    JSON.parse(rendered).with_indifferent_access
+  end
+
+  before do
+    allow(view).to receive(:blacklight_config).and_return(config)
+    assign :document, document
+  end
+
+  it "includes document attributes" do
+    expect(hash).to include(data:
+      {
+        id: '123',
+        type: 'Book',
+        attributes: {
+          'title' => {
+            id: 'http://test.host/catalog/123#title',
+            type: 'document_value',
+            attributes: {
+              value: 'Book1',
+              label: 'Title'
+            }
+          }
+        }
+      })
+  end
+end

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

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+RSpec.describe "catalog/sms_success.html.erb" do
+  it "includes the data-blacklight-modal properties" do
+    render
+    expect(rendered).to have_selector "div[data-blacklight-modal=container]"
+  end
+end

data/spec/views/{_user_util_links.html.erb_spec.rb → shared/_user_util_links.html.erb_spec.rb}

@@ -1,12 +1,10 @@
 # frozen_string_literal: true
 
-describe "_user_util_links" do
-
-  let :blacklight_config do
+RSpec.describe "shared/_user_util_links" do
+  let(:blacklight_config) do
     Blacklight::Configuration.new.configure do |config|
       config.navbar.partials = { bookmark: Blacklight::Configuration::ToolConfig.new(partial: 'blacklight/nav/bookmark', if: :render_bookmarks_control?) }
     end
-
   end
 
   it "renders the correct bookmark count" do
@@ -15,8 +13,7 @@ describe "_user_util_links" do
     allow(controller).to receive(:render_bookmarks_control?).and_return true
     allow(view).to receive(:has_user_authentication_provider?).and_return false
     allow(view).to receive_message_chain(:current_or_guest_user, :bookmarks, :count).and_return(count)
-    render :partial => "user_util_links"
-    expect(rendered).to have_selector('#bookmarks_nav span[data-role=bookmark-counter]', text: "#{count}")
+    render "shared/user_util_links"
+    expect(rendered).to have_selector('#bookmarks_nav span.badge[data-role=bookmark-counter]', text: count.to_s)
   end
-
 end

data/tasks/blacklight.rake

@@ -1,14 +1,18 @@
+# frozen_string_literal: true
+
 require 'solr_wrapper'
 require 'engine_cart/rake_task'
 
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec) do |t|
-  t.pattern =  'spec/**/*_spec.rb'
+  t.pattern = 'spec/**/*_spec.rb'
 end
 
 require 'rubocop/rake_task'
 RuboCop::RakeTask.new(:rubocop)
 
+EngineCart.fingerprint_proc = EngineCart.rails_fingerprint_proc
+
 desc "Run test suite"
 task ci: ['blacklight:generate'] do
   SolrWrapper.wrap do |solr|
@@ -29,11 +33,11 @@ namespace :blacklight do
   end
 
   desc "Create the test rails app"
-  task :generate => ['engine_cart:generate'] do
+  task generate: ['engine_cart:generate'] do
   end
 
   namespace :internal do
-    task :seed => ['engine_cart:generate'] do
+    task seed: ['engine_cart:generate'] do
       within_test_app do
         system "bundle exec rake blacklight:index:seed"
       end
@@ -41,7 +45,7 @@ namespace :blacklight do
   end
 
   desc 'Run Solr and Blacklight for interactive development'
-  task :server, [:rails_server_args] do |t, args|
+  task :server, [:rails_server_args] do |_t, args|
     if File.exist? EngineCart.destination
       within_test_app do
         system "bundle update"

data/template.demo.rb

@@ -1,21 +1,13 @@
+# frozen_string_literal: true
+
 gem "blacklight", ">= 6.1"
-gem "jettywrapper", ">= 2.0"
-gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw]
 
 run "bundle install"
 
 # run the blacklight install generator
-options = ENV.fetch("BLACKLIGHT_INSTALL_OPTIONS", '--devise --marc --jettywrapper')
+options = ENV.fetch("BLACKLIGHT_INSTALL_OPTIONS", '--devise --marc --solr_version=latest')
 
 generate 'blacklight:install', options
 
 # run the database migrations
 rake "db:migrate"
-
-# index some data
-if options =~ /jettywrapper/
-  rake "jetty:clean"
-  rake "jetty:start"
-  rake "blacklight:index:seed"
-  rake "jetty:stop"
-end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 6.21.0
+  version: 7.0.0
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -17,28 +17,22 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-08 00:00:00.000000000 Z
+date: 2018-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.2'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.2'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: globalid
   requirement: !ruby/object:Gem::Requirement
@@ -95,40 +89,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0.15'
-- !ruby/object:Gem::Dependency
-  name: rsolr
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.6
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.6
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3'
-- !ruby/object:Gem::Dependency
-  name: bootstrap-sass
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: deprecation
   requirement: !ruby/object:Gem::Requirement
@@ -144,19 +104,25 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: twitter-typeahead-rails
+  name: rsolr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.11.1.pre.corejavascript
-  type: :runtime
+        version: 1.0.6
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.11.1.pre.corejavascript
+        version: 1.0.6
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: solr_wrapper
   requirement: !ruby/object:Gem::Requirement
@@ -217,36 +183,30 @@ dependencies:
   name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '3'
 - !ruby/object:Gem::Dependency
-  name: webdrivers
+  name: chromedriver-helper
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 2.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
@@ -267,14 +227,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
   requirement: !ruby/object:Gem::Requirement
@@ -290,7 +250,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -304,47 +264,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.60.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.60.0
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.47.0
+        version: '1.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.47.0
+        version: '1.8'
 - !ruby/object:Gem::Dependency
-  name: rubocop-rspec
+  name: i18n-tasks
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: '0'
 description: |-
   Blacklight is an open source Solr user interface discovery platform.
       You can use Blacklight to enable searching and browsing of your
@@ -359,6 +319,7 @@ files:
 - ".gitignore"
 - ".hound.yml"
 - ".jshintrc"
+- ".npmignore"
 - ".rspec"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
@@ -371,34 +332,32 @@ files:
 - Rakefile
 - VERSION
 - Vagrantfile
+- app/assets/images/blacklight/list.svg
 - app/assets/images/blacklight/logo.png
+- app/assets/images/blacklight/search.svg
 - app/assets/images/favicon.ico
-- app/assets/javascripts/blacklight/ajax_modal.js
-- app/assets/javascripts/blacklight/autocomplete.js
-- app/assets/javascripts/blacklight/autofocus.js
 - app/assets/javascripts/blacklight/blacklight.js
-- app/assets/javascripts/blacklight/bookmark_toggle.js
-- app/assets/javascripts/blacklight/checkbox_submit.js
-- app/assets/javascripts/blacklight/collapsable.js
-- app/assets/javascripts/blacklight/core.js
-- app/assets/javascripts/blacklight/facet_load.js
-- app/assets/javascripts/blacklight/search_context.js
 - app/assets/stylesheets/blacklight/_balanced_list.scss
 - app/assets/stylesheets/blacklight/_blacklight_base.scss
 - app/assets/stylesheets/blacklight/_bookmark.scss
+- app/assets/stylesheets/blacklight/_bootstrap_overrides.scss
 - app/assets/stylesheets/blacklight/_constraints.scss
 - app/assets/stylesheets/blacklight/_controls.scss
 - app/assets/stylesheets/blacklight/_facets.scss
 - app/assets/stylesheets/blacklight/_group.scss
 - app/assets/stylesheets/blacklight/_header.scss
+- app/assets/stylesheets/blacklight/_icons.scss
 - app/assets/stylesheets/blacklight/_layout.scss
+- app/assets/stylesheets/blacklight/_mixins.scss
 - app/assets/stylesheets/blacklight/_modal.scss
 - app/assets/stylesheets/blacklight/_pagination.scss
+- app/assets/stylesheets/blacklight/_search_form.scss
 - app/assets/stylesheets/blacklight/_search_history.scss
 - app/assets/stylesheets/blacklight/_search_results.scss
 - app/assets/stylesheets/blacklight/_twitter_typeahead.scss
 - app/assets/stylesheets/blacklight/blacklight.scss
 - app/assets/stylesheets/blacklight/blacklight_defaults.scss
+- app/builders/blacklight/action_builder.rb
 - app/controllers/bookmarks_controller.rb
 - app/controllers/catalog_controller.rb
 - app/controllers/concerns/blacklight/base.rb
@@ -407,42 +366,36 @@ files:
 - app/controllers/concerns/blacklight/controller.rb
 - app/controllers/concerns/blacklight/default_component_configuration.rb
 - app/controllers/concerns/blacklight/facet.rb
-- app/controllers/concerns/blacklight/request_builders.rb
-- app/controllers/concerns/blacklight/saved_searches.rb
 - app/controllers/concerns/blacklight/search_context.rb
 - app/controllers/concerns/blacklight/search_fields.rb
-- app/controllers/concerns/blacklight/search_helper.rb
 - app/controllers/concerns/blacklight/search_history.rb
-- app/controllers/concerns/blacklight/suggest.rb
 - app/controllers/concerns/blacklight/token_based_user.rb
-- app/controllers/saved_searches_controller.rb
 - app/controllers/search_history_controller.rb
-- app/controllers/suggest_controller.rb
 - app/helpers/blacklight/blacklight_helper_behavior.rb
 - app/helpers/blacklight/catalog_helper_behavior.rb
 - app/helpers/blacklight/component_helper_behavior.rb
 - app/helpers/blacklight/configuration_helper_behavior.rb
-- app/helpers/blacklight/deprecated_url_helper_behavior.rb
 - app/helpers/blacklight/facets_helper_behavior.rb
 - app/helpers/blacklight/hash_as_hidden_fields_helper_behavior.rb
+- app/helpers/blacklight/icon_helper_behavior.rb
 - app/helpers/blacklight/layout_helper_behavior.rb
 - app/helpers/blacklight/render_constraints_helper_behavior.rb
-- app/helpers/blacklight/render_partials_helper.rb
+- app/helpers/blacklight/render_partials_helper_behavior.rb
 - app/helpers/blacklight/search_history_constraints_helper_behavior.rb
 - app/helpers/blacklight/suggest_helper_behavior.rb
 - app/helpers/blacklight/url_helper_behavior.rb
-- app/helpers/blacklight_configuration_helper.rb
 - app/helpers/blacklight_helper.rb
-- app/helpers/blacklight_url_helper.rb
 - app/helpers/catalog_helper.rb
-- app/helpers/component_helper.rb
-- app/helpers/facets_helper.rb
-- app/helpers/hash_as_hidden_fields_helper.rb
-- app/helpers/layout_helper.rb
-- app/helpers/render_constraints_helper.rb
-- app/helpers/search_history_constraints_helper.rb
-- app/helpers/suggest_helper.rb
+- app/javascript/blacklight/autocomplete.js
+- app/javascript/blacklight/bookmark_toggle.js
+- app/javascript/blacklight/checkbox_submit.js
+- app/javascript/blacklight/collapsable.js
+- app/javascript/blacklight/core.js
+- app/javascript/blacklight/facet_load.js
+- app/javascript/blacklight/modal.js
+- app/javascript/blacklight/search_context.js
 - app/models/blacklight/facet_paginator.rb
+- app/models/blacklight/icon.rb
 - app/models/blacklight/solr/facet_paginator.rb
 - app/models/blacklight/suggest_search.rb
 - app/models/bookmark.rb
@@ -458,7 +411,6 @@ files:
 - app/models/concerns/blacklight/document/semantic_fields.rb
 - app/models/concerns/blacklight/document/sms.rb
 - app/models/concerns/blacklight/solr/document.rb
-- app/models/concerns/blacklight/solr/document/more_like_this.rb
 - app/models/concerns/blacklight/suggest/response.rb
 - app/models/concerns/blacklight/user.rb
 - app/models/record_mailer.rb
@@ -476,12 +428,14 @@ files:
 - app/presenters/blacklight/rendering/microdata.rb
 - app/presenters/blacklight/rendering/pipeline.rb
 - app/presenters/blacklight/rendering/terminator.rb
+- app/presenters/blacklight/search_bar_presenter.rb
 - app/presenters/blacklight/show_presenter.rb
+- app/presenters/blacklight/thumbnail_presenter.rb
+- app/services/blacklight/document_factory.rb
 - app/services/blacklight/field_retriever.rb
-- app/views/_flash_msg.html.erb
-- app/views/_user_util_links.html.erb
+- app/services/blacklight/search_service.rb
+- app/values/blacklight/types.rb
 - app/views/blacklight/nav/_bookmark.html.erb
-- app/views/blacklight/nav/_saved_searches.html.erb
 - app/views/blacklight/nav/_search_history.html.erb
 - app/views/bookmarks/_clear_bookmarks_widget.html.erb
 - app/views/bookmarks/_tools.html.erb
@@ -491,10 +445,10 @@ files:
 - app/views/catalog/_constraints.html.erb
 - app/views/catalog/_constraints_element.html.erb
 - app/views/catalog/_did_you_mean.html.erb
+- app/views/catalog/_document.atom.builder
 - app/views/catalog/_document.html.erb
+- app/views/catalog/_document.rss.builder
 - app/views/catalog/_document_action.html.erb
-- app/views/catalog/_document_default.atom.builder
-- app/views/catalog/_document_default.rss.builder
 - app/views/catalog/_document_list.html.erb
 - app/views/catalog/_email_form.html.erb
 - app/views/catalog/_facet_index_navigation.html.erb
@@ -503,11 +457,12 @@ files:
 - app/views/catalog/_facet_pagination.html.erb
 - app/views/catalog/_facet_pivot.html.erb
 - app/views/catalog/_facets.html.erb
-- app/views/catalog/_group_default.html.erb
+- app/views/catalog/_field.json.jbuilder
+- app/views/catalog/_group.html.erb
 - app/views/catalog/_home.html.erb
 - app/views/catalog/_home_text.html.erb
-- app/views/catalog/_index_default.html.erb
-- app/views/catalog/_index_header_default.html.erb
+- app/views/catalog/_index.html.erb
+- app/views/catalog/_index_header.html.erb
 - app/views/catalog/_opensearch_response_metadata.html.erb
 - app/views/catalog/_paginate_compact.html.erb
 - app/views/catalog/_per_page_widget.html.erb
@@ -517,8 +472,8 @@ files:
 - app/views/catalog/_search_header.html.erb
 - app/views/catalog/_search_results.html.erb
 - app/views/catalog/_search_sidebar.html.erb
-- app/views/catalog/_show_default.html.erb
-- app/views/catalog/_show_header_default.html.erb
+- app/views/catalog/_show.html.erb
+- app/views/catalog/_show_header.html.erb
 - app/views/catalog/_show_main_content.html.erb
 - app/views/catalog/_show_more_like_this.html.erb
 - app/views/catalog/_show_sidebar.html.erb
@@ -526,7 +481,7 @@ files:
 - app/views/catalog/_sms_form.html.erb
 - app/views/catalog/_sort_and_per_page.html.erb
 - app/views/catalog/_sort_widget.html.erb
-- app/views/catalog/_thumbnail_default.html.erb
+- app/views/catalog/_thumbnail.html.erb
 - app/views/catalog/_view_type_group.html.erb
 - app/views/catalog/_zero_results.html.erb
 - app/views/catalog/citation.html.erb
@@ -542,6 +497,7 @@ files:
 - app/views/catalog/opensearch.xml.builder
 - app/views/catalog/send_email_record.erb
 - app/views/catalog/show.html.erb
+- app/views/catalog/show.json.jbuilder
 - app/views/catalog/sms.html.erb
 - app/views/catalog/sms_success.html.erb
 - app/views/kaminari/blacklight/_first_page.html.erb
@@ -555,21 +511,27 @@ files:
 - app/views/kaminari/blacklight_compact/_paginator.html.erb
 - app/views/kaminari/blacklight_compact/_prev_page.html.erb
 - app/views/layouts/blacklight.html.erb
+- app/views/layouts/blacklight/base.html.erb
+- app/views/layouts/catalog_result.html.erb
 - app/views/record_mailer/email_record.text.erb
 - app/views/record_mailer/sms_record.text.erb
-- app/views/saved_searches/index.html.erb
 - app/views/search_history/index.html.erb
-- app/views/shared/_ajax_modal.html.erb
 - app/views/shared/_flash_messages.html.erb
+- app/views/shared/_flash_msg.html.erb
 - app/views/shared/_footer.html.erb
 - app/views/shared/_header_navbar.html.erb
+- app/views/shared/_modal.html.erb
 - app/views/shared/_sitelinks_search_box.html.erb
+- app/views/shared/_user_util_links.html.erb
 - blacklight.gemspec
+- config/i18n-tasks.yml
 - config/locales/blacklight.de.yml
 - config/locales/blacklight.en.yml
 - config/locales/blacklight.es.yml
 - config/locales/blacklight.fr.yml
+- config/locales/blacklight.hu.yml
 - config/locales/blacklight.it.yml
+- config/locales/blacklight.nl.yml
 - config/locales/blacklight.pt-BR.yml
 - config/locales/blacklight.sq.yml
 - config/locales/blacklight.zh.yml
@@ -591,6 +553,8 @@ files:
 - lib/blacklight/configuration/view_config.rb
 - lib/blacklight/engine.rb
 - lib/blacklight/exceptions.rb
+- lib/blacklight/nested_open_struct_with_hash_access.rb
+- lib/blacklight/open_struct_with_hash_access.rb
 - lib/blacklight/parameters.rb
 - lib/blacklight/routes.rb
 - lib/blacklight/routes/exportable.rb
@@ -610,7 +574,6 @@ files:
 - lib/blacklight/solr/response/response.rb
 - lib/blacklight/solr/response/spelling.rb
 - lib/blacklight/solr/search_builder_behavior.rb
-- lib/blacklight/utils.rb
 - lib/blacklight/version.rb
 - lib/generators/blacklight/assets_generator.rb
 - lib/generators/blacklight/controller_generator.rb
@@ -618,57 +581,53 @@ files:
 - lib/generators/blacklight/install_generator.rb
 - lib/generators/blacklight/models_generator.rb
 - lib/generators/blacklight/search_builder_generator.rb
-- lib/generators/blacklight/solr4_generator.rb
-- lib/generators/blacklight/solr5_generator.rb
+- lib/generators/blacklight/solr_generator.rb
+- lib/generators/blacklight/templates/.solr_wrapper.yml
 - lib/generators/blacklight/templates/alternate_controller.rb
 - lib/generators/blacklight/templates/blacklight.en.yml
 - lib/generators/blacklight/templates/blacklight.scss
 - lib/generators/blacklight/templates/catalog_controller.rb
 - lib/generators/blacklight/templates/config/blacklight.yml
-- lib/generators/blacklight/templates/config/jetty.yml
 - lib/generators/blacklight/templates/search_builder.rb
 - lib/generators/blacklight/templates/search_builder_spec.rb
+- lib/generators/blacklight/templates/solr/conf/_rest_managed.json
+- lib/generators/blacklight/templates/solr/conf/admin-extra.html
+- lib/generators/blacklight/templates/solr/conf/elevate.xml
+- lib/generators/blacklight/templates/solr/conf/mapping-ISOLatin1Accent.txt
+- lib/generators/blacklight/templates/solr/conf/protwords.txt
+- lib/generators/blacklight/templates/solr/conf/schema.xml
+- lib/generators/blacklight/templates/solr/conf/scripts.conf
+- lib/generators/blacklight/templates/solr/conf/solrconfig.xml
+- lib/generators/blacklight/templates/solr/conf/spellings.txt
+- lib/generators/blacklight/templates/solr/conf/stopwords.txt
+- lib/generators/blacklight/templates/solr/conf/stopwords_en.txt
+- lib/generators/blacklight/templates/solr/conf/synonyms.txt
+- lib/generators/blacklight/templates/solr/conf/xslt/example.xsl
+- lib/generators/blacklight/templates/solr/conf/xslt/example_atom.xsl
+- lib/generators/blacklight/templates/solr/conf/xslt/example_rss.xsl
+- lib/generators/blacklight/templates/solr/conf/xslt/luke.xsl
 - lib/generators/blacklight/templates/solr_document.rb
 - lib/generators/blacklight/test_support_generator.rb
 - lib/generators/blacklight/user_generator.rb
 - lib/railties/blacklight.rake
+- package-lock.json
+- package.json
 - provision.sh
-- solr/conf/_rest_managed.json
-- solr/conf/admin-extra.html
-- solr/conf/elevate.xml
-- solr/conf/mapping-ISOLatin1Accent.txt
-- solr/conf/protwords.txt
-- solr/conf/schema.xml
-- solr/conf/scripts.conf
-- solr/conf/solrconfig.xml
-- solr/conf/spellings.txt
-- solr/conf/stopwords.txt
-- solr/conf/stopwords_en.txt
-- solr/conf/synonyms.txt
-- solr/conf/xslt/example.xsl
-- solr/conf/xslt/example_atom.xsl
-- solr/conf/xslt/example_rss.xsl
-- solr/conf/xslt/luke.xsl
-- solr/sample_solr_documents.yml
 - spec/controllers/alternate_controller_spec.rb
 - spec/controllers/application_controller_spec.rb
 - spec/controllers/blacklight/base_spec.rb
 - spec/controllers/blacklight/catalog/component_configuration_spec.rb
 - spec/controllers/blacklight/facet_spec.rb
 - spec/controllers/blacklight/search_fields_spec.rb
-- spec/controllers/blacklight/search_helper_spec.rb
 - spec/controllers/bookmarks_controller_spec.rb
 - spec/controllers/catalog_controller_spec.rb
-- spec/controllers/saved_searches_controller_spec.rb
 - spec/controllers/search_history_controller_spec.rb
-- spec/controllers/suggest_controller_spec.rb
 - spec/features/alternate_controller_spec.rb
 - spec/features/autocomplete_spec.rb
 - spec/features/bookmarks_spec.rb
 - spec/features/did_you_mean_spec.rb
 - spec/features/facets_spec.rb
 - spec/features/record_view_spec.rb
-- spec/features/saved_searches_spec.rb
 - spec/features/search_context_spec.rb
 - spec/features/search_crawler_spec.rb
 - spec/features/search_filters_spec.rb
@@ -679,21 +638,27 @@ files:
 - spec/features/search_sort_spec.rb
 - spec/features/search_spec.rb
 - spec/features/sitelinks_search_box.rb
+- spec/fixtures/sample_solr_documents.yml
+- spec/helpers/blacklight/configuration_helper_behavior_spec.rb
+- spec/helpers/blacklight/facets_helper_behavior_spec.rb
+- spec/helpers/blacklight/hash_as_hidden_fields_behavior_spec.rb
+- spec/helpers/blacklight/icon_helper_behavior_spec.rb
+- spec/helpers/blacklight/layout_helper_behavior_spec.rb
+- spec/helpers/blacklight/render_constraints_helper_behavior_spec.rb
+- spec/helpers/blacklight/render_partials_helper_behavior_spec.rb
+- spec/helpers/blacklight/search_history_constraints_helper_behavior_spec.rb
+- spec/helpers/blacklight/suggest_helper_behavior_spec.rb
+- spec/helpers/blacklight/url_helper_behavior_spec.rb
 - spec/helpers/blacklight_helper_spec.rb
 - spec/helpers/catalog_helper_spec.rb
-- spec/helpers/configuration_helper_spec.rb
-- spec/helpers/deprecated_url_helper_behavior_spec.rb
-- spec/helpers/facets_helper_spec.rb
-- spec/helpers/hash_as_hidden_fields_spec.rb
-- spec/helpers/layout_helper_spec.rb
-- spec/helpers/render_constraints_helper_spec.rb
-- spec/helpers/search_history_constraints_helper_spec.rb
-- spec/helpers/suggest_helper_spec.rb
-- spec/helpers/url_helper_spec.rb
-- spec/integration/generators/blacklight/solr5_generator_spec.rb
+- spec/i18n_spec.rb
+- spec/integration/generators/blacklight/solr_generator_spec.rb
+- spec/lib/blacklight/configuration/facet_field_spec.rb
+- spec/lib/blacklight/configuration/field_spec.rb
+- spec/lib/blacklight/nested_open_struct_with_hash_access_spec.rb
+- spec/lib/blacklight/open_struct_with_hash_access_spec.rb
 - spec/lib/blacklight/parameters_spec.rb
 - spec/lib/blacklight/search_state_spec.rb
-- spec/lib/blacklight/utils_spec.rb
 - spec/lib/blacklight_spec.rb
 - spec/lib/tasks/blacklight_task_spec.rb
 - spec/models/blacklight/configurable_spec.rb
@@ -706,8 +671,8 @@ files:
 - spec/models/blacklight/document/sms_spec.rb
 - spec/models/blacklight/document_spec.rb
 - spec/models/blacklight/facet_paginator_spec.rb
+- spec/models/blacklight/icon_spec.rb
 - spec/models/blacklight/search_builder_spec.rb
-- spec/models/blacklight/solr/document/more_like_this_spec.rb
 - spec/models/blacklight/solr/document_spec.rb
 - spec/models/blacklight/solr/facet_paginator_spec.rb
 - spec/models/blacklight/solr/repository_spec.rb
@@ -724,20 +689,22 @@ files:
 - spec/models/record_mailer_spec.rb
 - spec/models/search_spec.rb
 - spec/models/solr_document_spec.rb
+- spec/presenters/blacklight/document_presenter_spec.rb
+- spec/presenters/blacklight/index_presenter_spec.rb
+- spec/presenters/blacklight/json_presenter_spec.rb
 - spec/presenters/blacklight/link_alternate_presenter_spec.rb
-- spec/presenters/document_presenter_spec.rb
-- spec/presenters/index_presenter_spec.rb
+- spec/presenters/blacklight/search_bar_presenter_spec.rb
+- spec/presenters/blacklight/show_presenter_spec.rb
 - spec/presenters/pipeline_spec.rb
-- spec/presenters/show_presenter_spec.rb
+- spec/presenters/thumbnail_presenter_spec.rb
 - spec/routing/catalog_routing_spec.rb
+- spec/services/blacklight/search_service_spec.rb
 - spec/spec_helper.rb
-- spec/support/backport_test.rb
 - spec/support/controller_level_helpers.rb
 - spec/support/features.rb
 - spec/support/features/session_helpers.rb
 - spec/test_app_templates/Gemfile.extra
 - spec/test_app_templates/lib/generators/test_app_generator.rb
-- spec/views/_user_util_links.html.erb_spec.rb
 - spec/views/catalog/_constraints.html.erb_spec.rb
 - spec/views/catalog/_constraints_element.html.erb_spec.rb
 - spec/views/catalog/_document.html.erb_spec.rb
@@ -745,17 +712,18 @@ files:
 - spec/views/catalog/_facet_index_navigation.html.erb_spec.rb
 - spec/views/catalog/_facet_layout.html.erb_spec.rb
 - spec/views/catalog/_facets.html.erb_spec.rb
-- spec/views/catalog/_index_default.erb_spec.rb
-- spec/views/catalog/_index_header_default.html.erb_spec.rb
+- spec/views/catalog/_index.html.erb_spec.rb
+- spec/views/catalog/_index_header.html.erb_spec.rb
 - spec/views/catalog/_paginate_compact.html.erb_spec.rb
 - spec/views/catalog/_search_header.erb_spec.rb
-- spec/views/catalog/_show_default.erb_spec.rb
+- spec/views/catalog/_show.html.erb_spec.rb
 - spec/views/catalog/_show_sidebar.erb_spec.rb
 - spec/views/catalog/_show_tools.html.erb_spec.rb
 - spec/views/catalog/_sort_and_per_page.html.erb_spec.rb
 - spec/views/catalog/_sort_widget.html.erb_spec.rb
-- spec/views/catalog/_thumbnail_default.erb_spec.rb
+- spec/views/catalog/_thumbnail.html.erb_spec.rb
 - spec/views/catalog/_view_type_group.html.erb_spec.rb
+- spec/views/catalog/email_success.html.erb_spec.rb
 - spec/views/catalog/facet.html.erb_spec.rb
 - spec/views/catalog/facet.json.jbuilder_spec.rb
 - spec/views/catalog/index.atom.builder_spec.rb
@@ -763,6 +731,9 @@ files:
 - spec/views/catalog/index.json.jbuilder_spec.rb
 - spec/views/catalog/opensearch.xml.builder_spec.rb
 - spec/views/catalog/show.html.erb_spec.rb
+- spec/views/catalog/show.json.jbuilder_spec.rb
+- spec/views/catalog/sms_success.html.erb_spec.rb
+- spec/views/shared/_user_util_links.html.erb_spec.rb
 - tasks/blacklight.rake
 - template.demo.rb
 homepage: http://projectblacklight.org/
@@ -784,7 +755,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Blacklight provides a discovery interface for any Solr (http://lucene.apache.org/solr)
@@ -796,19 +768,15 @@ test_files:
 - spec/controllers/blacklight/catalog/component_configuration_spec.rb
 - spec/controllers/blacklight/facet_spec.rb
 - spec/controllers/blacklight/search_fields_spec.rb
-- spec/controllers/blacklight/search_helper_spec.rb
 - spec/controllers/bookmarks_controller_spec.rb
 - spec/controllers/catalog_controller_spec.rb
-- spec/controllers/saved_searches_controller_spec.rb
 - spec/controllers/search_history_controller_spec.rb
-- spec/controllers/suggest_controller_spec.rb
 - spec/features/alternate_controller_spec.rb
 - spec/features/autocomplete_spec.rb
 - spec/features/bookmarks_spec.rb
 - spec/features/did_you_mean_spec.rb
 - spec/features/facets_spec.rb
 - spec/features/record_view_spec.rb
-- spec/features/saved_searches_spec.rb
 - spec/features/search_context_spec.rb
 - spec/features/search_crawler_spec.rb
 - spec/features/search_filters_spec.rb
@@ -819,21 +787,27 @@ test_files:
 - spec/features/search_sort_spec.rb
 - spec/features/search_spec.rb
 - spec/features/sitelinks_search_box.rb
+- spec/fixtures/sample_solr_documents.yml
+- spec/helpers/blacklight/configuration_helper_behavior_spec.rb
+- spec/helpers/blacklight/facets_helper_behavior_spec.rb
+- spec/helpers/blacklight/hash_as_hidden_fields_behavior_spec.rb
+- spec/helpers/blacklight/icon_helper_behavior_spec.rb
+- spec/helpers/blacklight/layout_helper_behavior_spec.rb
+- spec/helpers/blacklight/render_constraints_helper_behavior_spec.rb
+- spec/helpers/blacklight/render_partials_helper_behavior_spec.rb
+- spec/helpers/blacklight/search_history_constraints_helper_behavior_spec.rb
+- spec/helpers/blacklight/suggest_helper_behavior_spec.rb
+- spec/helpers/blacklight/url_helper_behavior_spec.rb
 - spec/helpers/blacklight_helper_spec.rb
 - spec/helpers/catalog_helper_spec.rb
-- spec/helpers/configuration_helper_spec.rb
-- spec/helpers/deprecated_url_helper_behavior_spec.rb
-- spec/helpers/facets_helper_spec.rb
-- spec/helpers/hash_as_hidden_fields_spec.rb
-- spec/helpers/layout_helper_spec.rb
-- spec/helpers/render_constraints_helper_spec.rb
-- spec/helpers/search_history_constraints_helper_spec.rb
-- spec/helpers/suggest_helper_spec.rb
-- spec/helpers/url_helper_spec.rb
-- spec/integration/generators/blacklight/solr5_generator_spec.rb
+- spec/i18n_spec.rb
+- spec/integration/generators/blacklight/solr_generator_spec.rb
+- spec/lib/blacklight/configuration/facet_field_spec.rb
+- spec/lib/blacklight/configuration/field_spec.rb
+- spec/lib/blacklight/nested_open_struct_with_hash_access_spec.rb
+- spec/lib/blacklight/open_struct_with_hash_access_spec.rb
 - spec/lib/blacklight/parameters_spec.rb
 - spec/lib/blacklight/search_state_spec.rb
-- spec/lib/blacklight/utils_spec.rb
 - spec/lib/blacklight_spec.rb
 - spec/lib/tasks/blacklight_task_spec.rb
 - spec/models/blacklight/configurable_spec.rb
@@ -846,8 +820,8 @@ test_files:
 - spec/models/blacklight/document/sms_spec.rb
 - spec/models/blacklight/document_spec.rb
 - spec/models/blacklight/facet_paginator_spec.rb
+- spec/models/blacklight/icon_spec.rb
 - spec/models/blacklight/search_builder_spec.rb
-- spec/models/blacklight/solr/document/more_like_this_spec.rb
 - spec/models/blacklight/solr/document_spec.rb
 - spec/models/blacklight/solr/facet_paginator_spec.rb
 - spec/models/blacklight/solr/repository_spec.rb
@@ -864,20 +838,22 @@ test_files:
 - spec/models/record_mailer_spec.rb
 - spec/models/search_spec.rb
 - spec/models/solr_document_spec.rb
+- spec/presenters/blacklight/document_presenter_spec.rb
+- spec/presenters/blacklight/index_presenter_spec.rb
+- spec/presenters/blacklight/json_presenter_spec.rb
 - spec/presenters/blacklight/link_alternate_presenter_spec.rb
-- spec/presenters/document_presenter_spec.rb
-- spec/presenters/index_presenter_spec.rb
+- spec/presenters/blacklight/search_bar_presenter_spec.rb
+- spec/presenters/blacklight/show_presenter_spec.rb
 - spec/presenters/pipeline_spec.rb
-- spec/presenters/show_presenter_spec.rb
+- spec/presenters/thumbnail_presenter_spec.rb
 - spec/routing/catalog_routing_spec.rb
+- spec/services/blacklight/search_service_spec.rb
 - spec/spec_helper.rb
-- spec/support/backport_test.rb
 - spec/support/controller_level_helpers.rb
 - spec/support/features.rb
 - spec/support/features/session_helpers.rb
 - spec/test_app_templates/Gemfile.extra
 - spec/test_app_templates/lib/generators/test_app_generator.rb
-- spec/views/_user_util_links.html.erb_spec.rb
 - spec/views/catalog/_constraints.html.erb_spec.rb
 - spec/views/catalog/_constraints_element.html.erb_spec.rb
 - spec/views/catalog/_document.html.erb_spec.rb
@@ -885,17 +861,18 @@ test_files:
 - spec/views/catalog/_facet_index_navigation.html.erb_spec.rb
 - spec/views/catalog/_facet_layout.html.erb_spec.rb
 - spec/views/catalog/_facets.html.erb_spec.rb
-- spec/views/catalog/_index_default.erb_spec.rb
-- spec/views/catalog/_index_header_default.html.erb_spec.rb
+- spec/views/catalog/_index.html.erb_spec.rb
+- spec/views/catalog/_index_header.html.erb_spec.rb
 - spec/views/catalog/_paginate_compact.html.erb_spec.rb
 - spec/views/catalog/_search_header.erb_spec.rb
-- spec/views/catalog/_show_default.erb_spec.rb
+- spec/views/catalog/_show.html.erb_spec.rb
 - spec/views/catalog/_show_sidebar.erb_spec.rb
 - spec/views/catalog/_show_tools.html.erb_spec.rb
 - spec/views/catalog/_sort_and_per_page.html.erb_spec.rb
 - spec/views/catalog/_sort_widget.html.erb_spec.rb
-- spec/views/catalog/_thumbnail_default.erb_spec.rb
+- spec/views/catalog/_thumbnail.html.erb_spec.rb
 - spec/views/catalog/_view_type_group.html.erb_spec.rb
+- spec/views/catalog/email_success.html.erb_spec.rb
 - spec/views/catalog/facet.html.erb_spec.rb
 - spec/views/catalog/facet.json.jbuilder_spec.rb
 - spec/views/catalog/index.atom.builder_spec.rb
@@ -903,3 +880,6 @@ test_files:
 - spec/views/catalog/index.json.jbuilder_spec.rb
 - spec/views/catalog/opensearch.xml.builder_spec.rb
 - spec/views/catalog/show.html.erb_spec.rb
+- spec/views/catalog/show.json.jbuilder_spec.rb
+- spec/views/catalog/sms_success.html.erb_spec.rb
+- spec/views/shared/_user_util_links.html.erb_spec.rb