From e6895ec1e37fef8b14d8d342fdc15e90cd640e49 Mon Sep 17 00:00:00 2001
From: Jane Sandberg <sandbergja@users.noreply.github.com>
Date: Wed, 19 Apr 2023 17:33:09 -0400
Subject: [PATCH] Use updated capybara filter_block syntax (#3044)

* Use updated capybara filter_block syntax

https://github.com/teamcapybara/capybara/issues/2617 changed
how blocks are evaluated.  Thanks to @maxkadel for finding
this change!

* rubocop -a

* ViewComponent 3 compatibility: don't call i18n methods in a component initializer

This is due to this upstream PR: https://github.com/ViewComponent/view_component/pull/1666
---
 .../response/pagination_component.html.erb         |  2 +-
 .../blacklight/response/pagination_component.rb    |  6 +++++-
 lib/railties/blacklight.rake                       |  8 ++++----
 spec/presenters/blacklight/show_presenter_spec.rb  | 14 ++++----------
 4 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/app/components/blacklight/response/pagination_component.html.erb b/app/components/blacklight/response/pagination_component.html.erb
index 269962c5fb..9892de29b5 100644
--- a/app/components/blacklight/response/pagination_component.html.erb
+++ b/app/components/blacklight/response/pagination_component.html.erb
@@ -1,3 +1,3 @@
-<%= content_tag :section, class: 'pagination',  **@html_attr do %>
+<%= content_tag :section, class: 'pagination',  **html_attr do %>
   <%= pagination %>
 <% end %>
diff --git a/app/components/blacklight/response/pagination_component.rb b/app/components/blacklight/response/pagination_component.rb
index f0038fad36..c95f7914ab 100644
--- a/app/components/blacklight/response/pagination_component.rb
+++ b/app/components/blacklight/response/pagination_component.rb
@@ -8,10 +8,14 @@ class PaginationComponent < Blacklight::Component
       # @param [Hash] html html options for the pagination container
       def initialize(response:, html: {}, **pagination_args)
         @response = response
-        @html_attr = { aria: { label: t('views.pagination.aria.container_label') } }.merge(html)
+        @html = html
         @pagination_args = pagination_args
       end
 
+      def html_attr
+        { aria: { label: t('views.pagination.aria.container_label') } }.merge(@html)
+      end
+
       def pagination
         helpers.paginate @response, **Blacklight::Engine.config.blacklight.default_pagination_options, **@pagination_args
       end
diff --git a/lib/railties/blacklight.rake b/lib/railties/blacklight.rake
index 0cc5927138..958ac22023 100644
--- a/lib/railties/blacklight.rake
+++ b/lib/railties/blacklight.rake
@@ -41,7 +41,7 @@ namespace :blacklight do
         exit 1
       end
     rescue => e
-      puts e.to_s
+      puts e
       exit 1
     end
 
@@ -71,7 +71,7 @@ namespace :blacklight do
         end
       rescue => e
         errors += 1
-        puts e.to_s
+        puts e
       end
 
       print " - search_results: "
@@ -93,7 +93,7 @@ namespace :blacklight do
         end
       rescue => e
         errors += 1
-        puts e.to_s
+        puts e
       end
 
       print " - fetch: "
@@ -113,7 +113,7 @@ namespace :blacklight do
         end
       rescue => e
         errors += 1
-        puts e.to_s
+        puts e
       end
 
       exit 1 if errors > 0
diff --git a/spec/presenters/blacklight/show_presenter_spec.rb b/spec/presenters/blacklight/show_presenter_spec.rb
index 0339a03181..31cd77c601 100644
--- a/spec/presenters/blacklight/show_presenter_spec.rb
+++ b/spec/presenters/blacklight/show_presenter_spec.rb
@@ -52,10 +52,6 @@ def export_as_weird_dup
 
       MockDocument.use_extension(MockExtension)
 
-      def mock_document_app_helper_url *args
-        solr_document_url(*args)
-      end
-
       allow(request_context).to receive(:polymorphic_url) do |_, opts|
         "url.#{opts[:format]}"
       end
@@ -70,12 +66,10 @@ def mock_document_app_helper_url *args
         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}']") do |matches|
-            expect(matches).to have(1).match
-            tag = matches[0]
-            expect(tag.attributes["rel"].value).to eq "alternate"
-            expect(tag.attributes["title"].value).to eq format.to_s
-            expect(tag.attributes["href"].value).to eq mock_document_app_helper_url(document, format: format)
+          expect(subject).to have_selector("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}"
           end
         end
         Capybara.ignore_hidden_elements = tmp_value