Upgrade to Blacklight 8.6.1 (#4546)

* Blacklight 8 - take (something) * Upgrade blacklight to 8.6.1 * Remove a concern that is unused in Blacklight 8 This way, coveralls does not complain about a dramatic drop in code coverage --------- Co-authored-by: Max Kadel <[email protected]> Co-authored-by: Max Kadel <[email protected]>
pulibrary · Nov 14, 2024 · 7725905 · 7725905
1 parent 30af8e7
commit 7725905
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 88 deletions.
diff --git a/Gemfile b/Gemfile
@@ -8,7 +8,7 @@ gem 'alma'
 gem 'babel-transpiler'
 gem 'bcrypt_pbkdf'
 # Blacklight
-gem 'blacklight', '~> 7.38.0'
+gem 'blacklight', '~> 8.6.1'
 gem 'blacklight_dynamic_sitemap'
 gem 'blacklight-hierarchy'
 gem 'blacklight-marc', '~>8.1'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -122,16 +122,15 @@ GEM
       parser (>= 2.4)
       smart_properties
     bigdecimal (3.1.8)
-    blacklight (7.38.0)
-      deprecation
+    blacklight (8.6.1)
       globalid
-      hashdiff
       i18n (>= 1.7.0)
       jbuilder (~> 2.7)
       kaminari (>= 0.15)
       ostruct (>= 0.3.2)
-      rails (>= 5.1, < 7.3)
-      view_component (>= 2.66, < 4)
+      rails (>= 6.1, < 8)
+      view_component (>= 2.74, < 4)
+      zeitwerk
     blacklight-hierarchy (6.4.0)
       blacklight (>= 7.18, < 9)
       deprecation
@@ -747,7 +746,7 @@ DEPENDENCIES
   axe-core-rspec
   babel-transpiler
   bcrypt_pbkdf
-  blacklight (~> 7.38.0)
+  blacklight (~> 8.6.1)
   blacklight-hierarchy
   blacklight-marc (~> 8.1)
   blacklight_dynamic_sitemap

diff --git a/app/components/blacklight/search_context/server_item_pagination_component.html.erb b/app/components/blacklight/search_context/server_item_pagination_component.html.erb
diff --git a/app/components/blacklight/search_context/server_item_pagination_component.rb b/app/components/blacklight/search_context/server_item_pagination_component.rb
diff --git a/app/models/concerns/blacklight/document/email.rb b/app/models/concerns/blacklight/document/email.rb
diff --git a/spec/components/index_document_component_spec.rb b/spec/components/index_document_component_spec.rb
@@ -5,7 +5,7 @@
 RSpec.describe IndexDocumentComponent, type: :component do
   let(:blacklight_config) do
     Blacklight::Configuration.new do |config|
-      config.track_search_session = false
+      config.track_search_session.storage = false
     end
   end
   before do
@@ -16,7 +16,7 @@
   end
   subject do
     document = SolrDocument.new(id: 'SCSB-1234')
-    presenter = Blacklight::DocumentPresenter.new(document, instance_double(ActionView::Base), blacklight_config)
+    presenter = Blacklight::DocumentPresenter.new(document, instance_double(ActionView::Base, action_name: 'show'), blacklight_config)
     allow(presenter).to receive(:fields).and_return([])
     allow(document).to receive(:export_as_openurl_ctx_kev).and_return 'ctx_ver=Z39.88-2004&amp;rft_val_fmt=info%3Aofi%2Ffmt%3Akev%3Amtx%3Ajournal&amp;rft.issn=1045-4438'
     render_inline(described_class.new(document:, presenter:))

diff --git a/spec/components/index_metadata_component_spec.rb b/spec/components/index_metadata_component_spec.rb
@@ -33,8 +33,8 @@ def call
     expect(render_inline(component).css('li').first.text.strip).to eq('Hello')
   end
   it 'renders multi-valued fields' do
-    expect(render_inline(component).search('./li/ul/li').length).to eq(2)
-    expect(render_inline(component).search('./li/ul/li').map(&:text).map(&:strip)).to eq(['Goodbye', 'Auf Wiedersehen'])
+    expect(render_inline(component).search('./li/ul/li/ul/li').length).to eq(2)
+    expect(render_inline(component).search('./li/ul/li/ul/li').map(&:text).map(&:strip)).to eq(['Goodbye', 'Auf Wiedersehen'])
   end
   context 'when the index field is configured to use a component' do
     let(:blacklight_config) do

diff --git a/spec/components/index_title_component_spec.rb b/spec/components/index_title_component_spec.rb
@@ -15,7 +15,7 @@
   end
   let(:blacklight_config) do
     Blacklight::Configuration.new do |config|
-      config.track_search_session = false
+      config.track_search_session.storage = false
       config.index.document_actions[:bookmark].partial = '/catalog/bookmark_control'
     end
   end