blacklight 7.32.0 → 8.0.0.beta1

data/spec/services/blacklight/search_service_spec.rb

@@ -55,10 +55,6 @@ RSpec.describe Blacklight::SearchService, api: true do
     describe 'for a sample query returning results' do
       let(:user_params) { { q: all_docs_query } }
 
-      before do
-        (@solr_response, @document_list) = service.search_results
-      end
-
       it "uses the configured request handler" do
         allow(blacklight_config).to receive(:default_solr_params).and_return(qt: 'custom_request_handler')
         allow(blacklight_solr).to receive(:send_and_receive) do |path, params|
@@ -69,23 +65,6 @@ RSpec.describe Blacklight::SearchService, api: true do
         end.and_return('response' => { 'docs' => [] })
         service.search_results
       end
-
-      it 'has a @response.docs list of the same size as @document_list' do
-        expect(@solr_response.docs).to have(@document_list.length).docs
-      end
-
-      it 'has @response.docs list representing same documents as SolrDocuments in @document_list' do
-        @solr_response.docs.each_index do |index|
-          mash = @solr_response.docs[index]
-          solr_document = @document_list[index]
-
-          expect(Set.new(mash.keys)).to eq Set.new(solr_document.keys)
-
-          mash.keys.each do |key|
-            expect(mash[key]).to eq solr_document[key]
-          end
-        end
-      end
     end
 
     describe "for a query returning a grouped response" do
@@ -95,12 +74,10 @@ RSpec.describe Blacklight::SearchService, api: true do
       before do
         blacklight_config.default_solr_params[:group] = true
         blacklight_config.default_solr_params[:'group.field'] = 'pub_date_si'
-        (@solr_response, @document_list) = service.search_results
       end
 
       it "returns a grouped response" do
-        expect(@document_list).to be_empty
-        expect(@solr_response).to be_a_kind_of Blacklight::Solr::Response::GroupResponse
+        expect(service.search_results).to be_a_kind_of Blacklight::Solr::Response::GroupResponse
       end
     end
 
@@ -112,13 +89,12 @@ RSpec.describe Blacklight::SearchService, api: true do
         allow(subject).to receive_messages grouped_key_for_results: 'title_si'
         blacklight_config.default_solr_params[:group] = true
         blacklight_config.default_solr_params[:'group.field'] = %w[pub_date_si title_si]
-        (@solr_response, @document_list) = service.search_results
       end
 
       it "returns a grouped response" do
-        expect(@document_list).to be_empty
-        expect(@solr_response).to be_a_kind_of Blacklight::Solr::Response::GroupResponse
-        expect(@solr_response.group_field).to eq "title_si"
+        solr_response = service.search_results
+        expect(solr_response).to be_a_kind_of Blacklight::Solr::Response::GroupResponse
+        expect(solr_response.group_field).to eq "title_si"
       end
     end
 
@@ -126,8 +102,7 @@ RSpec.describe Blacklight::SearchService, api: true do
       let(:user_params) { { q: all_docs_query, f: single_facet } }
 
       it 'has results' do
-        (solr_response, document_list) = service.search_results
-        expect(solr_response.docs).to have(document_list.size).results
+        solr_response = service.search_results
         expect(solr_response.docs).to have_at_least(1).result
       end
       # TODO: check that number of these results < number of results for all docs query
@@ -138,8 +113,7 @@ RSpec.describe Blacklight::SearchService, api: true do
       let(:user_params) { { q: no_docs_query } }
 
       it 'has no results and not raise error' do
-        (solr_response, document_list) = service.search_results
-        expect(document_list).to have(0).results
+        solr_response = service.search_results
         expect(solr_response.docs).to have(0).results
       end
     end
@@ -148,19 +122,17 @@ RSpec.describe Blacklight::SearchService, api: true do
       let(:user_params) { { q: no_docs_query, f: single_facet } }
 
       it 'has no results and not raise error' do
-        (solr_response, document_list) = service.search_results
-        expect(document_list).to have(0).results
+        solr_response = service.search_results
         expect(solr_response.docs).to have(0).results
       end
     end
 
     describe "for All Docs Query and Bad Facet" do
-      let(:bad_facet) { { format: '666' } }
+      let(:bad_facet) { { format: ['666'] } }
       let(:user_params) { { q: all_docs_query, f: bad_facet } }
 
       it 'has no results and not raise error' do
-        (solr_response, document_list) = service.search_results
-        expect(document_list).to have(0).results
+        solr_response = service.search_results
         expect(solr_response.docs).to have(0).results
       end
     end
@@ -182,7 +154,7 @@ RSpec.describe Blacklight::SearchService, api: true do
 
     it 'has all facets specified in initializer' do
       expect(@facets.keys).to include *blacklight_config.facet_fields.keys
-      expect(@facets.none? { |_k, v| v.nil? }).to eq true
+      expect(@facets.none? { |_k, v| v.nil? }).to be true
     end
 
     it 'has at least one value for each facet' do
@@ -199,13 +171,13 @@ RSpec.describe Blacklight::SearchService, api: true do
           break
         end
       end
-      expect(has_mult_values).to eq true
+      expect(has_mult_values).to be true
     end
 
     it 'has all value counts > 0' do
       @facets.each do |_key, facet|
         facet.items.each do |facet_vals|
-          expect(facet_vals.hits).to be > 0
+          expect(facet_vals.hits).to be_positive
         end
       end
     end
@@ -222,9 +194,8 @@ RSpec.describe Blacklight::SearchService, api: true do
     end
 
     it 'has number of results (per page) set in initializer, by default' do
-      (solr_response, document_list) = service.search_results
+      solr_response = service.search_results
       expect(solr_response.docs).to have(blacklight_config[:default_solr_params][:rows]).items
-      expect(document_list).to have(blacklight_config[:default_solr_params][:rows]).items
     end
 
     context "with per page requested" do
@@ -232,8 +203,7 @@ RSpec.describe Blacklight::SearchService, api: true do
       let(:num_results) { 3 }  # non-default value
 
       it 'gets number of results per page requested' do
-        (solr_response1, document_list1) = service.search_results
-        expect(document_list1).to have(num_results).docs
+        solr_response1 = service.search_results
         expect(solr_response1.docs).to have(num_results).docs
       end
     end
@@ -243,8 +213,7 @@ RSpec.describe Blacklight::SearchService, api: true do
       let(:num_results) { 4 }  # non-default value
 
       it 'gets number of rows requested' do
-        (solr_response1, document_list1) = service.search_results
-        expect(document_list1).to have(num_results).docs
+        solr_response1 = service.search_results
         expect(solr_response1.docs).to have(num_results).docs
       end
     end
@@ -277,8 +246,7 @@ RSpec.describe Blacklight::SearchService, api: true do
       let(:user_params) { { q: all_docs_query, page: page, rows: rows } }
 
       it 'has no results when prompted for page after last result' do
-        (solr_response3, document_list3) = service.search_results
-        expect(document_list3).to have(0).docs
+        solr_response3 = service.search_results
         expect(solr_response3.docs).to have(0).docs
       end
     end
@@ -301,8 +269,7 @@ RSpec.describe Blacklight::SearchService, api: true do
       let(:user_params) { { q: all_docs_query, page: page, rows: rows } }
 
       it 'has results available when asked for more than are in response' do
-        (solr_response5, document_list5) = service.search_results
-        expect(solr_response5.docs).to have(document_list5.length).docs
+        solr_response5 = service.search_results
         expect(solr_response5.docs).to have_at_least(1).doc
       end
     end
@@ -314,7 +281,7 @@ RSpec.describe Blacklight::SearchService, api: true do
     let(:bad_id) { 'redrum' }
 
     before do
-      @response2, @document = service.fetch(doc_id)
+      @document = service.fetch(doc_id)
     end
 
     it "raises Blacklight::RecordNotFound for an unknown id" do
@@ -327,10 +294,6 @@ RSpec.describe Blacklight::SearchService, api: true do
       expect(@document).not_to be_nil
     end
 
-    it "has a single document in the response for a known id" do
-      expect(@response2.docs.size).to eq 1
-    end
-
     it 'has the expected value in the id field' do
       expect(@document.id).to eq doc_id
     end
@@ -339,18 +302,18 @@ RSpec.describe Blacklight::SearchService, api: true do
   describe 'Get multiple documents By Id', integration: true do
     let(:doc_id) { '2007020969' }
     let(:bad_id) { 'redrum' }
-    let(:response) { service.fetch([doc_id]).first }
+    let(:response) { service.fetch([doc_id]) }
 
     before do
       blacklight_config.fetch_many_document_params[:fl] = 'id,format'
     end
 
     it 'has the expected value in the id field' do
-      expect(response.documents.first.id).to eq doc_id
+      expect(response.first.id).to eq doc_id
     end
 
     it 'returns all the requested fields' do
-      expect(response.documents.first['format']).to eq ['Book']
+      expect(response.first['format']).to eq ['Book']
     end
   end
 
@@ -382,7 +345,7 @@ RSpec.describe Blacklight::SearchService, api: true do
     end
 
     context "for title search" do
-      let(:user_params) { { q: 'yehudiyam', qt: 'search', "spellcheck.dictionary": "title" } }
+      let(:user_params) { { q: 'yehudiyam', 'spellcheck.dictionary': "title" } }
 
       it 'has spelling suggestions' do
         (solr_response,) = service.search_results
@@ -391,7 +354,7 @@ RSpec.describe Blacklight::SearchService, api: true do
     end
 
     context "for author search" do
-      let(:user_params) { { q: 'shirma', qt: 'search', "spellcheck.dictionary": "author" } }
+      let(:user_params) { { q: 'shirma', 'spellcheck.dictionary': "author" } }
 
       it 'has spelling suggestions' do
         (solr_response,) = service.search_results
@@ -400,7 +363,7 @@ RSpec.describe Blacklight::SearchService, api: true do
     end
 
     context "for subject search" do
-      let(:user_params) { { q: 'wome', qt: 'search', "spellcheck.dictionary": "subject" } }
+      let(:user_params) { { q: 'wome', 'spellcheck.dictionary': "subject" } }
 
       it 'has spelling suggestions' do
         (solr_response,) = service.search_results
@@ -433,26 +396,26 @@ RSpec.describe Blacklight::SearchService, api: true do
     let(:user_params) { { q: '', per_page: 100 } }
 
     before do
-      @full_response, @all_docs = service.search_results
+      @full_response = service.search_results
     end
 
     it "returns the previous and next documents for a search" do
       _response, docs = service.previous_and_next_documents_for_search(4, q: '')
 
-      expect(docs.first.id).to eq @all_docs[3].id
-      expect(docs.last.id).to eq @all_docs[5].id
+      expect(docs.first.id).to eq @full_response.documents[3].id
+      expect(docs.last.id).to eq @full_response.documents[5].id
     end
 
     it "returns only the next document if the counter is 0" do
       _response, docs = service.previous_and_next_documents_for_search(0, q: '')
 
       expect(docs.first).to be_nil
-      expect(docs.last.id).to eq @all_docs[1].id
+      expect(docs.last.id).to eq @full_response.documents[1].id
     end
 
     it "returns only the previous document if the counter is the total number of documents" do
       _response, docs = service.previous_and_next_documents_for_search(@full_response.total - 1, q: '')
-      expect(docs.first.id).to eq @all_docs.slice(-2).id
+      expect(docs.first.id).to eq @full_response.documents.slice(-2).id
       expect(docs.last).to be_nil
     end
 
@@ -464,7 +427,7 @@ RSpec.describe Blacklight::SearchService, api: true do
 
     it 'returns only the unique key by default' do
       _response, docs = service.previous_and_next_documents_for_search(0, q: '')
-      expect(docs.last.to_h).to eq 'id' => @all_docs[1].id
+      expect(docs.last.to_h).to eq 'id' => @full_response.documents[1].id
     end
 
     it 'allows the query parameters to be customized using configuration' do
@@ -472,7 +435,7 @@ RSpec.describe Blacklight::SearchService, api: true do
 
       _response, docs = service.previous_and_next_documents_for_search(0, q: '')
 
-      expect(docs.last.to_h).to eq @all_docs[1].to_h.slice('id', 'format')
+      expect(docs.last.to_h).to eq @full_response.documents[1].to_h.slice('id', 'format')
     end
   end
 

data/spec/spec_helper.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # This file is copied to spec/ when you run 'rails generate rspec:install'
 # Has been customized by Blacklight to work when application is in one place,
 # and actual spec/ stuff is in another (the blacklight gem checkout).
@@ -47,10 +48,10 @@ RSpec.configure do |config|
   config.disable_monkey_patching!
 
   # When we're testing the API, only run the api tests
-  config.filter_run api: true if ENV['BLACKLIGHT_API_TEST']
+  config.filter_run api: true if ENV['BLACKLIGHT_API_TEST'].present?
 
   # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
-  config.fixture_path = "#{::Rails.root}/spec/fixtures"
+  config.fixture_path = Rails.root.join("spec/fixtures")
 
   # If you're not using ActiveRecord, or you'd prefer not to run each of your
   # examples within a transaction, remove the following line or assign false

data/spec/support/controller_level_helpers.rb

@@ -1,8 +1,7 @@
 # frozen_string_literal: true
+
 module ControllerLevelHelpers
   module ControllerViewHelpers
-    include Blacklight::Facet
-
     def search_state
       @search_state ||= Blacklight::SearchState.new(params, blacklight_config, controller)
     end

data/spec/support/features/search_helpers.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+# spec/support/features/search_helpers.rb
+module Features
+  module SearchHelpers
+    def search_for q
+      visit root_path
+      fill_in "q", with: q
+      click_button 'search'
+    end
+
+    def position_in_result_page(page, id)
+      i = -1
+      page.all(".index_title a").each_with_index do |link, idx|
+        i = (idx + 1) if link['href'] =~ Regexp.new("#{Regexp.escape(id)}$")
+      end
+      i.to_i
+    end
+
+    def number_of_results_for_query(query)
+      visit root_path
+      fill_in "q", with: query
+      click_button "search"
+      get_number_of_results_from_page(page)
+    end
+
+    def number_of_results_from_page(page)
+      tmp_value = Capybara.ignore_hidden_elements
+      Capybara.ignore_hidden_elements = false
+      val = begin
+        page.find("meta[name=totalResults]")['content'].to_i
+      rescue StandardError
+        0
+      end
+      Capybara.ignore_hidden_elements = tmp_value
+      val
+    end
+  end
+end

data/spec/support/features/session_helpers.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # spec/support/features/session_helpers.rb
 module Features
   module SessionHelpers

data/spec/support/features.rb

@@ -1,8 +1,11 @@
 # frozen_string_literal: true
+
 # spec/support/features.rb
 
+require File.expand_path('features/search_helpers.rb', __dir__)
 require File.expand_path('features/session_helpers.rb', __dir__)
 
 RSpec.configure do |config|
+  config.include Features::SearchHelpers, type: :feature
   config.include Features::SessionHelpers, type: :feature
 end

data/spec/test_app_templates/lib/generators/test_app_generator.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'rails/generators'
 
 class TestAppGenerator < Rails::Generators::Base
@@ -11,11 +12,11 @@ class TestAppGenerator < Rails::Generators::Base
   def run_blacklight_generator
     say_status("warning", "GENERATING BL", :yellow)
 
-    Bundler.with_clean_env do
+    Bundler.with_unbundled_env do
       run "bundle install"
     end
     options = '--devise'
-    if ENV['BLACKLIGHT_API_TEST']
+    if ENV['BLACKLIGHT_API_TEST'].present?
       options += ' --skip-assets'
     end
 
@@ -27,4 +28,10 @@ class TestAppGenerator < Rails::Generators::Base
 
     generate 'blacklight:test_support'
   end
+
+  def add_local_assets_for_propshaft
+    return unless defined?(Propshaft)
+
+    run "yarn add #{Blacklight::Engine.root}"
+  end
 end

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

@@ -8,20 +8,12 @@ RSpec.describe "catalog/_document" do
     allow(controller).to receive(:controller_name).and_return('test')
     allow(view).to receive(:render_grouped_response?).and_return(false)
     allow(view).to receive(:blacklight_config).and_return(blacklight_config)
+    allow(view).to receive(:search_session).and_return({})
+    allow(view).to receive(:current_search_session).and_return(nil)
+    allow(view.main_app).to receive(:track_test_path).and_return('/track')
     assign(:response, instance_double(Blacklight::Solr::Response, start: 20))
   end
 
-  it "renders the header, thumbnail and index by default" do
-    stub_template "catalog/_index_header.html.erb" => "document_header"
-    stub_template "catalog/_thumbnail.html.erb" => "thumbnail_default"
-    stub_template "catalog/_index_default.html.erb" => "index_default"
-    render partial: "catalog/document", locals: { document: document, document_counter: 1 }
-    expect(rendered).to have_selector 'article.document[@data-document-counter="22"]'
-    expect(rendered).to match /document_header/
-    expect(rendered).to match /thumbnail_default/
-    expect(rendered).to match /index_default/
-  end
-
   it "uses the index.partials parameter to determine the partials to render" do
     blacklight_config.index.partials = %w[a b c]
     stub_template "catalog/_a_default.html.erb" => "a_partial"
@@ -32,27 +24,4 @@ RSpec.describe "catalog/_document" do
     expect(rendered).to match /b_partial/
     expect(rendered).to match /c_partial/
   end
-
-  it 'provides the rendered partials to an explicitly configured component but does not render them by default' do
-    blacklight_config.index.partials = %w[a]
-    stub_template "catalog/_a_default.html.erb" => "partial"
-    blacklight_config.index.document_component = Blacklight::DocumentComponent
-    allow(view).to receive(:search_session).and_return({})
-    allow(view).to receive(:current_search_session).and_return(nil)
-    allow(view.main_app).to receive(:track_test_path).and_return('/track')
-
-    render partial: "catalog/document", locals: { document: document, document_counter: 1 }
-
-    expect(rendered).to have_selector 'article.document header', text: '22. xyz'
-    expect(rendered).not_to match(/partial/)
-  end
-
-  it 'renders the partial using a provided view config' do
-    view_config = Blacklight::Configuration::ViewConfig.new partials: %w[a]
-    stub_template "catalog/_a_default.html.erb" => "partial"
-
-    render partial: "catalog/document", locals: { document: document, document_counter: 1, view_config: view_config }
-
-    expect(rendered).to match(/partial/)
-  end
 end

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

@@ -2,7 +2,7 @@
 
 RSpec.describe 'catalog/_facet_index_navigation.html.erb', type: :view do
   let(:pagination) { Blacklight::Solr::FacetPaginator.new([]) }
-  let(:facet) { Blacklight::Configuration::FacetField.new(index_range: '0'..'9') }
+  let(:facet) { Blacklight::Configuration::FacetField.new(index_range: '0'..'9', presenter: Blacklight::FacetFieldPresenter) }
   let(:display_facet) { double(items: [], offset: 0, prefix: '', sort: 'index') }
   let(:blacklight_config) { Blacklight::Configuration.new }
 

data/spec/views/catalog/_search_header.erb_spec.rb

@@ -6,6 +6,7 @@ RSpec.describe "/catalog/_search_header.html.erb" do
   it "renders the default search header partials" do
     stub_template "_did_you_mean.html.erb" => "did_you_mean"
     stub_template "_sort_and_per_page.html.erb" => "sort_and_per_page"
+    allow(view).to receive(:blacklight_config).and_return(CatalogController.blacklight_config)
     render
     expect(rendered).to match /did_you_mean/
     expect(rendered).to match /sort_and_per_page/

data/spec/views/catalog/_show_sidebar.erb_spec.rb

@@ -6,6 +6,7 @@ RSpec.describe "catalog/_show_sidebar.html.erb" do
   let(:blacklight_config) do
     Blacklight::Configuration.new do |config|
       config.index.title_field = 'title_tsim'
+      config.index.sidebar_component = Blacklight::Document::SidebarComponent
     end
   end
 

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

@@ -3,10 +3,12 @@
 RSpec.describe "catalog/_show_tools.html.erb" do
   let(:document) { SolrDocument.new id: 'xyz', format: 'a' }
   let(:blacklight_config) { Blacklight::Configuration.new }
+  let(:component) { instance_double(Blacklight::Document::ActionsComponent) }
 
   before do
-    assign :response, instance_double(Blacklight::Solr::Response, params: {})
-    assign :document, document
+    allow(Blacklight::Document::ActionsComponent).to receive(:new).and_return(component)
+    allow(view).to receive(:render).with(component)
+    allow(view).to receive(:render).with('catalog/show_tools', { document: document }).and_call_original
     allow(view).to receive(:blacklight_config).and_return blacklight_config
     allow(view).to receive(:has_user_authentication_provider?).and_return false
   end
@@ -17,57 +19,8 @@ RSpec.describe "catalog/_show_tools.html.erb" do
     it "renders a document action" do
       allow(view).to receive(:some_action_solr_document_path).with(document, any_args).and_return 'x'
       document_actions[:some_action] = Blacklight::Configuration::ToolConfig.new key: :some_action, name: :some_action, partial: 'document_action'
-      render partial: 'catalog/show_tools'
-      expect(rendered).to have_link "Some action", href: "x"
-    end
-
-    it "uses the provided label" do
-      allow(view).to receive(:some_action_solr_document_path).and_return "x"
-      document_actions[:some_action] = Blacklight::Configuration::ToolConfig.new key: :some_action, name: :some_action, label: "Some label", partial: 'document_action'
-      render partial: 'catalog/show_tools'
-      expect(rendered).to have_selector '.some_action', text: "Some label"
-    end
-
-    it "evaluates a document action's if configurations" do
-      allow(view).to receive(:some_action_solr_document_path).and_return "x"
-      document_actions[:some_action] = Blacklight::Configuration::ToolConfig.new key: :some_action, name: :some_action, if: false, partial: 'document_action'
-      render partial: 'catalog/show_tools'
-      expect(rendered).not_to have_selector '.some_action', text: "Some action"
-    end
-
-    it "evaluates a document action's if configuration with a proc" do
-      allow(view).to receive(:some_action_solr_document_path).and_return "x"
-      document_actions[:some_action] = Blacklight::Configuration::ToolConfig.new key: :some_action, name: :some_action, partial: 'document_action', if: proc { |_config, doc| doc.id == "xyz" }
-      render partial: 'catalog/show_tools'
-      expect(rendered).not_to have_selector '.some_action', text: "Some action"
-    end
-
-    it "evaluates a document action's unless configurations" do
-      allow(view).to receive(:some_action_solr_document_path).and_return "x"
-      document_actions[:some_action] = Blacklight::Configuration::ToolConfig.new key: :some_action, name: :some_action, partial: 'document_action', unless: true
-      render partial: 'catalog/show_tools'
-      expect(rendered).not_to have_selector '.some_action', text: "Some action"
-    end
-
-    it "allows the tool to have a custom id" do
-      allow(view).to receive(:some_action_solr_document_path).and_return "x"
-      document_actions[:some_action] = Blacklight::Configuration::ToolConfig.new key: :some_action, name: :some_action, partial: 'document_action', id: "some_action"
-      render partial: 'catalog/show_tools'
-      expect(rendered).to have_selector '#some_action', text: "Some action"
-    end
-
-    it "defaults to modal behavior" do
-      allow(view).to receive(:some_action_solr_document_path).and_return "x"
-      document_actions[:some_action] = Blacklight::Configuration::ToolConfig.new key: :some_action, name: :some_action, partial: 'document_action'
-      render partial: 'catalog/show_tools'
-      expect(rendered).to have_selector '.some_action > a[data-blacklight-modal="trigger"]', text: "Some action"
-    end
-
-    it "allows configuration to opt out of modal behavior" do
-      allow(view).to receive(:some_action_solr_document_path).and_return "x"
-      document_actions[:some_action] = Blacklight::Configuration::ToolConfig.new key: :some_action, name: :some_action, partial: 'document_action', modal: false
-      render partial: 'catalog/show_tools'
-      expect(rendered).not_to have_selector '.some_action > a[data-blacklight-modal="trigger"]', text: "Some action"
+      render 'catalog/show_tools', document: document
+      expect(view).to have_received(:render).with(component)
     end
 
     context 'without any document actions defined' do
@@ -76,7 +29,7 @@ RSpec.describe "catalog/_show_tools.html.erb" do
       end
 
       it 'does not display the tools' do
-        render partial: 'catalog/show_tools'
+        render 'catalog/show_tools', document: document
 
         expect(rendered).to be_blank
       end

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

@@ -5,18 +5,27 @@ RSpec.describe "catalog/_view_type_group" do
   let(:response) { instance_double(Blacklight::Solr::Response, empty?: false) }
 
   before do
-    allow(view).to receive(:view_label), &:to_s
-    allow(view).to receive_messages(how_sort_and_per_page?: true, blacklight_config: blacklight_config)
+    allow(view).to receive_messages(blacklight_config: blacklight_config)
     controller.request.path_parameters[:action] = 'index'
     assign(:response, response)
   end
 
-  it "does not display the group when there's only one option" do
+  it "does not display the group when there's no documents to view" do
+    blacklight_config.configure do |config|
+      config.view.a(icon: :list)
+      config.view.b(icon: :list)
+    end
+
     allow(response).to receive_messages(empty?: true)
     render partial: 'catalog/view_type_group'
     expect(rendered).to be_empty
   end
 
+  it "does not display the group when there's only one option" do
+    render partial: 'catalog/view_type_group'
+    expect(rendered).to be_empty
+  end
+
   it "displays the group" do
     blacklight_config.configure do |config|
       config.view.delete(:list)
@@ -26,12 +35,12 @@ RSpec.describe "catalog/_view_type_group" do
     end
     render partial: 'catalog/view_type_group'
     expect(rendered).to have_selector('.btn-group.view-type-group')
-    expect(rendered).to have_selector('.view-type-a', text: 'a')
+    expect(rendered).to have_selector('.view-type-a', text: 'A')
     within '.view-type-a' do
       expect(rendered).to have_selector 'svg'
     end
-    expect(rendered).to have_selector('.view-type-b', text: 'b')
-    expect(rendered).to have_selector('.view-type-c', text: 'c')
+    expect(rendered).to have_selector('.view-type-b', text: 'B')
+    expect(rendered).to have_selector('.view-type-c', text: 'C')
   end
 
   it "sets the current view to 'active'" do
@@ -41,8 +50,7 @@ RSpec.describe "catalog/_view_type_group" do
       config.view.b(icon: :list)
     end
     render partial: 'catalog/view_type_group'
-    expect(rendered).to have_selector('.active', text: 'a')
-    expect(rendered).not_to have_selector('.active', text: 'b')
-    expect(rendered).to have_selector('.btn', text: 'b')
+    expect(rendered).to have_selector('.active', text: 'A')
+    expect(rendered).not_to have_selector('.active', text: 'B')
   end
 end

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

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 RSpec.describe "catalog/email_success.html.erb" do
-  it "includes the data-blacklight-modal properties" do
+  it "includes updates to the main flash messages" do
     render
-    expect(rendered).to have_selector "div[data-blacklight-modal=container]"
+    expect(rendered).to have_selector 'turbo-stream[action="append"][target="main-flashes"]'
   end
 end