Update CI versions (#2791)

Author: cbeer

.github/workflows/ruby.yml

@@ -10,8 +10,8 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        rails_version: [6.1.3.2]
-        ruby: [2.7, 3.0]
+        rails_version: [6.1.4.4]
+        ruby: [2.7, '3.0']
     env:
       RAILS_VERSION: ${{ matrix.rails_version }}
     steps:

app/controllers/concerns/spotlight/controller.rb

@@ -67,38 +67,39 @@ def blacklight_config
       end
     end
 
-    def search_action_url(*args)
+    def search_action_url(*args, **kwargs)
       if current_exhibit
-        exhibit_search_action_url(*args)
+        exhibit_search_action_url(*args, **kwargs)
       else
-        main_app.search_catalog_url(*args)
+        main_app.search_catalog_url(*args, **kwargs)
       end
     end
 
-    def search_facet_path(*args)
+    def search_facet_path(*args, **kwargs)
       if current_exhibit
-        exhibit_search_facet_path(*args)
+        exhibit_search_facet_path(*args, **kwargs)
       else
-        main_app.catalog_facet_url(*args)
+        main_app.catalog_facet_url(*args, **kwargs)
       end
     end
 
-    def exhibit_search_action_url(*args)
+    def exhibit_search_action_url(*args, **kwargs)
       options = args.extract_options!
+      options = options.merge(kwargs)
       only_path = options[:only_path]
       options.except! :exhibit_id, :only_path
 
       if only_path
-        spotlight.search_exhibit_catalog_path(current_exhibit, *args, options)
+        spotlight.search_exhibit_catalog_path(current_exhibit, *args, **options)
       else
-        spotlight.search_exhibit_catalog_url(current_exhibit, *args, options)
+        spotlight.search_exhibit_catalog_url(current_exhibit, *args, **options)
       end
     end
 
-    def exhibit_search_facet_path(*args)
+    def exhibit_search_facet_path(*args, **kwargs)
       options = args.extract_options!
-      options = Blacklight::Parameters.sanitize(params.to_unsafe_h.with_indifferent_access).merge(options).except(:exhibit_id, :only_path)
-      spotlight.facet_exhibit_catalog_url(current_exhibit, *args, options)
+      options = Blacklight::Parameters.sanitize(params.to_unsafe_h.with_indifferent_access).merge(options).merge(kwargs).except(:exhibit_id, :only_path)
+      spotlight.facet_exhibit_catalog_url(current_exhibit, *args, **options&.symbolize_keys)
     end
   end
 end

spec/helpers/spotlight/pages_helper_spec.rb

@@ -46,7 +46,7 @@
     let(:search_result) { [double('response'), double('documents')] }
 
     it 'returns the results for a given search browse category' do
-      expect(helper).to receive(:search_results).with('q' => 'query').and_return(search_result)
+      expect(helper).to receive(:search_results).with({ 'q' => 'query' }).and_return(search_result)
       expect(helper.get_search_widget_search_results(good)).to eq search_result
     end
 

spec/models/solr_document_spec.rb

@@ -74,7 +74,7 @@
     it 'stores sidecar data on the sidecar object' do
       mock_sidecar = double
       allow(subject).to receive_messages(sidecar: mock_sidecar)
-      expect(mock_sidecar).to receive(:update).with(data: { 'a' => 1 })
+      expect(mock_sidecar).to receive(:update).with({ data: { 'a' => 1 } })
       subject.update exhibit, sidecar: { data: { 'a' => 1 } }
     end
 
@@ -86,14 +86,14 @@
     it 'converts empty strings to nil' do
       mock_sidecar = double
       allow(subject).to receive_messages(sidecar: mock_sidecar)
-      expect(mock_sidecar).to receive(:update).with(data: { 'a' => nil })
+      expect(mock_sidecar).to receive(:update).with({ data: { 'a' => nil } })
       subject.update exhibit, sidecar: { data: { 'a' => '' } }
     end
 
     it 'compacts arrays of empty or nil values' do
       mock_sidecar = double
       allow(subject).to receive_messages(sidecar: mock_sidecar)
-      expect(mock_sidecar).to receive(:update).with(data: { 'a' => ['a'] })
+      expect(mock_sidecar).to receive(:update).with({ data: { 'a' => ['a'] } })
       subject.update exhibit, sidecar: { data: { 'a' => ['', nil, 'a'] } }
     end
   end