blacklight 6.24.0 → 7.0.0.rc1

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

@@ -1,13 +1,17 @@
 # frozen_string_literal: true
 
-describe "catalog/_view_type_group" do
+RSpec.describe "catalog/_view_type_group" do
   let(:blacklight_config) { Blacklight::Configuration.new }
   let(:response) { instance_double(Blacklight::Solr::Response, empty?: false) }
+  let(:icon_instance) { instance_double(Blacklight::Icon) }
 
   before do
     allow(view).to receive(:view_label) do |view|
       view.to_s
     end
+    allow(Blacklight::Icon).to receive(:new).and_return icon_instance
+    allow(icon_instance).to receive(:svg).and_return '<svg></svg>'
+    allow(icon_instance).to receive(:options).and_return({})
     allow(view).to receive_messages(how_sort_and_per_page?: true, blacklight_config: blacklight_config)
     controller.request.path_parameters[:action] = 'index'
     assign(:response, response)

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

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+RSpec.describe "catalog/email_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/catalog/facet.html.erb_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-describe 'catalog/facet.html.erb' do
+RSpec.describe 'catalog/facet.html.erb' do
   let(:display_facet) { double }
   let(:blacklight_config) { Blacklight::Configuration.new }
   before :each do

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

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-describe "catalog/facet.json" do
+RSpec.describe "catalog/facet.json" do
   it "renders facet json" do
     assign :pagination, { items: [{ value: 'Book' }] }
     render template: "catalog/facet.json", format: :json

data/spec/views/catalog/index.atom.builder_spec.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require 'rexml/document'
 
-describe "catalog/index" do
+RSpec.describe "catalog/index" do
   let(:document_list) do
     10.times.map do |i|
       doc = SolrDocument.new(id: i)
@@ -14,7 +14,7 @@ describe "catalog/index" do
 
   before do
     @response = Blacklight::Solr::Response.new({ response: { numFound: 30 }}, { start: 10, rows: 10})
-    @document_list = document_list
+    allow(@response).to receive(:documents).and_return(document_list)
     params['content_format'] = 'some_format'
     allow(view).to receive(:action_name).and_return('index')
     allow(view).to receive(:blacklight_config).and_return(CatalogController.blacklight_config)

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
 

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

@@ -1,30 +1,75 @@
 # 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' }] }
+RSpec.describe "catalog/index.json" do
+  let(:response) { instance_double(Blacklight::Solr::Response, documents: docs, prev_page: nil, next_page: 2, total_pages: 3) }
+  let(:docs) { [SolrDocument.new(id: '123', title_tsim: 'Book1'), SolrDocument.new(id: '456', title_tsim: 'Book2')] }
   let(:facets) { double("facets") }
-  let(:config) { instance_double(Blacklight::Configuration) }
-  let(:presenter) { Blacklight::JsonPresenter.new(response, docs, facets, config) }
+  let(:config) { Blacklight::Configuration.new }
+  let(:presenter) { Blacklight::JsonPresenter.new(response, facets, config) }
 
-  it "renders index json" do
+  let(:hash) do
+    render template: "catalog/index.json", format: :json
+    JSON.parse(rendered).with_indifferent_access
+  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_as_json).and_return(
-          [{ name: "format", label: "Format",
-             items: [{ value: 'Book', hits: 30, label: 'Book' }] }])
+          [{ 'name' => "format", 'label' => "Format",
+             'items' => [{ 'value' => 'Book', 'hits' => 30, 'label' => 'Book' }] }])
     assign :presenter, presenter
-    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 } }
-                      )
+    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',
+        attributes: { 'id' => '123', 'title_tsim' => 'Book1' },
+        links: { self: 'http://test.host/catalog/123' }
+      },
+      {
+        id: '456',
+        attributes: { 'id' => '456', 'title_tsim' => 'Book2' },
+        links: { self: 'http://test.host/catalog/456' }
+      },
+    ])
+  end
+
+  it "has facet information and links" do
+    expect(hash).to include(:included)
+
+    facets = hash[:included].select { |x| x['type'] == 'facet' }
+    expect(facets).to be_present
+
+    expect(facets.map { |x| x['id'] }).to include 'format'
+
+    format = facets.find { |x| x['id'] == 'format' }
+
+    expect(format['links']).to include self: 'http://test.host/some/facet/url'
+    expect(format['attributes']).to include :items
+
+    format_items = format['attributes']['items'].map { |x| x['attributes'] }
+
+    expect(format_items).to match_array [{value: 'Book', hits: 30, label: 'Book'}]
   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,6 +1,6 @@
 # frozen_string_literal: true
 
-describe "catalog/show.html.erb" do
+RSpec.describe "catalog/show.html.erb" do
   let(:document) { SolrDocument.new :id => 'xyz', :format => 'a' }
   let(:blacklight_config) { Blacklight::Configuration.new }
 
@@ -8,7 +8,7 @@ describe "catalog/show.html.erb" 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(current_search_session: nil, search_session: {})
     assign :document, document
     allow(view).to receive(:blacklight_config).and_return(blacklight_config)
   end

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

@@ -0,0 +1,9 @@
+# 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,8 +1,8 @@
 # frozen_string_literal: true
 
-describe "_user_util_links" do
+RSpec.describe "shared/_user_util_links" do
 
-  let :blacklight_config 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
@@ -15,8 +15,8 @@ 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}")
   end
 
 end

data/tasks/blacklight.rake

@@ -3,16 +3,18 @@ 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|
-    solr.with_collection do
+  SolrWrapper.wrap(version: '7.1.0') do |solr|
+    solr.with_collection(name: 'blacklight-core', dir: File.join(File.expand_path("..", File.dirname(__FILE__)), '.internal_test_app', 'solr', 'conf')) do
       within_test_app do
         system "RAILS_ENV=test rake blacklight:index:seed"
       end
@@ -29,11 +31,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 +43,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"
@@ -50,8 +52,8 @@ namespace :blacklight do
       Rake::Task['engine_cart:generate'].invoke
     end
 
-    SolrWrapper.wrap do |solr|
-      solr.with_collection do
+    SolrWrapper.wrap(port: '8983') do |solr|
+      solr.with_collection(name: 'blacklight-core', dir: File.join(File.expand_path("..", File.dirname(__FILE__)), "solr", "conf")) do
         Rake::Task['blacklight:internal:seed'].invoke
 
         within_test_app do

data/template.demo.rb

@@ -1,21 +1,11 @@
 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.24.0
+  version: 7.0.0.rc1
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -17,28 +17,22 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-01-23 00:00:00.000000000 Z
+date: 2018-03-30 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.0'
   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.0'
 - !ruby/object:Gem::Dependency
   name: globalid
   requirement: !ruby/object:Gem::Requirement
@@ -57,16 +51,16 @@ dependencies:
   name: jbuilder
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   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: 1.0.6
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.11.1.pre.corejavascript
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: solr_wrapper
   requirement: !ruby/object:Gem::Requirement
@@ -217,64 +183,58 @@ dependencies:
   name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '2.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '2.6'
 - !ruby/object:Gem::Dependency
-  name: webdrivers
+  name: chromedriver-helper
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.13.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.13.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: engine_cart
   requirement: !ruby/object:Gem::Requirement
     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
@@ -289,6 +249,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -309,28 +283,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.47.0
+        version: '0.49'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.47.0
+        version: '0.49'
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: '1.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: '1.8'
 description: |-
   Blacklight is an open source Solr user interface discovery platform.
       You can use Blacklight to enable searching and browsing of your
@@ -345,6 +319,7 @@ files:
 - ".gitignore"
 - ".hound.yml"
 - ".jshintrc"
+- ".npmignore"
 - ".rspec"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
@@ -357,27 +332,23 @@ 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_history.scss
@@ -385,6 +356,7 @@ files:
 - 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
@@ -393,42 +365,37 @@ 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/autofocus.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
@@ -444,13 +411,11 @@ 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
 - app/models/search.rb
 - app/models/solr_document.rb
-- app/presenters/blacklight/document_presenter.rb
 - app/presenters/blacklight/field_presenter.rb
 - app/presenters/blacklight/index_presenter.rb
 - app/presenters/blacklight/json_presenter.rb
@@ -462,13 +427,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/services/blacklight/search_service.rb
 - app/values/blacklight/types.rb
-- app/views/_flash_msg.html.erb
-- app/views/_user_util_links.html.erb
 - 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
@@ -478,10 +444,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
@@ -490,11 +456,11 @@ 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/_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
@@ -504,8 +470,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
@@ -513,7 +479,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,21 +508,26 @@ 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/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
@@ -578,6 +549,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
@@ -597,7 +570,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
@@ -605,8 +577,8 @@ 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
@@ -615,47 +587,44 @@ files:
 - 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
@@ -666,21 +635,26 @@ 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/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
@@ -693,8 +667,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
@@ -712,19 +686,19 @@ files:
 - spec/models/search_spec.rb
 - spec/models/solr_document_spec.rb
 - spec/presenters/blacklight/link_alternate_presenter_spec.rb
-- spec/presenters/document_presenter_spec.rb
+- spec/presenters/blacklight/search_bar_presenter_spec.rb
 - spec/presenters/index_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
@@ -732,17 +706,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
@@ -750,6 +725,8 @@ 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/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/
@@ -767,11 +744,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.1.4
+rubyforge_project: 
+rubygems_version: 2.7.1
 signing_key: 
 specification_version: 4
 summary: Blacklight provides a discovery interface for any Solr (http://lucene.apache.org/solr)
@@ -783,19 +761,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
@@ -806,21 +780,26 @@ 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/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
@@ -833,8 +812,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
@@ -852,19 +831,19 @@ test_files:
 - spec/models/search_spec.rb
 - spec/models/solr_document_spec.rb
 - spec/presenters/blacklight/link_alternate_presenter_spec.rb
-- spec/presenters/document_presenter_spec.rb
+- spec/presenters/blacklight/search_bar_presenter_spec.rb
 - spec/presenters/index_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
@@ -872,17 +851,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
@@ -890,3 +870,5 @@ 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/sms_success.html.erb_spec.rb
+- spec/views/shared/_user_util_links.html.erb_spec.rb