blacklight 8.2.2 → 8.4.0

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-RSpec.describe 'catalog/_facet_index_navigation.html.erb', type: :view do
+RSpec.describe 'catalog/_facet_index_navigation.html.erb' do
   let(:pagination) { Blacklight::Solr::FacetPaginator.new([]) }
   let(:facet) { Blacklight::Configuration::FacetField.new(index_range: '0'..'9', presenter: Blacklight::FacetFieldPresenter) }
   let(:display_facet) { double(items: [], offset: 0, prefix: '', sort: 'index') }
@@ -9,14 +9,13 @@ RSpec.describe 'catalog/_facet_index_navigation.html.erb', type: :view do
   before do
     assign(:display_facet, display_facet)
     assign(:facet, facet)
-    allow(view).to receive(:blacklight_config).and_return(blacklight_config)
-    allow(view).to receive(:facet_limit_for).and_return(10)
+    allow(view).to receive_messages(blacklight_config: blacklight_config, facet_limit_for: 10)
     controller.request.path_parameters[:action] = 'index'
   end
 
   it 'renders the facet index navigation range' do
     render
-    expect(rendered).to have_selector '.pagination'
+    expect(rendered).to have_css '.pagination'
     expect(rendered).to have_link '0', href: '/?facet.prefix=0&facet.sort=index'
     expect(rendered).to have_link '1'
     expect(rendered).to have_link '8'
@@ -25,7 +24,7 @@ RSpec.describe 'catalog/_facet_index_navigation.html.erb', type: :view do
 
   it 'renders an "all" button' do
     render
-    expect(rendered).to have_selector '.page-link', text: 'All'
+    expect(rendered).to have_css '.page-link', text: 'All'
   end
 
   context 'with a selected index' do
@@ -33,7 +32,7 @@ RSpec.describe 'catalog/_facet_index_navigation.html.erb', type: :view do
 
     it 'highlights the selected index' do
       render
-      expect(rendered).to have_selector '.active', text: '5'
+      expect(rendered).to have_css '.active', text: '5'
     end
 
     it 'enables the clear facets button' do

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

@@ -17,25 +17,25 @@ RSpec.describe "catalog/facet_layout" do
 
   it "has a facet-specific class" do
     render partial: 'catalog/facet_layout', locals: { facet_field: facet_field }
-    expect(rendered).to have_selector '.blacklight-some_field'
+    expect(rendered).to have_css '.blacklight-some_field'
   end
 
   it "has a title with a link for a11y" do
     render partial: 'catalog/facet_layout', locals: { facet_field: facet_field }
-    expect(rendered).to have_selector 'h3', text: 'Some Field'
+    expect(rendered).to have_css 'h3', text: 'Some Field'
   end
 
   it "is collapsable" do
     render partial: 'catalog/facet_layout', locals: { facet_field: facet_field }
-    expect(rendered).to have_selector 'button.collapsed[data-toggle="collapse"][data-bs-toggle="collapse"][aria-expanded="false"]'
-    expect(rendered).to have_selector '.collapse .card-body'
+    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'
   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_selector 'button[data-toggle="collapse"][data-bs-toggle="collapse"][aria-expanded="true"]'
-    expect(rendered).not_to have_selector '.card-header.collapsed'
-    expect(rendered).to have_selector '.collapse.show .card-body'
+    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'
   end
 end

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

@@ -11,14 +11,14 @@ RSpec.describe "catalog/_paginate_compact.html.erb" do
 
   it "renders paginatable arrays" do
     render partial: 'catalog/paginate_compact', object: Kaminari.paginate_array([], total_count: 145).page(1).per(10)
-    expect(rendered).to have_selector ".page-entries"
-    expect(rendered).to have_selector "a[@rel=next]"
+    expect(rendered).to have_css ".page-entries"
+    expect(rendered).to have_css "a[@rel=next]"
   end
 
   it "renders ActiveRecord collections" do
     50.times { b = Bookmark.new; b.user = user; b.save! }
     render partial: 'catalog/paginate_compact', object: Bookmark.page(1).per(25)
-    expect(rendered).to have_selector ".page-entries"
-    expect(rendered).to have_selector "a[@rel=next]"
+    expect(rendered).to have_css ".page-entries"
+    expect(rendered).to have_css "a[@rel=next]"
   end
 end

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

@@ -11,10 +11,7 @@ RSpec.describe "catalog/_show_sidebar.html.erb" do
   end
 
   before do
-    allow(view).to receive(:blacklight_config).and_return(blacklight_config)
-    allow(view).to receive(:has_user_authentication_provider?).and_return(false)
-    allow(view).to receive(:document_actions).and_return([])
-    allow(view).to receive(:session_tracking_params).and_return({})
+    allow(view).to receive_messages(blacklight_config: blacklight_config, has_user_authentication_provider?: false, document_actions: [], session_tracking_params: {})
   end
 
   it "shows more-like-this titles in the sidebar" do

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

@@ -9,8 +9,7 @@ RSpec.describe "catalog/_show_tools.html.erb" do
     allow(Blacklight::Document::ShowToolsComponent).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
+    allow(view).to receive_messages(blacklight_config: blacklight_config, has_user_authentication_provider?: false)
   end
 
   describe "document actions" do

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

@@ -34,13 +34,13 @@ RSpec.describe "catalog/_view_type_group" do
       config.view.c(icon: :list)
     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_css('.btn-group.view-type-group')
+    expect(rendered).to have_css('.view-type-a', text: 'A')
     within '.view-type-a' do
-      expect(rendered).to have_selector 'svg'
+      expect(rendered).to have_css '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_css('.view-type-b', text: 'B')
+    expect(rendered).to have_css('.view-type-c', text: 'C')
   end
 
   it "sets the current view to 'active'" do
@@ -50,7 +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_css('.active', text: 'A')
+    expect(rendered).to have_no_css('.active', text: 'B')
   end
 end

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

@@ -3,6 +3,6 @@
 RSpec.describe "catalog/email_success.html.erb" do
   it "includes updates to the main flash messages" do
     render
-    expect(rendered).to have_selector 'turbo-stream[action="append"][target="main-flashes"]'
+    expect(rendered).to have_css 'turbo-stream[action="append"][target="main-flashes"]'
   end
 end

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

@@ -19,7 +19,7 @@ RSpec.describe 'catalog/facet.html.erb' do
 
   it "has the facet title" do
     render
-    expect(rendered).to have_selector 'h1', text: "Facet title"
+    expect(rendered).to have_css 'h1', text: "Facet title"
   end
 
   it "renders facet pagination" do

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

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

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

@@ -20,8 +20,7 @@ RSpec.describe "catalog/index" do
     allow(controller).to receive(:search_state_class).and_return(Blacklight::SearchState)
     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(blacklight_config)
+    allow(view).to receive_messages(action_name: 'index', blacklight_config: blacklight_config)
   end
 
   # We need to use rexml to test certain things that have_tag wont' test
@@ -30,13 +29,13 @@ RSpec.describe "catalog/index" do
   it "has contextual information" do
     render template: 'catalog/index', formats: [:atom]
 
-    expect(rendered).to have_selector("link[rel=self]")
-    expect(rendered).to have_selector("link[rel=next]")
-    expect(rendered).to have_selector("link[rel=previous]")
-    expect(rendered).to have_selector("link[rel=first]")
-    expect(rendered).to have_selector("link[rel=last]")
-    expect(rendered).to have_selector("link[rel='alternate'][type='text/html']")
-    expect(rendered).to have_selector("link[rel=search][type='application/opensearchdescription+xml']")
+    expect(rendered).to have_css("link[rel=self]")
+    expect(rendered).to have_css("link[rel=next]")
+    expect(rendered).to have_css("link[rel=previous]")
+    expect(rendered).to have_css("link[rel=first]")
+    expect(rendered).to have_css("link[rel=last]")
+    expect(rendered).to have_css("link[rel='alternate'][type='text/html']")
+    expect(rendered).to have_css("link[rel=search][type='application/opensearchdescription+xml']")
   end
 
   it "gets paging data correctly from response" do
@@ -62,33 +61,33 @@ RSpec.describe "catalog/index" do
   it "has ten entries" do
     render template: 'catalog/index', formats: [:atom]
 
-    expect(rendered).to have_selector("entry", count: 10)
+    expect(rendered).to have_css("entry", count: 10)
   end
 
   describe "entries" do
     it "has a title" do
       render template: 'catalog/index', formats: [:atom]
-      expect(rendered).to have_selector("entry > title")
+      expect(rendered).to have_css("entry > title")
     end
 
     it "has an updated" do
       render template: 'catalog/index', formats: [:atom]
-      expect(rendered).to have_selector("entry > updated")
+      expect(rendered).to have_css("entry > updated")
     end
 
     it "has html link" do
       render template: 'catalog/index', formats: [:atom]
-      expect(rendered).to have_selector("entry > link[rel=alternate][type='text/html']")
+      expect(rendered).to have_css("entry > link[rel=alternate][type='text/html']")
     end
 
     it "has an id" do
       render template: 'catalog/index', formats: [:atom]
-      expect(rendered).to have_selector("entry > id")
+      expect(rendered).to have_css("entry > id")
     end
 
     it "has a summary" do
       render template: 'catalog/index', formats: [:atom]
-      expect(rendered).to have_selector("entry > summary", text: 'Title 0')
+      expect(rendered).to have_css("entry > summary", text: 'Title 0')
     end
 
     context 'with a custom template' do
@@ -107,7 +106,7 @@ RSpec.describe "catalog/index" do
 
       it "has the customized summary" do
         render template: 'catalog/index', formats: [:atom]
-        expect(rendered).to have_selector("entry > summary", text: 'whatever content')
+        expect(rendered).to have_css("entry > summary", text: 'whatever content')
       end
     end
 
@@ -136,12 +135,12 @@ RSpec.describe "catalog/index" do
 
       it "includes a link rel tag" do
         render template: 'catalog/index', formats: [:atom]
-        expect(entry).to have_selector("link[rel=alternate][type='application/some-format']")
+        expect(entry).to have_css("link[rel=alternate][type='application/some-format']")
       end
 
       it "has content embedded" do
         render template: 'catalog/index', formats: [:atom]
-        expect(entry).to have_selector("content")
+        expect(entry).to have_css("content")
       end
     end
 
@@ -150,7 +149,7 @@ RSpec.describe "catalog/index" do
 
       it "does not have content embedded" do
         render template: 'catalog/index', formats: [:atom]
-        expect(entry).not_to have_selector("content[type='application/some-format']")
+        expect(entry).to have_no_css("content[type='application/some-format']")
       end
     end
   end

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

@@ -3,8 +3,7 @@
 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(CatalogController.blacklight_config)
+      allow(view).to receive_messages(has_search_parameters?: false, blacklight_config: CatalogController.blacklight_config)
       @response = instance_double(Blacklight::Solr::Response, empty?: true, total: 11, start: 1, limit_value: 10, aggregations: {})
     end
 
@@ -19,10 +18,9 @@ RSpec.describe "catalog/index.html.erb" do
 
   describe "with search parameters" do
     before do
-      allow(view).to receive(:has_search_parameters?).and_return(true)
       stub_template "catalog/_results_pagination.html.erb" => ""
       stub_template "catalog/_search_header.html.erb" => "header_content"
-      allow(view).to receive(:blacklight_config).and_return(Blacklight::Configuration.new)
+      allow(view).to receive_messages(has_search_parameters?: true, blacklight_config: Blacklight::Configuration.new)
       @response = instance_double(Blacklight::Solr::Response, empty?: true, total: 11, start: 1, limit_value: 10)
     end
 

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-RSpec.describe "catalog/index.json", api: true do
+RSpec.describe "catalog/index.json", :api do
   let(:response) { instance_double(Blacklight::Solr::Response, documents: docs, prev_page: nil, next_page: 2, total_pages: 3) }
   let(:docs) do
     [
@@ -32,13 +32,10 @@ RSpec.describe "catalog/index.json", api: true do
   end
 
   before do
-    allow(view).to receive(:blacklight_config).and_return(config)
-    allow(view).to receive(:search_action_path).and_return('http://test.host/some/search/url')
-    allow(view).to receive(:search_facet_path).and_return('http://test.host/some/facet/url')
-    allow(presenter).to receive(:pagination_info).and_return(current_page: 1,
-                                                             next_page: 2,
-                                                             prev_page: nil)
-    allow(presenter).to receive(:search_facets).and_return([format_facet])
+    allow(view).to receive_messages(blacklight_config: config, search_action_path: 'http://test.host/some/search/url', search_facet_path: 'http://test.host/some/facet/url')
+    allow(presenter).to receive_messages(pagination_info: { current_page: 1,
+                                                            next_page: 2,
+                                                            prev_page: nil }, search_facets: [format_facet])
     assign :presenter, presenter
     assign :response, response
   end

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

@@ -7,13 +7,11 @@ RSpec.describe "catalog/show.html.erb" do
 
   before do
     allow(presenter).to receive(:html_title).and_return('Heading')
-    allow(view).to receive(:document_presenter).and_return(presenter)
-    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, search_session: {})
     assign :document, document
-    allow(view).to receive(:blacklight_config).and_return(blacklight_config)
+    allow(view).to receive_messages(document_presenter: presenter, action_name: 'show', blacklight_config: blacklight_config)
   end
 
   it "sets the @page_title" do
@@ -26,8 +24,8 @@ RSpec.describe "catalog/show.html.erb" do
   it "includes schema.org itemscope/type properties" do
     allow(document).to receive_messages(itemtype: 'some-item-type-uri')
     render
-    expect(rendered).to have_selector('div#document[@itemscope]')
-    expect(rendered).to have_selector('div#document[@itemtype="some-item-type-uri"]')
+    expect(rendered).to have_css('div#document[@itemscope]')
+    expect(rendered).to have_css('div#document[@itemtype="some-item-type-uri"]')
   end
 
   it "uses the show.partials parameter to determine the partials to render" do

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

@@ -16,8 +16,7 @@ RSpec.describe "catalog/show.json" do
   end
 
   before do
-    allow(view).to receive(:blacklight_config).and_return(config)
-    allow(view).to receive(:action_name).and_return('show')
+    allow(view).to receive_messages(blacklight_config: config, action_name: 'show')
     assign :document, document
   end
 

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

@@ -3,6 +3,6 @@
 RSpec.describe "catalog/sms_success.html.erb" do
   it "includes updates to the main flash messages" do
     render
-    expect(rendered).to have_selector 'turbo-stream[action="append"][target="main-flashes"]'
+    expect(rendered).to have_css 'turbo-stream[action="append"][target="main-flashes"]'
   end
 end

data/spec/views/shared/_user_util_links.html.erb_spec.rb

@@ -9,11 +9,10 @@ RSpec.describe "shared/_user_util_links" do
 
   it "renders the correct bookmark count" do
     count = rand(99)
-    allow(view).to receive(:blacklight_config).and_return(blacklight_config)
     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_messages(blacklight_config: blacklight_config, has_user_authentication_provider?: false)
     allow(view).to receive_message_chain(:current_or_guest_user, :bookmarks, :count).and_return(count)
     render "shared/user_util_links"
-    expect(rendered).to have_selector('#bookmarks_nav span.badge[data-role=bookmark-counter]', text: count.to_s)
+    expect(rendered).to have_css('#bookmarks_nav span.badge[data-role=bookmark-counter]', text: count.to_s)
   end
 end

data/tasks/blacklight.rake

@@ -21,18 +21,18 @@ def system_with_error_handling(*args)
 end
 
 def with_solr(&block)
-  # We're being invoked by the app entrypoint script and solr is already up via docker-compose
+  # We're being invoked by the app entrypoint script and solr is already up via docker compose
   if ENV['SOLR_ENV'] == 'docker-compose'
     yield
-  elsif system('docker-compose -v')
-    # We're not running docker-compose up but still want to use a docker instance of solr.
+  elsif system('docker compose -v')
+    # We're not running `docker compose up' but still want to use a docker instance of solr.
     begin
       puts "Starting Solr"
-      system_with_error_handling "docker-compose up -d solr"
+      system_with_error_handling "docker compose up -d solr"
       yield
     ensure
       puts "Stopping Solr"
-      system_with_error_handling "docker-compose stop solr"
+      system_with_error_handling "docker compose stop solr"
     end
   else
     SolrWrapper.wrap do |solr|