[backport] Test on Rails 8

.github/workflows/ruby.yml

@@ -18,6 +18,11 @@ jobs:
         additional_engine_cart_rails_options: [""]
         additional_name: [""]
         include:
+          - rails_version: "~> 8.0"
+            ruby: "3.3"
+            blacklight_version: "~> 8.0"
+            bootstrap_version: "~> 5.0"
+            additional_name: Rails 8
           - rails_version: "~> 7.2"
             ruby: "3.3"
             blacklight_version: "~> 7.34"
@@ -33,7 +38,7 @@ jobs:
             blacklight_version: "~> 8.0"
             bootstrap_version: ~> 4.0
             additional_name: Blacklight 8
-            additional_engine_cart_rails_options: "-j rollup -a sprockets"
+            additional_engine_cart_rails_options: "-j rollup --css bootstrap"
     env:
       RAILS_VERSION: ${{ matrix.rails_version }}
       BLACKLIGHT_VERSION: ${{ matrix.blacklight_version }}

app/controllers/spotlight/catalog_controller.rb

@@ -194,7 +194,7 @@ def start_new_search_session?
     def solr_document_params
       params.require(:solr_document).permit(:exhibit_tag_list,
                                             uploaded_resource: [:url],
-                                            sidecar: [:public, { data: [editable_solr_document_params] }])
+                                            sidecar: [:public, { data: editable_solr_document_params }])
     end
 
     def editable_solr_document_params

blacklight-spotlight.gemspec

@@ -47,8 +47,8 @@ these collections.)
   s.add_dependency 'oauth2'
   s.add_dependency 'openseadragon'
   s.add_dependency 'ostruct', '!= 0.3.0', '!= 0.3.1', '!= 0.3.2'
-  s.add_dependency 'paper_trail', '>= 11.0', '< 16'
-  s.add_dependency 'rails', '>= 7.0', '< 8'
+  s.add_dependency 'paper_trail', '>= 11.0', '< 17'
+  s.add_dependency 'rails', '>= 7.1', '< 9'
   s.add_dependency 'redcarpet', '>= 2.0.1', '< 4'
   s.add_dependency 'riiif', '~> 2.0'
   s.add_dependency 'roar', '~> 1.1'

config/routes.rb

@@ -42,7 +42,7 @@
 
     concern :searchable, Blacklight::Routes::Searchable.new
 
-    resource :catalog, only: [:index], as: 'catalog', path: '/catalog', controller: 'catalog' do
+    resource :catalog, only: [], as: 'catalog', path: '/catalog', controller: 'catalog' do
       concerns :searchable
 
       collection do
@@ -124,7 +124,7 @@
 
     resources :contacts, only: %i[edit update destroy]
 
-    resources :pages, only: [:update_all] do
+    resources :pages do
       collection do
         patch :update_all
       end

spec/controllers/spotlight/catalog_controller_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-describe Spotlight::CatalogController, type: :controller do
+RSpec.describe Spotlight::CatalogController, type: :controller do
   include ActiveJob::TestHelper
   routes { Spotlight::Engine.routes }
   let(:exhibit) { FactoryBot.create(:exhibit) }

spec/features/javascript/blocks/solr_documents_block_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-describe 'Solr Document Block', default_max_wait_time: 15, feature: true, versioning: true do
+RSpec.describe 'Solr Document Block', default_max_wait_time: 30, feature: true, versioning: true do
   let(:exhibit) { FactoryBot.create(:exhibit) }
   let(:exhibit_curator) { FactoryBot.create(:exhibit_curator, exhibit:) }
   let(:feature_page) do
@@ -52,7 +52,7 @@
     expect(page).to have_selector '.items-block .box', count: 2, visible: true
   end
 
-  it 'allows you to choose from a multi-image solr document (and persist through edits)', default_max_wait_time: 30, js: true do
+  it 'allows you to choose from a multi-image solr document (and persist through edits)', js: true do
     fill_in_solr_document_block_typeahead_field with: 'xd327cm9378'
 
     expect(page).to have_css('[data-panel-image-pagination]', text: /Image 1 of 2/, visible: true)