Merge pull request #4400 from sul-dlss/update-dependencies

Update dependencies
sul-dlss · Aug 30, 2024 · fdfc7b7 · fdfc7b7
2 parents 934089a + 69b0fa4
commit fdfc7b7
Show file tree

Hide file tree

Showing 9 changed files with 84 additions and 81 deletions.
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -303,7 +303,7 @@ Style/SwapValues: # new in 1.1
 Style/YAMLFileRead: # new in 1.53
   Enabled: true
 Rails/ActionControllerFlashBeforeRender: # new in 2.16
-  Enabled: true
+  Enabled: false
 Rails/ActionControllerTestCase: # new in 2.14
   Enabled: true
 Rails/ActionOrder: # new in 2.17

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -8,29 +8,29 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (7.2.0)
-      actionpack (= 7.2.0)
-      activesupport (= 7.2.0)
+    actioncable (7.2.1)
+      actionpack (= 7.2.1)
+      activesupport (= 7.2.1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
       zeitwerk (~> 2.6)
-    actionmailbox (7.2.0)
-      actionpack (= 7.2.0)
-      activejob (= 7.2.0)
-      activerecord (= 7.2.0)
-      activestorage (= 7.2.0)
-      activesupport (= 7.2.0)
+    actionmailbox (7.2.1)
+      actionpack (= 7.2.1)
+      activejob (= 7.2.1)
+      activerecord (= 7.2.1)
+      activestorage (= 7.2.1)
+      activesupport (= 7.2.1)
       mail (>= 2.8.0)
-    actionmailer (7.2.0)
-      actionpack (= 7.2.0)
-      actionview (= 7.2.0)
-      activejob (= 7.2.0)
-      activesupport (= 7.2.0)
+    actionmailer (7.2.1)
+      actionpack (= 7.2.1)
+      actionview (= 7.2.1)
+      activejob (= 7.2.1)
+      activesupport (= 7.2.1)
       mail (>= 2.8.0)
       rails-dom-testing (~> 2.2)
-    actionpack (7.2.0)
-      actionview (= 7.2.0)
-      activesupport (= 7.2.0)
+    actionpack (7.2.1)
+      actionview (= 7.2.1)
+      activesupport (= 7.2.1)
       nokogiri (>= 1.8.5)
       racc
       rack (>= 2.2.4, < 3.2)
@@ -39,35 +39,35 @@ GEM
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
       useragent (~> 0.16)
-    actiontext (7.2.0)
-      actionpack (= 7.2.0)
-      activerecord (= 7.2.0)
-      activestorage (= 7.2.0)
-      activesupport (= 7.2.0)
+    actiontext (7.2.1)
+      actionpack (= 7.2.1)
+      activerecord (= 7.2.1)
+      activestorage (= 7.2.1)
+      activesupport (= 7.2.1)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.2.0)
-      activesupport (= 7.2.0)
+    actionview (7.2.1)
+      activesupport (= 7.2.1)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    activejob (7.2.0)
-      activesupport (= 7.2.0)
+    activejob (7.2.1)
+      activesupport (= 7.2.1)
       globalid (>= 0.3.6)
-    activemodel (7.2.0)
-      activesupport (= 7.2.0)
-    activerecord (7.2.0)
-      activemodel (= 7.2.0)
-      activesupport (= 7.2.0)
+    activemodel (7.2.1)
+      activesupport (= 7.2.1)
+    activerecord (7.2.1)
+      activemodel (= 7.2.1)
+      activesupport (= 7.2.1)
       timeout (>= 0.4.0)
-    activestorage (7.2.0)
-      actionpack (= 7.2.0)
-      activejob (= 7.2.0)
-      activerecord (= 7.2.0)
-      activesupport (= 7.2.0)
+    activestorage (7.2.1)
+      actionpack (= 7.2.1)
+      activejob (= 7.2.1)
+      activerecord (= 7.2.1)
+      activesupport (= 7.2.1)
       marcel (~> 1.0)
-    activesupport (7.2.0)
+    activesupport (7.2.1)
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.3.1)
@@ -130,12 +130,11 @@ GEM
       view_component (>= 2.54, < 4)
     bootsnap (1.18.4)
       msgpack (~> 1.2)
-    bootstrap (4.6.2)
+    bootstrap (4.6.2.1)
       autoprefixer-rails (>= 9.1.0)
       popper_js (>= 1.16.1, < 2)
-      sassc-rails (>= 2.0.0)
     builder (3.3.0)
-    bundler-audit (0.9.1)
+    bundler-audit (0.9.2)
       bundler (>= 1.2.0, < 3)
       thor (~> 1.0)
     capistrano (3.19.1)
@@ -190,7 +189,7 @@ GEM
       namae (~> 1.0)
     csl-styles (1.0.1.11)
       csl (~> 1.0)
-    css_parser (1.17.1)
+    css_parser (1.19.0)
       addressable
     date (3.3.4)
     debug (1.9.2)
@@ -364,7 +363,7 @@ GEM
     matrix (0.4.2)
     method_source (1.1.0)
     mini_mime (1.1.5)
-    minitar (1.0.1)
+    minitar (1.0.2)
     minitest (5.25.1)
     mods (3.0.4)
       edtf (~> 3.0)
@@ -385,7 +384,7 @@ GEM
       racc (~> 1.7)
     net-http-persistent (4.0.2)
       connection_pool (~> 2.2)
-    net-imap (0.4.14)
+    net-imap (0.4.15)
       date
       net-protocol
     net-pop (0.1.2)
@@ -399,7 +398,7 @@ GEM
     net-smtp (0.5.0)
       net-protocol
     net-ssh (7.2.3)
-    newrelic_rpm (9.12.0)
+    newrelic_rpm (9.13.0)
     nio4r (2.7.3)
     nokogiri (1.16.7-aarch64-linux)
       racc (~> 1.4)
@@ -452,20 +451,20 @@ GEM
     rackup (2.1.0)
       rack (>= 3)
       webrick (~> 1.8)
-    rails (7.2.0)
-      actioncable (= 7.2.0)
-      actionmailbox (= 7.2.0)
-      actionmailer (= 7.2.0)
-      actionpack (= 7.2.0)
-      actiontext (= 7.2.0)
-      actionview (= 7.2.0)
-      activejob (= 7.2.0)
-      activemodel (= 7.2.0)
-      activerecord (= 7.2.0)
-      activestorage (= 7.2.0)
-      activesupport (= 7.2.0)
+    rails (7.2.1)
+      actioncable (= 7.2.1)
+      actionmailbox (= 7.2.1)
+      actionmailer (= 7.2.1)
+      actionpack (= 7.2.1)
+      actiontext (= 7.2.1)
+      actionview (= 7.2.1)
+      activejob (= 7.2.1)
+      activemodel (= 7.2.1)
+      activerecord (= 7.2.1)
+      activestorage (= 7.2.1)
+      activesupport (= 7.2.1)
       bundler (>= 1.15.0)
-      railties (= 7.2.0)
+      railties (= 7.2.1)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
       actionview (>= 5.0.1.rc1)
@@ -481,9 +480,9 @@ GEM
       actionview (> 3.1)
       activesupport (> 3.1)
       railties (> 3.1)
-    railties (7.2.0)
-      actionpack (= 7.2.0)
-      activesupport (= 7.2.0)
+    railties (7.2.1)
+      actionpack (= 7.2.1)
+      activesupport (= 7.2.1)
       irb (~> 1.13)
       rackup (>= 1.0.0)
       rake (>= 12.2)
@@ -493,7 +492,7 @@ GEM
     rake (13.2.1)
     rdoc (6.7.0)
       psych (>= 4.0.0)
-    redis (5.2.0)
+    redis (5.3.0)
       redis-client (>= 0.22.0)
     redis-client (0.22.2)
       connection_pool
@@ -504,7 +503,7 @@ GEM
       actionpack (>= 5.2)
       railties (>= 5.2)
     retriable (3.1.2)
-    rexml (3.3.5)
+    rexml (3.3.6)
       strscan
     rinku (2.0.6)
     roadie (5.2.1)
@@ -518,7 +517,7 @@ GEM
       faraday (>= 0.9, < 3, != 2.0.0)
     rspec-core (3.13.0)
       rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.1)
+    rspec-expectations (3.13.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-mocks (3.13.1)
@@ -551,10 +550,10 @@ GEM
     rubocop-performance (1.21.1)
       rubocop (>= 1.48.1, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-rails (2.25.1)
+    rubocop-rails (2.26.0)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
-      rubocop (>= 1.33.0, < 2.0)
+      rubocop (>= 1.52.0, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
     rubocop-rspec (3.0.4)
       rubocop (~> 1.61)
@@ -575,7 +574,7 @@ GEM
       tilt
     scrub_rb (1.0.1)
     securerandom (0.3.1)
-    selenium-webdriver (4.23.0)
+    selenium-webdriver (4.24.0)
       base64 (~> 0.2)
       logger (~> 1.4)
       rexml (~> 3.2, >= 3.2.5)
@@ -625,7 +624,7 @@ GEM
       railties (>= 6.0.0)
     stringio (3.1.1)
     strscan (3.1.0)
-    thor (1.3.1)
+    thor (1.3.2)
     tilt (2.4.0)
     timeout (0.4.1)
     traject (3.8.2)
@@ -649,7 +648,7 @@ GEM
     unicode-display_width (2.5.0)
     useragent (0.16.10)
     version_gem (1.1.4)
-    view_component (3.13.0)
+    view_component (3.14.0)
       activesupport (>= 5.2.0, < 8.0)
       concurrent-ruby (~> 1.0)
       method_source (~> 1.0)

diff --git a/app/components/access_panels/at_the_library_component.rb b/app/components/access_panels/at_the_library_component.rb
@@ -4,7 +4,7 @@ module AccessPanels
   class AtTheLibraryComponent < AccessPanels::Base
     # @return [Array<Holdings::Library>] the list of libraries with holdings for the item
     def libraries
-      @document.holdings.libraries.select(&:present?)
+      @document.holdings.libraries.compact_blank
     end
 
     def render?

diff --git a/app/models/concerns/eds_links.rb b/app/models/concerns/eds_links.rb
@@ -10,7 +10,7 @@ def eds_links
   def eds_fulltext_links
     fetch('eds_fulltext_links', []).map do |link_field|
       EdsLinks::FulltextLink.new(link_field)
-    end.select(&:present?)
+    end.compact_blank
   end
 
   def eds_fulltext_links_as_searchworks_links
@@ -37,6 +37,10 @@ def present?
       %w[customlink-fulltext pdf ebook-pdf ebook-epub].include?(type) && label.present?
     end
 
+    def blank?
+      !present?
+    end
+
     def pdf?
       category == 2
     end

diff --git a/app/models/sfx_data.rb b/app/models/sfx_data.rb
@@ -91,15 +91,15 @@ def url
     end
 
     def coverage
-      target_xml.xpath('.//coverage_statement').map(&:text).select(&:present?)
+      target_xml.xpath('.//coverage_statement').map(&:text).compact_blank
     end
 
     def embargo
-      target_xml.xpath('.//embargo_statement').map(&:text).select(&:present?)
+      target_xml.xpath('.//embargo_statement').map(&:text).compact_blank
     end
 
     def note
-      target_xml.xpath('./note').map(&:text).select(&:present?)
+      target_xml.xpath('./note').map(&:text).compact_blank
     end
 
     private

diff --git a/lib/holdings.rb b/lib/holdings.rb
@@ -11,7 +11,7 @@ def initialize(items = [], mhld = [])
   end
 
   def present?
-    libraries.select(&:present?).any? do |library|
+    libraries.compact_blank.any? do |library|
       library.locations.any?(&:present?)
     end
   end

diff --git a/spec/features/backend_lookup_spec.rb b/spec/features/backend_lookup_spec.rb
@@ -21,14 +21,14 @@
 
   scenario 'lookup should return additional results on the results page' do
     visit search_catalog_path(
-      q: 'statement',
+      q: 'Lorem aute dolor',
       f: { access_facet: ['Online'] },
       search_field: 'search'
     )
 
     within '.zero-results' do
-      expect(page).to have_css('a', text: /All fields > statement/)
-      expect(page).to have_css('span', text: /finds 1 results/)
+      expect(page).to have_css('a', text: /All fields > Lorem aute dolor/)
+      expect(page).to have_css('span', text: /finds 2 results/)
     end
   end
 end
diff --git a/spec/features/home_page_spec.rb b/spec/features/home_page_spec.rb
@@ -36,10 +36,10 @@
     end
   end
 
-  scenario "should have the library facet hidden by default", :js do
+  scenario "should have the library facet hidden by default" do
     within(".blacklight-building_facet") do
       expect(page).to have_button 'Library'
-      expect(page).to have_no_css('li a', visible: true)
+      expect(page).to have_css('#facet-building_facet.collapse:not(.show)', visible: false)
     end
   end
 

diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
@@ -56,7 +56,7 @@
 # directory. Alternatively, in the individual `*_spec.rb` files, manually
 # require only the support files necessary.
 #
-Dir[Rails.root.join('spec/support/**/*.rb')].each { |f| require f }
+Rails.root.glob('spec/support/**/*.rb').each { |f| require f }
 
 # Checks for pending migrations and applies them before tests are run.
 # If you are not using ActiveRecord, you can remove these lines.