blacklight 8.13.0 → 9.0.0.beta1

data/spec/features/search_history_spec.rb

@@ -5,8 +5,8 @@ RSpec.describe "Search History Page" do
     it "has a link to the history page" do
       visit root_path
       click_on 'History'
-      expect(page).to have_text 'Search History'
-      expect(page).to have_text 'You have no search history'
+      expect(page).to have_content 'Search History'
+      expect(page).to have_content 'You have no search history'
     end
   end
 
@@ -19,15 +19,15 @@ RSpec.describe "Search History Page" do
     end
 
     it "shows searches" do
-      expect(page).to have_text 'Your recent searches'
-      expect(page).to have_text 'book'
-      expect(page).to have_no_text 'dang'
+      expect(page).to have_content 'Your recent searches'
+      expect(page).to have_content 'book'
+      expect(page).to have_no_content 'dang'
       visit root_path
       fill_in "q", with: 'dang'
       click_on 'search'
       click_on 'History'
-      expect(page).to have_text 'book'
-      expect(page).to have_text 'dang'
+      expect(page).to have_content 'book'
+      expect(page).to have_content 'dang'
     end
   end
 
@@ -43,10 +43,10 @@ RSpec.describe "Search History Page" do
 
     it "is able to clear the history" do
       click_on "Clear Search History"
-      expect(page).to have_text 'Cleared your search history.'
-      expect(page).to have_text 'You have no search history'
-      expect(page).to have_no_text 'book'
-      expect(page).to have_no_text 'dang'
+      expect(page).to have_content 'Cleared your search history.'
+      expect(page).to have_content 'You have no search history'
+      expect(page).to have_no_content 'book'
+      expect(page).to have_no_content 'dang'
     end
   end
 end

data/spec/features/search_pagination_spec.rb

@@ -6,7 +6,7 @@ RSpec.describe "Search Pagination" do
     fill_in "q", with: ''
     click_on 'search'
     within ("#sortAndPerPage") do
-      expect(page).to have_text "1 - 10 of "
+      expect(page).to have_content "1 - 10 of "
       within '#per_page-dropdown' do
         expect(page).to have_link('10')
         expect(page).to have_link('20')
@@ -18,11 +18,11 @@ RSpec.describe "Search Pagination" do
       click_on "Next »"
     end
     within "#sortAndPerPage" do
-      expect(page).to have_text "11 - 20 of "
+      expect(page).to have_content "11 - 20 of "
       click_on "« Previous"
     end
     within "#sortAndPerPage" do
-      expect(page).to have_text "1 - 10 of "
+      expect(page).to have_content "1 - 10 of "
     end
   end
 
@@ -31,14 +31,14 @@ RSpec.describe "Search Pagination" do
     fill_in "q", with: ''
     click_on 'search'
     within ("#sortAndPerPage") do
-      expect(page).to have_text "1 - 10 of "
+      expect(page).to have_content "1 - 10 of "
     end
 
     within ("#per_page-dropdown") do
       click_on '20'
     end
     within ("#sortAndPerPage") do
-      expect(page).to have_text "1 - 20 of "
+      expect(page).to have_content "1 - 20 of "
     end
   end
 
@@ -61,7 +61,7 @@ RSpec.describe "Search Pagination" do
       fill_in "q", with: ''
       click_on 'search'
       within ("#sortAndPerPage") do
-        expect(page).to have_text "1 - 15 of "
+        expect(page).to have_content "1 - 15 of "
         within '#per_page-dropdown' do
           expect(page).to have_link('15')
           expect(page).to have_link('30')
@@ -71,7 +71,7 @@ RSpec.describe "Search Pagination" do
         click_on '30'
       end
       within ("#sortAndPerPage") do
-        expect(page).to have_text "1 - 30 of "
+        expect(page).to have_content "1 - 30 of "
       end
     end
   end
@@ -84,13 +84,13 @@ RSpec.describe "Search Pagination" do
       click_on "Next »"
     end
     within "#sortAndPerPage" do
-      expect(page).to have_text "11 - 20 of "
+      expect(page).to have_content "11 - 20 of "
     end
     within ("#per_page-dropdown") do
       click_on '20'
     end
     within "#sortAndPerPage" do
-      expect(page).to have_text "1 - 20 of "
+      expect(page).to have_content "1 - 20 of "
     end
   end
 end

data/spec/features/search_results_spec.rb

@@ -44,7 +44,7 @@ RSpec.describe "Search Results" do
 
   it "provides search hints if there are no results" do
     search_for 'asdfghj'
-    expect(page).to have_text "No results found for your search"
+    expect(page).to have_content "No results found for your search"
   end
 
   it "provides search hints if there are no results" do
@@ -52,8 +52,8 @@ RSpec.describe "Search Results" do
     fill_in "q", with: "inmul"
     select "Author", from: "search_field"
     click_on 'search'
-    expect(page).to have_text "No results found for your search"
-    expect(page).to have_text "you searched by Author"
+    expect(page).to have_content "No results found for your search"
+    expect(page).to have_content "you searched by Author"
     click_on "try searching everything"
     expect(page).to have_xpath("//a[contains(@href, 77826928)]")
   end

data/spec/features/search_sort_spec.rb

@@ -6,17 +6,17 @@ RSpec.describe "Search Sort" do
     within "#facet-language_ssim" do
       click_on 'English'
     end
-    expect(page).to have_text 'Sort by relevance'
+    expect(page).to have_content 'Sort by relevance'
     click_on 'title'
-    expect(page).to have_text 'Sort by title'
+    expect(page).to have_content 'Sort by title'
   end
 
   it "sorts on search" do
     visit root_path
     fill_in "q", with: 'bod'
     click_on 'search'
-    expect(page).to have_text 'Sort by relevance'
+    expect(page).to have_content 'Sort by relevance'
     click_on 'title'
-    expect(page).to have_text 'Sort by title'
+    expect(page).to have_content 'Sort by title'
   end
 end

data/spec/features/search_spec.rb

@@ -18,7 +18,7 @@ RSpec.describe "Search Page" do
     expect(page).to have_css("button[type='submit'] .submit-search-text")
     expect(page).to have_no_link "Start Over"
 
-    expect(page).to have_text "Welcome!"
+    expect(page).to have_content "Welcome!"
     tmp_value = Capybara.ignore_hidden_elements
     Capybara.ignore_hidden_elements = false
     expect(page).to have_css("link[rel=stylesheet]")
@@ -44,8 +44,8 @@ RSpec.describe "Search Page" do
     Capybara.ignore_hidden_elements = tmp_value
 
     within "#appliedParams" do
-      expect(page).to have_text "You searched for:"
-      expect(page).to have_text "history"
+      expect(page).to have_content "You searched for:"
+      expect(page).to have_content "history"
     end
 
     within ("select#search_field") do
@@ -53,8 +53,8 @@ RSpec.describe "Search Page" do
     end
 
     within ("#sortAndPerPage") do
-      expect(page).to have_text "Sort by"
-      expect(page).to have_text "1 - 10 of 11"
+      expect(page).to have_content "Sort by"
+      expect(page).to have_content "1 - 10 of 11"
       within '#sort-dropdown' do
         expect(page).to have_link('relevance')
         expect(page).to have_link('year')
@@ -74,18 +74,18 @@ RSpec.describe "Search Page" do
     click_on 'search'
 
     within "#appliedParams" do
-      expect(page).to have_text "You searched for:"
-      expect(page).to have_text "Title"
-      expect(page).to have_text "inmul"
+      expect(page).to have_content "You searched for:"
+      expect(page).to have_content "Title"
+      expect(page).to have_content "inmul"
     end
     within ("select#search_field") do
       expect(page).to have_css("option[selected]", text: "Title")
     end
     within(".index_title") do
-      expect(page).to have_text "1."
+      expect(page).to have_content "1."
     end
     within ("#sortAndPerPage") do
-      expect(page).to have_text "1 entry found"
+      expect(page).to have_content "1 entry found"
     end
   end
 
@@ -94,8 +94,8 @@ RSpec.describe "Search Page" do
     fill_in "q", with: 'history'
     click_on 'search'
     within "#documents" do
-      expect(page).to have_text "次按驟變"
-      expect(page).to have_text "DK861.K3 V5"
+      expect(page).to have_content "次按驟變"
+      expect(page).to have_content "DK861.K3 V5"
     end
   end
 
@@ -104,15 +104,15 @@ RSpec.describe "Search Page" do
     fill_in "q", with: 'history'
     click_on 'search'
     within "#appliedParams" do
-      expect(page).to have_text "You searched for:"
-      expect(page).to have_text "history"
+      expect(page).to have_content "You searched for:"
+      expect(page).to have_content "history"
     end
 
     expect(page).to have_css "#q[value='history']"
 
     click_on "Start Over"
 
-    expect(page).to have_text "Welcome!"
+    expect(page).to have_content "Welcome!"
     expect(page).to have_no_css "#q[value='history']"
   end
 end

data/spec/helpers/blacklight/configuration_helper_behavior_spec.rb

@@ -93,15 +93,6 @@ RSpec.describe Blacklight::ConfigurationHelperBehavior do
     end
   end
 
-  describe "#per_page_options_for_select" do
-    it "is the per-page values formatted as options_for_select" do
-      allow(helper).to receive_messages(blacklight_config: double(per_page: [11, 22, 33]))
-      expect(helper.per_page_options_for_select).to include ["11<span class=\"sr-only visually-hidden\"> per page</span>", 11]
-      expect(helper.per_page_options_for_select).to include ["22<span class=\"sr-only visually-hidden\"> per page</span>", 22]
-      expect(helper.per_page_options_for_select).to include ["33<span class=\"sr-only visually-hidden\"> per page</span>", 33]
-    end
-  end
-
   describe "#should_render_field?" do
     let(:field_config) { double('field config', if: true, unless: false) }
 

data/spec/helpers/blacklight/render_partials_helper_behavior_spec.rb

@@ -31,7 +31,7 @@ RSpec.describe Blacklight::RenderPartialsHelperBehavior do
     end
   end
 
-  describe "#render_document_partials" do
+  describe "#render_document_partial" do
     let(:doc) { double }
 
     before do

data/spec/helpers/blacklight/url_helper_behavior_spec.rb

@@ -35,17 +35,17 @@ RSpec.describe Blacklight::UrlHelperBehavior do
     it "builds a link tag to catalog using session[:search] for query params" do
       allow(helper).to receive(:current_search_session).and_return double(query_params: query_params)
       tag = helper.link_back_to_catalog
-      expect(tag).to include('q=query')
-      expect(tag).to include('f=facets')
-      expect(tag).not_to include('page=')
-      expect(tag).not_to include('per_page=')
+      expect(tag).to match /q=query/
+      expect(tag).to match /f=facets/
+      expect(tag).not_to match /page=/
+      expect(tag).not_to match /per_page=/
     end
 
     it "builds a link tag to bookmarks using session[:search] for query params" do
       allow(helper).to receive(:current_search_session).and_return double(query_params: bookmarks_query_params)
       tag = helper.link_back_to_catalog
-      expect(tag).to include('Back to Bookmarks')
-      expect(tag).to include('/bookmarks')
+      expect(tag).to match /Back to Bookmarks/
+      expect(tag).to match %r{/bookmarks}
     end
 
     context "with a search context" do
@@ -53,16 +53,16 @@ RSpec.describe Blacklight::UrlHelperBehavior do
         allow(helper).to receive_messages(current_search_session: double(query_params: query_params))
         allow(helper).to receive_messages(search_session: { 'per_page' => 15, 'counter' => 31 })
         tag = helper.link_back_to_catalog
-        expect(tag).to include('page=3')
-        expect(tag).to include('per_page=15')
+        expect(tag).to match /page=3/
+        expect(tag).to match /per_page=15/
       end
 
       it "omits per_page if the value is the same as the default" do
         allow(helper).to receive_messages(current_search_session: double(query_params: query_params))
         allow(helper).to receive_messages(search_session: { 'per_page' => 10, 'counter' => 31 })
         tag = helper.link_back_to_catalog
-        expect(tag).to include('page=4')
-        expect(tag).not_to include('per_page=')
+        expect(tag).to match /page=4/
+        expect(tag).not_to match /per_page=/
       end
     end
 
@@ -92,8 +92,8 @@ RSpec.describe Blacklight::UrlHelperBehavior do
         expect(my_engine).to receive(:url_for)
           .with({ q: "query", f: "facets", controller: "catalog" })
           .and_return('link-url')
-        expect(tag).to include('Back to Search')
-        expect(tag).to include('link-url')
+        expect(tag).to match /Back to Search/
+        expect(tag).to match /link-url/
       end
     end
   end
@@ -130,11 +130,11 @@ RSpec.describe Blacklight::UrlHelperBehavior do
       end
 
       it "passes on the title attribute to the link_to_with_data method" do
-        expect(helper.link_to_document(document, "Some crazy long label...", title: "Some crazy longer label")).to include('title="Some crazy longer label"')
+        expect(helper.link_to_document(document, "Some crazy long label...", title: "Some crazy longer label")).to match(/title="Some crazy longer label"/)
       end
 
       it "doesn't add an erroneous title attribute if one isn't provided" do
-        expect(helper.link_to_document(document, "Some crazy long label...")).not_to include('title=')
+        expect(helper.link_to_document(document, "Some crazy long label...")).not_to match(/title=/)
       end
 
       context "with an integer id" do

data/spec/helpers/blacklight_helper_spec.rb

@@ -172,12 +172,6 @@ RSpec.describe BlacklightHelper do
     end
 
     it "ignores missing templates" do
-      # In ViewComponent 3.25.0+, collection components rendered from a plain
-      # ActionView template fall back to controller.view_context for helpers
-      # instead of the stubbed helper. Workaround not needed on 2.x or 4.x.
-      if ViewComponent::VERSION::MAJOR == 3
-        allow(controller).to receive(:view_context).and_return(helper)
-      end
       blacklight_config.view.view_type(partials: %w[index_header a b])
 
       response = helper.render_document_index_with_view :view_type, [obj1, obj1]

data/spec/helpers/catalog_helper_spec.rb

@@ -135,9 +135,9 @@ RSpec.describe CatalogHelper do
 
       it "calls url_for on the engine scope" do
         expect(my_engine).to receive(:url_for).and_return('/rss-path')
-        expect(tag).to include('title="RSS for results"')
-        expect(tag).to include('rel="alternate"')
-        expect(tag).to include('type="application/rss+xml"')
+        expect(tag).to match /title="RSS for results"/
+        expect(tag).to match /rel="alternate"/
+        expect(tag).to match %r{type="application/rss\+xml"}
       end
     end
   end
@@ -157,9 +157,9 @@ RSpec.describe CatalogHelper do
 
       it "calls url_for on the engine scope" do
         expect(my_engine).to receive(:url_for).and_return('/atom-path')
-        expect(tag).to include('title="Atom for results"')
-        expect(tag).to include('rel="alternate"')
-        expect(tag).to include('type="application/atom+xml"')
+        expect(tag).to match /title="Atom for results"/
+        expect(tag).to match /rel="alternate"/
+        expect(tag).to match %r{type="application/atom\+xml"}
       end
     end
   end

data/spec/lib/blacklight/open_struct_with_hash_access_spec.rb

@@ -164,12 +164,5 @@ RSpec.describe Blacklight::OpenStructWithHashAccess do
     it "works (and doesn't throw a stack error...)" do
       expect(subject.try(:a)).to eq 1
     end
-
-    it "passes a block to the method indicated" do
-      acc = []
-      test_block = proc { |n, v| acc << [n, v] }
-      expect(subject.try(:each_pair, &test_block)).to be subject
-      expect(acc).to eq [[:a, 1]]
-    end
   end
 end

data/spec/lib/blacklight/parameters_spec.rb

@@ -52,7 +52,7 @@ RSpec.describe Blacklight::Parameters do
     let(:search_state) { Blacklight::SearchState.new(query_params, blacklight_config) }
     let(:blacklight_config) { Blacklight::Configuration.new }
 
-    context 'with facebook\'s badly mangled query parameters' do
+    context 'with facebooks badly mangled query parameters' do
       let(:query_params) do
         ActionController::Parameters.new(
           f: { field: { '0': 'first', '1': 'second' } },
@@ -67,17 +67,6 @@ RSpec.describe Blacklight::Parameters do
       it 'normalizes the facets to the expected format' do
         expect(params.permit_search_params.to_h.with_indifferent_access).to include f: { field: %w[first second] }, f_inclusive: { field: %w[first second] }
       end
-
-      context 'when several fields are configured' do
-        before do
-          blacklight_config.add_facet_field 'other_field'
-          blacklight_config.add_facet_field 'some_other_pivot_field', pivot: %w[abc def]
-        end
-
-        it 'normalizes the facets to the expected format' do
-          expect(params.permit_search_params.to_h.with_indifferent_access).to include f: { field: %w[first second] }, f_inclusive: { field: %w[first second] }
-        end
-      end
     end
 
     context 'with filter_search_state_fields set to false' do

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

@@ -198,22 +198,4 @@ RSpec.describe Blacklight::SearchState::FilterField do
       expect(search_state.filter('some_field').include?(OpenStruct.new(value: '1'))).to be true
     end
   end
-
-  describe '#permitted_params' do
-    context 'with a pivot facet' do
-      let(:blacklight_config) do
-        Blacklight::Configuration.new.configure do |config|
-          config.add_facet_field 'my_pivot', pivot: %w[format language_ssim]
-        end
-      end
-
-      it 'marks all the pivot fields as permitted' do
-        field = described_class.new blacklight_config.facet_fields['my_pivot'], search_state
-        expect(field.permitted_params).to eq({
-                                               f: { "-format" => [], "-language_ssim" => [], "format" => [], "language_ssim" => [] },
-                                               f_inclusive: { "format" => [], "language_ssim" => [] }
-                                             })
-      end
-    end
-  end
 end

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

@@ -73,7 +73,7 @@ RSpec.describe Blacklight::SearchState::PivotFilterField do
       new_state = filter.remove(value_class.new(fq: { some_other_field: '3' }, value: '1'))
 
       expect(new_state.params[:f]).not_to include :some_other_field
-      expect(new_state.filter('pivot_field').values&.map(&:fq)).to eql([{ some_other_field: nil }])
+      expect(new_state.filter('pivot_field').values&.map(&:fq)).to eql([some_other_field: nil])
     end
 
     it 'removes the filter parameter entirely if there are no filters left' do

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

@@ -64,5 +64,12 @@ RSpec.describe Blacklight::Solr::Request, :api do
 
       expect(subject.dig('json', 'query', 'bool', 'must')).to contain_exactly('some query', 'also required')
     end
+
+    it 'filters out empty query' do
+      subject['q'] = ""
+      subject.append_boolean_query :must, 'present query'
+
+      expect(subject.dig('json', 'query', 'bool', 'must')).to contain_exactly('present query')
+    end
   end
 end

data/spec/models/record_mailer_spec.rb

@@ -41,7 +41,7 @@ RSpec.describe RecordMailer do
     end
 
     it "puts the title of the item in the subject" do
-      expect(email.subject).to include('The horn')
+      expect(email.subject).to match /The horn/
     end
 
     it "has the correct from address (w/o the port number)" do
@@ -49,8 +49,8 @@ RSpec.describe RecordMailer do
     end
 
     it "prints out the correct body" do
-      expect(email.body).to include('Title: The horn')
-      expect(email.body).to include('Author: Janetzky, Kurt')
+      expect(email.body).to match /Title: The horn/
+      expect(email.body).to match /Author: Janetzky, Kurt/
       expect(email.body).to match /projectblacklight.org/
     end
 
@@ -104,8 +104,8 @@ RSpec.describe RecordMailer do
     end
 
     it "prints out the correct body" do
-      expect(@sms.body).to include('Title: The horn')
-      expect(@sms.body).to include('Author: Janetzky, Kurt')
+      expect(@sms.body).to match /Title: The horn/
+      expect(@sms.body).to match /Author: Janetzky, Kurt/
       expect(@sms.body).to match /projectblacklight.org:3000/
     end
 

data/spec/models/solr_document_spec.rb

@@ -37,11 +37,7 @@ RSpec.describe SolrDocument, :api do
                           title_tesim: ['Good Omens'])
     end
 
-    if RUBY_VERSION > '3.4'
-      it { is_expected.to end_with "_source: {\"id\" => \"123\", \"title_tesim\" => [\"Good Omens\"]}>" }
-    else
-      it { is_expected.to end_with "_source: {\"id\"=>\"123\", \"title_tesim\"=>[\"Good Omens\"]}>" }
-    end
+    it { is_expected.to end_with "_source: {\"id\"=>\"123\", \"title_tesim\"=>[\"Good Omens\"]}>" }
   end
 
   describe '.attribute' do

data/spec/presenters/blacklight/index_presenter_spec.rb

@@ -2,7 +2,6 @@
 
 RSpec.describe Blacklight::IndexPresenter, :api do
   include Capybara::RSpecMatchers
-
   subject { presenter }
 
   let(:request_context) { double(document_index_view_type: 'list') }

data/spec/presenters/blacklight/rendering/pipeline_spec.rb

@@ -2,7 +2,6 @@
 
 RSpec.describe Blacklight::Rendering::Pipeline do
   include Capybara::RSpecMatchers
-
   let(:document) { instance_double(SolrDocument) }
   let(:context) { double }
   let(:options) { {} }

data/spec/presenters/blacklight/show_presenter_spec.rb

@@ -2,7 +2,6 @@
 
 RSpec.describe Blacklight::ShowPresenter, :api do
   include Capybara::RSpecMatchers
-
   subject { presenter }
 
   let(:request_context) { double }

data/spec/presenters/blacklight/thumbnail_presenter_spec.rb

@@ -2,7 +2,6 @@
 
 RSpec.describe Blacklight::ThumbnailPresenter do
   include Capybara::RSpecMatchers
-
   let(:view_context) { double "View context" }
   let(:config) { Blacklight::Configuration.new.view_config(:index) }
   let(:presenter) { described_class.new(document, view_context, config) }

data/spec/services/blacklight/search_service_spec.rb

@@ -59,7 +59,7 @@ RSpec.describe Blacklight::SearchService, :api 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|
           expect(path).to eq 'select'
-          expect(params[:params]['facet.field']).to contain_exactly "format", "{!ex=pub_date_ssim_single}pub_date_ssim", "subject_ssim", "language_ssim", "lc_1letter_ssim", "subject_geo_ssim", "subject_era_ssim"
+          expect(params[:params]['facet.field']).to eq ["format", "{!ex=pub_date_ssim_single}pub_date_ssim", "subject_ssim", "language_ssim", "lc_1letter_ssim", "subject_geo_ssim", "subject_era_ssim"]
           expect(params[:params]["facet.query"]).to eq ["pub_date_ssim:[#{5.years.ago.year} TO *]", "pub_date_ssim:[#{10.years.ago.year} TO *]", "pub_date_ssim:[#{25.years.ago.year} TO *]"]
           expect(params[:params]).to include('rows' => 10, 'qt' => "custom_request_handler", 'q' => "", "f.subject_ssim.facet.limit" => 21, 'sort' => "score desc, pub_date_si desc, title_si asc")
         end.and_return('response' => { 'docs' => [] })

data/spec/support/presenter_test_helpers.rb

@@ -2,7 +2,7 @@
 
 module PresenterTestHelpers
   def controller
-    @controller ||= ApplicationController.new.tap { |c| c.request = request }.extend(Rails.application.routes.url_helpers)
+    @controller ||= ViewComponent::Base.test_controller.constantize.new.tap { |c| c.request = request }.extend(Rails.application.routes.url_helpers)
   end
 
   def request

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

@@ -17,9 +17,9 @@ RSpec.describe "catalog/_document" do
     stub_template "catalog/_b_default.html.erb" => "b_partial"
     stub_template "catalog/_c_default.html.erb" => "c_partial"
     render partial: "catalog/document", locals: { document: document, document_counter: 1, view_config: blacklight_config.index }
-    expect(rendered).to include('a_partial')
-    expect(rendered).to include('b_partial')
-    expect(rendered).to include('c_partial')
+    expect(rendered).to match /a_partial/
+    expect(rendered).to match /b_partial/
+    expect(rendered).to match /c_partial/
   end
 
   context 'with a configured document component' do
@@ -39,7 +39,7 @@ RSpec.describe "catalog/_document" do
 
     it 'renders the document component' do
       render partial: "catalog/document", locals: { document: document, document_counter: 1, view_config: blacklight_config.index }
-      expect(rendered).to include('blah')
+      expect(rendered).to match /blah/
     end
   end
 end

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

@@ -28,14 +28,14 @@ RSpec.describe "catalog/facet_layout" do
   it "is collapsable" do
     render partial: 'catalog/facet_layout', locals: { facet_field: facet_field }
     expect(rendered).to have_css 'button.collapsed[data-toggle="collapse"][data-bs-toggle="collapse"][aria-expanded="false"]'
-    expect(rendered).to have_css '.collapse .card-body'
+    expect(rendered).to have_css '.collapse .accordion-body'
   end
 
   it "is configured to be open by default" do
     allow(facet_field).to receive_messages(collapse: false)
     render partial: 'catalog/facet_layout', locals: { facet_field: facet_field }
     expect(rendered).to have_css 'button[data-toggle="collapse"][data-bs-toggle="collapse"][aria-expanded="true"]'
-    expect(rendered).to have_no_css '.card-header.collapsed'
-    expect(rendered).to have_css '.collapse.show .card-body'
+    expect(rendered).to have_no_css '.accordion-header.collapsed'
+    expect(rendered).to have_css '.collapse.show .accordion-body'
   end
 end

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

@@ -17,10 +17,10 @@ RSpec.describe "catalog/_sort_and_per_page" do
     stub_template "catalog/_per_page_widget.html.erb" => "per_page_widget"
     stub_template "catalog/_view_type_group.html.erb" => "view_type_group"
     render
-    expect(rendered).to include('paginate_compact')
-    expect(rendered).to include('sort_widget')
-    expect(rendered).to include('per_page_widget')
-    expect(rendered).to include('view_type_group')
+    expect(rendered).to match /paginate_compact/
+    expect(rendered).to match /sort_widget/
+    expect(rendered).to match /per_page_widget/
+    expect(rendered).to match /view_type_group/
   end
 
   it "does not render the pagination controls with bad limit values" do
@@ -30,6 +30,6 @@ RSpec.describe "catalog/_sort_and_per_page" do
     stub_template "catalog/_per_page_widget.html.erb" => "per_page_widget"
     stub_template "catalog/_view_type_group.html.erb" => "view_type_group"
     render
-    expect(rendered).not_to include('paginate_compact')
+    expect(rendered).not_to match /paginate_compact/
   end
 end