blacklight 8.2.2 → 8.4.0

data/spec/models/blacklight/solr/response/group_response_spec.rb

@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-RSpec.describe Blacklight::Solr::Response::GroupResponse, api: true do
+RSpec.describe Blacklight::Solr::Response::GroupResponse, :api do
   let(:response) do
     create_response(sample_response)
   end

data/spec/models/blacklight/solr/response/group_spec.rb

@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-RSpec.describe Blacklight::Solr::Response::Group, api: true do
+RSpec.describe Blacklight::Solr::Response::Group, :api do
   subject do
     group.groups.first
   end
@@ -37,7 +37,7 @@ RSpec.describe Blacklight::Solr::Response::Group, api: true do
   describe "#docs" do
     it "is a list of SolrDocuments" do
       subject.docs.each do |doc|
-        expect(doc).to be_a_kind_of SolrDocument
+        expect(doc).to be_a SolrDocument
       end
 
       expect(subject.docs.first.id).to eq 1

data/spec/models/blacklight/solr/response_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-RSpec.describe Blacklight::Solr::Response, api: true do
+RSpec.describe Blacklight::Solr::Response, :api do
   let(:raw_response) { eval(mock_query_response) }
 
   let(:config) { Blacklight::Configuration.new }
@@ -79,7 +79,7 @@ RSpec.describe Blacklight::Solr::Response, api: true do
     if Kaminari.config.respond_to? :max_pages
       expect(r.max_pages).to be_nil
     end
-    expect(r).to be_a_kind_of Kaminari::PageScopeMethods
+    expect(r).to be_a Kaminari::PageScopeMethods
   end
 
   describe "FacetItem" do
@@ -101,7 +101,7 @@ RSpec.describe Blacklight::Solr::Response, api: true do
 
       expect(item.hits).to eq 15
       expect(item.value).to eq 'value'
-      expect(item).to be_a_kind_of(OpenStruct)
+      expect(item).to be_a(OpenStruct)
     end
 
     it "provides a label accessor" do

data/spec/models/blacklight/solr/{search_builder_spec.rb → search_builder_behavior_spec.rb}

@@ -1,9 +1,15 @@
 # frozen_string_literal: true
 
-RSpec.describe Blacklight::Solr::SearchBuilderBehavior, api: true do
+RSpec.describe Blacklight::Solr::SearchBuilderBehavior, :api do
   subject { search_builder.with(user_params) }
 
   let(:single_facet) { { format: ['Book'] } }
+  let(:search_builder_class) do
+    Class.new(Blacklight::SearchBuilder) do
+      include Blacklight::Solr::SearchBuilderBehavior
+    end
+  end
+  let(:search_builder) { search_builder_class.new(context) }
   let(:multi_facets) { { format: ['Book'], language_ssim: ['Tibetan'] } }
   let(:mult_word_query) { 'tibetan history' }
   let(:subject_search_params) { { commit: "search", search_field: "subject", action: "index", controller: "catalog", rows: "10", q: "wome" } }
@@ -14,13 +20,6 @@ RSpec.describe Blacklight::Solr::SearchBuilderBehavior, api: true do
 
   before { allow(context).to receive(:blacklight_config).and_return(blacklight_config) }
 
-  let(:search_builder_class) do
-    Class.new(Blacklight::SearchBuilder) do
-      include Blacklight::Solr::SearchBuilderBehavior
-    end
-  end
-  let(:search_builder) { search_builder_class.new(context) }
-
   context "with default processor chain" do
     subject { search_builder }
 
@@ -117,7 +116,7 @@ RSpec.describe Blacklight::Solr::SearchBuilderBehavior, api: true do
       end
 
       it 'is negative' do
-        expect(subject[:'f.subject_ssim.facet.limit']).to eq -1
+        expect(subject[:'f.subject_ssim.facet.limit']).to eq(-1)
       end
     end
 
@@ -522,15 +521,6 @@ RSpec.describe Blacklight::Solr::SearchBuilderBehavior, api: true do
         expect(subject[:qq1]).to eq 'xyz'
       end
     end
-
-    describe "mapping facet.field" do
-      let(:blacklight_config) do
-        Blacklight::Configuration.new do |config|
-          config.add_facet_field 'some_field'
-          config.add_facet_fields_to_solr_request!
-        end
-      end
-    end
   end
 
   describe "#facet_value_to_fq_string" do
@@ -564,7 +554,7 @@ RSpec.describe Blacklight::Solr::SearchBuilderBehavior, api: true do
       expect(subject.send(:facet_value_to_fq_string, "facet_name", 1.11)).to eq '{!term f=facet_name}1.11'
     end
 
-    it "passes floats through" do
+    it "passes floats in strings through" do
       expect(subject.send(:facet_value_to_fq_string, "facet_name", "1.11")).to eq '{!term f=facet_name}1.11'
     end
 
@@ -601,7 +591,7 @@ RSpec.describe Blacklight::Solr::SearchBuilderBehavior, api: true do
 
       subject.add_facet_fq_to_solr(solr_parameters)
 
-      expect(solr_parameters[:fq]).to be_a_kind_of Array
+      expect(solr_parameters[:fq]).to be_a Array
     end
 
     context "facet not defined in config" do

data/spec/models/blacklight/suggest/response_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-RSpec.describe Blacklight::Suggest::Response, api: true do
+RSpec.describe Blacklight::Suggest::Response, :api do
   let(:empty_response) { described_class.new({}, { q: 'hello' }, 'suggest', 'mySuggester') }
   let(:full_response) do
     described_class.new(

data/spec/models/blacklight/suggest_search_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-RSpec.describe Blacklight::SuggestSearch, api: true do
+RSpec.describe Blacklight::SuggestSearch, :api do
   let(:params) { { q: 'test' } }
   let(:response) { instance_double(Blacklight::Suggest::Response) }
   let(:repository) { instance_double(Blacklight::Solr::Repository, suggestions: response) }

data/spec/models/blacklight/user_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-RSpec.describe "Blacklight::User", api: true do
+RSpec.describe "Blacklight::User", :api do
   subject { User.create! email: 'xyz@example.com', password: 'xyz12345' }
 
   def mock_bookmark document_id

data/spec/models/bookmark_spec.rb

@@ -30,7 +30,7 @@ RSpec.describe Bookmark do
 
   describe "#document" do
     it "is a SolrDocument with just an id field" do
-      expect(subject.document).to be_a_kind_of SolrDocument
+      expect(subject.document).to be_a SolrDocument
       expect(subject.document.id).to eq 'u001'
     end
   end

data/spec/models/solr_document_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-RSpec.describe SolrDocument, api: true do
+RSpec.describe SolrDocument, :api do
   describe "access methods" do
     let(:solrdoc) do
       described_class.new(id: '00282214', format: ['Book'], title_tsim: 'some-title')

data/spec/presenters/blacklight/document_presenter_spec.rb

@@ -11,8 +11,7 @@ RSpec.describe Blacklight::DocumentPresenter do
   let(:search_state) { Blacklight::SearchState.new(params, blacklight_config, controller) }
 
   before do
-    allow(request_context).to receive(:search_state).and_return(search_state)
-    allow(request_context).to receive(:action_name).and_return(:show)
+    allow(request_context).to receive_messages(search_state: search_state, action_name: :show)
   end
 
   describe '#fields_to_render' do
@@ -51,14 +50,14 @@ RSpec.describe Blacklight::DocumentPresenter do
 
   describe '#thumbnail' do
     it 'returns a thumbnail presenter' do
-      expect(presenter.thumbnail).to be_a_kind_of(Blacklight::ThumbnailPresenter)
+      expect(presenter.thumbnail).to be_a(Blacklight::ThumbnailPresenter)
     end
 
     it 'use the configured thumbnail presenter' do
       custom_presenter_class = Class.new(Blacklight::ThumbnailPresenter)
       blacklight_config.index.thumbnail_presenter = custom_presenter_class
 
-      expect(presenter.thumbnail).to be_a_kind_of custom_presenter_class
+      expect(presenter.thumbnail).to be_a custom_presenter_class
     end
   end
 

data/spec/presenters/blacklight/facet_checkbox_item_presenter_spec.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Blacklight::FacetCheckboxItemPresenter, type: :presenter do
+  subject(:presenter) do
+    described_class.new(facet_item, facet_config, view_context, facet_field, search_state)
+  end
+
+  let(:facet_item) { Blacklight::Solr::Response::Facets::FacetItem.new(value: 'Book', hits: 30) }
+  let(:facet_config) { Blacklight::Configuration::FacetField.new(key: 'format') }
+  let(:view_context) { controller.view_context }
+  let(:filter_field) { Blacklight::SearchState::FilterField.new(facet_config, search_state) }
+  let(:facet_field) { Blacklight::Solr::Response::Facets::FacetField.new('format', [facet_item]) }
+  let(:params) { ActionController::Parameters.new(f_inclusive: { format: ["Book"] }) }
+  let(:blacklight_config) { Blacklight::Configuration.new }
+  let(:search_state) { Blacklight::SearchState.new(params, blacklight_config) }
+
+  before do
+    blacklight_config.add_facet_field 'format'
+  end
+
+  describe '#selected?' do
+    subject { presenter.selected? }
+
+    context 'with a matching inclusive filter' do
+      it { is_expected.to be true }
+    end
+
+    context 'with an inclusive filter that does not match' do
+      let(:params) { ActionController::Parameters.new(f_inclusive: { format: ["Manuscript"] }) }
+
+      it { is_expected.to be false }
+    end
+
+    context 'with a matching exclusive filter' do
+      let(:params) { ActionController::Parameters.new(f: { format: ["Book"] }) }
+
+      it { is_expected.to be false }
+    end
+  end
+end

data/spec/presenters/blacklight/facet_field_presenter_spec.rb

@@ -51,6 +51,20 @@ RSpec.describe Blacklight::FacetFieldPresenter, type: :presenter do
     it "is false if no value for facet is selected" do
       expect(presenter.active?).to be false
     end
+
+    context 'with an advanced search action' do
+      before { controller.params[:action] = 'advanced_search' }
+
+      it "is true if any value for inclusive facet is selected" do
+        search_state.params[:f_inclusive] = ActiveSupport::HashWithIndifferentAccess.new(key: [1])
+        expect(presenter.active?).to be true
+      end
+
+      it "is false if no value for inclusive facet is selected" do
+        search_state.params[:f] = ActiveSupport::HashWithIndifferentAccess.new(key: [1])
+        expect(presenter.active?).to be false
+      end
+    end
   end
 
   describe '#in_modal?' do

data/spec/presenters/blacklight/field_presenter_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-RSpec.describe Blacklight::FieldPresenter, api: true do
+RSpec.describe Blacklight::FieldPresenter, :api do
   subject(:presenter) { described_class.new(request_context, document, field_config, options) }
 
   let(:request_context) { double('View context', params: { x: '1' }, search_state: search_state, should_render_field?: true, blacklight_config: config) }

data/spec/presenters/blacklight/index_presenter_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-RSpec.describe Blacklight::IndexPresenter, api: true do
+RSpec.describe Blacklight::IndexPresenter, :api do
   include Capybara::RSpecMatchers
   subject { presenter }
 
@@ -21,8 +21,7 @@ RSpec.describe Blacklight::IndexPresenter, api: true do
   end
 
   before do
-    allow(request_context).to receive(:search_state).and_return(search_state)
-    allow(request_context).to receive(:action_name).and_return(:index)
+    allow(request_context).to receive_messages(search_state: search_state, action_name: :index)
   end
 
   describe '#fields' do

data/spec/presenters/blacklight/json_presenter_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Blacklight::JsonPresenter, api: true do
+RSpec.describe Blacklight::JsonPresenter, :api do
   let(:response) do
     instance_double(Blacklight::Solr::Response,
                     documents: docs,

data/spec/presenters/{pipeline_spec.rb → blacklight/rendering/pipeline_spec.rb}

@@ -25,7 +25,7 @@ RSpec.describe Blacklight::Rendering::Pipeline do
       let(:values) { ['a'] }
       let(:field_config) { Blacklight::Configuration::NullField.new(itemprop: 'some-prop', separator_options: nil) }
 
-      it { is_expected.to have_selector("span[@itemprop='some-prop']", text: "a") }
+      it { is_expected.to have_css("span[@itemprop='some-prop']", text: "a") }
     end
 
     it 'sets the operations on the instance as equal to the class variable' do

data/spec/presenters/blacklight/show_presenter_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-RSpec.describe Blacklight::ShowPresenter, api: true do
+RSpec.describe Blacklight::ShowPresenter, :api do
   include Capybara::RSpecMatchers
   subject { presenter }
 
@@ -18,8 +18,7 @@ RSpec.describe Blacklight::ShowPresenter, api: true do
   end
 
   before do
-    allow(request_context).to receive(:search_state).and_return(search_state)
-    allow(request_context).to receive(:action_name).and_return(:show)
+    allow(request_context).to receive_messages(search_state: search_state, action_name: :show)
   end
 
   describe "link_rel_alternates" do
@@ -64,7 +63,7 @@ RSpec.describe Blacklight::ShowPresenter, api: true do
         tmp_value = Capybara.ignore_hidden_elements
         Capybara.ignore_hidden_elements = false
         document.export_formats.each_pair do |format, _spec|
-          expect(subject).to have_selector("link[href$='.#{format}']", count: 1) do |tag|
+          expect(subject).to have_css("link[href$='.#{format}']", count: 1) do |tag|
             expect(tag["rel"]).to eq "alternate"
             expect(tag["title"]).to eq format.to_s
             expect(tag["href"]).to eq "url.#{format}"
@@ -82,7 +81,7 @@ RSpec.describe Blacklight::ShowPresenter, api: true do
       it "respects unique: true" do
         tmp_value = Capybara.ignore_hidden_elements
         Capybara.ignore_hidden_elements = false
-        expect(subject).to have_selector("link[type='application/weird']", count: 1)
+        expect(subject).to have_css("link[type='application/weird']", count: 1)
         Capybara.ignore_hidden_elements = tmp_value
       end
     end
@@ -93,7 +92,7 @@ RSpec.describe Blacklight::ShowPresenter, api: true do
       it "excludes formats from :exclude" do
         tmp_value = Capybara.ignore_hidden_elements
         Capybara.ignore_hidden_elements = false
-        expect(subject).not_to have_selector("link[href$='.weird_dup']")
+        expect(subject).to have_no_css("link[href$='.weird_dup']")
         Capybara.ignore_hidden_elements = tmp_value
       end
     end

data/spec/presenters/{thumbnail_presenter_spec.rb → blacklight/thumbnail_presenter_spec.rb}

@@ -75,10 +75,10 @@ RSpec.describe Blacklight::ThumbnailPresenter do
         end
 
         it "calls the provided thumbnail method" do
-          expect(view_context).to receive_messages(xyz: "some-thumbnail")
           allow(view_context).to receive(:link_to_document).with(document, "some-thumbnail", {})
                                                            .and_return("link")
           expect(subject).to eq "link"
+          expect(view_context).to have_received(:xyz)
         end
 
         context "and url options have :suppress_link" do
@@ -107,8 +107,9 @@ RSpec.describe Blacklight::ThumbnailPresenter do
       it "creates an image tag from the given field" do
         allow(document).to receive(:fetch).with(:xyz, nil).and_return("http://example.com/some.jpg")
         allow(view_context).to receive(:image_tag).with("http://example.com/some.jpg", {}).and_return('<img src="image.jpg">')
-        expect(view_context).to receive(:link_to_document).with(document, '<img src="image.jpg">', {})
+        allow(view_context).to receive(:link_to_document)
         subject
+        expect(view_context).to have_received(:link_to_document).with(document, '<img src="image.jpg">', {})
       end
 
       it "returns nil if no thumbnail is in the document" do
@@ -126,8 +127,9 @@ RSpec.describe Blacklight::ThumbnailPresenter do
 
         it "creates an image tag from the given field" do
           allow(view_context).to receive(:image_tag).with("http://example.com/some.jpg", {}).and_return('<img src="image.jpg">')
-          expect(view_context).to receive(:link_to_document).with(document, '<img src="image.jpg">', {}).and_return('<a><img></a>')
+          allow(view_context).to receive(:link_to_document).and_return('<a><img></a>')
           expect(presenter.thumbnail_tag).to eq '<a><img></a>'
+          expect(view_context).to have_received(:link_to_document).with(document, '<img src="image.jpg">', {})
         end
       end
     end

data/spec/requests/load_suggestions_spec.rb

@@ -6,11 +6,11 @@ RSpec.describe 'GET /catalog/suggest' do
   it 'returns suggestions' do
     get '/catalog/suggest?q=new'
     expect(response.body).to eq <<-RESULT
-  <li role="option"><span>new jersey</span></li>
-  <li role="option"><span>new jersey bridgeton biography</span></li>
-  <li role="option"><span>new jersey bridgeton history</span></li>
-  <li role="option"><span>new york</span></li>
-  <li role="option"><span>nuwākshūṭ</span></li>
+  <li role="option" class="dropdown-item"><span>new jersey</span></li>
+  <li role="option" class="dropdown-item"><span>new jersey bridgeton biography</span></li>
+  <li role="option" class="dropdown-item"><span>new jersey bridgeton history</span></li>
+  <li role="option" class="dropdown-item"><span>new york</span></li>
+  <li role="option" class="dropdown-item"><span>nuwākshūṭ</span></li>
     RESULT
   end
 end

data/spec/routing/catalog_routing_spec.rb

@@ -30,7 +30,7 @@ RSpec.describe "Routing" do
     end
   end
 
-  describe "solr_document_path for SolrDocument", test: true do
+  describe "solr_document_path for SolrDocument", :test do
     it "routes correctly" do
       expect(get: solr_document_path(SolrDocument.new(id: 'asdf'))).to route_to(controller: 'catalog', action: 'show', id: 'asdf')
     end

data/spec/services/blacklight/field_retriever_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-RSpec.describe Blacklight::FieldRetriever, api: true do
+RSpec.describe Blacklight::FieldRetriever, :api do
   let(:service) { described_class.new(document, blacklight_field_config) }
 
   let(:blacklight_field_config) { Blacklight::Configuration::Field.new(field: 'author_field', highlight: true) }

data/spec/services/blacklight/search_service_spec.rb

@@ -8,7 +8,7 @@
 #  to talk with solr and get results)? when we do a document request, does
 #  blacklight code get a single document returned?)
 #
-RSpec.describe Blacklight::SearchService, api: true do
+RSpec.describe Blacklight::SearchService, :api do
   subject { service }
 
   let(:context) { { whatever: :value } }
@@ -17,7 +17,7 @@ RSpec.describe Blacklight::SearchService, api: true do
   let(:user_params) { {} }
 
   let(:blacklight_config) { Blacklight::Configuration.new }
-  let(:copy_of_catalog_config) { ::CatalogController.blacklight_config.deep_copy }
+  let(:copy_of_catalog_config) { CatalogController.blacklight_config.deep_copy }
   let(:blacklight_solr) { RSolr.connect(Blacklight.connection_config.except(:adapter)) }
 
   let(:all_docs_query) { '' }
@@ -49,7 +49,7 @@ RSpec.describe Blacklight::SearchService, api: true do
   end
 
   # SPECS FOR SEARCH RESULTS FOR QUERY
-  describe 'Search Results', integration: true do
+  describe 'Search Results', :integration do
     let(:blacklight_config) { copy_of_catalog_config }
 
     describe 'for a sample query returning results' do
@@ -77,11 +77,11 @@ RSpec.describe Blacklight::SearchService, api: true do
       end
 
       it "returns a grouped response" do
-        expect(service.search_results).to be_a_kind_of Blacklight::Solr::Response::GroupResponse
+        expect(service.search_results).to be_a Blacklight::Solr::Response::GroupResponse
       end
     end
 
-    describe "for a query returning multiple groups", integration: true do
+    describe "for a query returning multiple groups", :integration do
       let(:blacklight_config) { copy_of_catalog_config }
       let(:user_params) { { q: all_docs_query } }
 
@@ -93,7 +93,7 @@ RSpec.describe Blacklight::SearchService, api: true do
 
       it "returns a grouped response" do
         solr_response = service.search_results
-        expect(solr_response).to be_a_kind_of Blacklight::Solr::Response::GroupResponse
+        expect(solr_response).to be_a Blacklight::Solr::Response::GroupResponse
         expect(solr_response.group_field).to eq "title_si"
       end
     end
@@ -139,7 +139,7 @@ RSpec.describe Blacklight::SearchService, api: true do
   end # Search Results
 
   # SPECS FOR SEARCH RESULTS FOR FACETS
-  describe 'Facets in Search Results for All Docs Query', integration: true do
+  describe 'Facets in Search Results for All Docs Query', :integration do
     let(:blacklight_config) { copy_of_catalog_config }
     let(:user_params) { { q: all_docs_query } }
 
@@ -184,7 +184,7 @@ RSpec.describe Blacklight::SearchService, api: true do
   end # facet specs
 
   # SPECS FOR SEARCH RESULTS FOR PAGING
-  describe 'Paging', integration: true do
+  describe 'Paging', :integration do
     let(:blacklight_config) { copy_of_catalog_config }
     let(:user_params) { { q: all_docs_query } }
 
@@ -276,7 +276,7 @@ RSpec.describe Blacklight::SearchService, api: true do
   end # page specs
 
   # SPECS FOR SINGLE DOCUMENT REQUESTS
-  describe 'Get Document By Id', integration: true do
+  describe 'Get Document By Id', :integration do
     let(:doc_id) { '2007020969' }
     let(:bad_id) { 'redrum' }
 
@@ -299,7 +299,7 @@ RSpec.describe Blacklight::SearchService, api: true do
     end
   end
 
-  describe 'Get multiple documents By Id', integration: true do
+  describe 'Get multiple documents By Id', :integration do
     let(:doc_id) { '2007020969' }
     let(:bad_id) { 'redrum' }
     let(:response) { service.fetch([doc_id]) }
@@ -318,7 +318,7 @@ RSpec.describe Blacklight::SearchService, api: true do
   end
 
   # SPECS FOR SPELLING SUGGESTIONS VIA SEARCH
-  describe "Searches should return spelling suggestions", integration: true do
+  describe "Searches should return spelling suggestions", :integration do
     context "for just-poor-enough-query term" do
       let(:user_params) { { q: 'boo' } }
 

data/spec/spec_helper.rb

@@ -28,7 +28,7 @@ Capybara.javascript_driver = :headless_chrome
 
 Capybara.register_driver :headless_chrome do |app|
   Capybara::Selenium::Driver.load_selenium
-  capabilities = ::Selenium::WebDriver::Chrome::Options.new.tap do |opts|
+  capabilities = Selenium::WebDriver::Chrome::Options.new.tap do |opts|
     opts.args << '--headless'
     opts.args << '--disable-gpu'
     opts.args << '--no-sandbox'
@@ -41,7 +41,7 @@ end
 # in spec/support/ and its subdirectories.
 # Blacklight, again, make sure we're looking in the right place for em.
 # Relative to HERE, NOT to Rails.root, which is off somewhere else.
-Dir[Pathname.new(File.expand_path('support/**/*.rb', __dir__))].sort.each { |f| require f }
+Dir[Pathname.new(File.expand_path('support/**/*.rb', __dir__))].each { |f| require f }
 
 RSpec.configure do |config|
   config.disable_monkey_patching!

data/spec/support/features/search_helpers.rb

@@ -6,7 +6,7 @@ module Features
     def search_for q
       visit root_path
       fill_in "q", with: q
-      click_button 'search'
+      click_on 'search'
     end
 
     def position_in_result_page(page, id)
@@ -20,7 +20,7 @@ module Features
     def number_of_results_for_query(query)
       visit root_path
       fill_in "q", with: query
-      click_button "search"
+      click_on "search"
       get_number_of_results_from_page(page)
     end
 

data/spec/support/features/session_helpers.rb

@@ -9,7 +9,7 @@ module Features
       fill_in 'Email', with: email
       fill_in 'Password', with: password
       fill_in 'Password confirmation', with: password
-      click_button 'Sign up'
+      click_on 'Sign up'
     end
 
     def sign_in(login = 'user1')
@@ -20,9 +20,9 @@ module Features
       fill_in("user_password", with: "password")
 
       if has_button? "Sign in"
-        click_button("Sign in")
+        click_on("Sign in")
       elsif has_button? "Log in"
-        click_button("Log in")
+        click_on("Log in")
       else
         raise "Unable to find sign in button"
       end

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

@@ -20,13 +20,13 @@ class TestAppGenerator < Rails::Generators::Base
       options += ' --skip-assets'
     end
 
-    generate 'blacklight:install', options
+    generate :'blacklight:install', options
   end
 
   def run_test_support_generator
     say_status("warning", "GENERATING test_support", :yellow)
 
-    generate 'blacklight:test_support'
+    generate(:'blacklight:test_support')
   end
 
   def add_local_assets_for_propshaft
@@ -39,7 +39,7 @@ class TestAppGenerator < Rails::Generators::Base
     src_template = File.join(Blacklight::Engine.root, 'app', 'components', 'blacklight', 'top_navbar_component.html.erb')
     target_template = File.join('app', 'components', 'blacklight', 'top_navbar_component.html.erb')
     create_file(target_template) do
-      File.read(src_template).gsub('role="navigation"', 'role="navigation" data-template-override="top_navbar_component"')
+      File.read(src_template).gsub('aria-label', 'data-template-override="top_navbar_component" aria-label')
     end
   end
 end

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

@@ -6,10 +6,7 @@ RSpec.describe "catalog/_document" do
 
   before 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).to receive_messages(render_grouped_response?: false, blacklight_config: blacklight_config, search_session: {}, current_search_session: nil)
     allow(view.main_app).to receive(:track_test_path).and_return('/track')
     assign(:response, instance_double(Blacklight::Solr::Response, start: 20))
   end

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-RSpec.describe "catalog/_document_list", type: :view do
+RSpec.describe "catalog/_document_list" do
   let(:view_type) { 'some-view' }
   let(:view_config) { double(Blacklight::Configuration::ViewConfig) }
 
@@ -12,6 +12,6 @@ RSpec.describe "catalog/_document_list", type: :view do
 
   it "includes a class for the current view" do
     render(partial: "catalog/document_list", locals: { view_config: view_config })
-    expect(rendered).to have_selector(".documents-some-view")
+    expect(rendered).to have_css(".documents-some-view")
   end
 end