From 566ce2e2650f470f0ef93480f5d571e8fa1dbc50 Mon Sep 17 00:00:00 2001
From: Justin Coyne <jcoyne@justincoyne.com>
Date: Thu, 18 Jul 2024 10:22:16 -0500
Subject: [PATCH] Stop supporting Rails 6

---
 .github/workflows/ruby.yml                                  | 2 --
 .rubocop.yml                                                | 2 +-
 blacklight.gemspec                                          | 2 +-
 lib/generators/blacklight/assets/importmap_generator.rb     | 2 +-
 lib/generators/blacklight/assets/sprockets_generator.rb     | 4 +---
 .../components/blacklight/document/action_component_spec.rb | 6 +-----
 6 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml
index d56e87368..3f54dc7ff 100644
--- a/.github/workflows/ruby.yml
+++ b/.github/workflows/ruby.yml
@@ -43,8 +43,6 @@ jobs:
         additional_engine_cart_rails_options: [""]
         additional_name: [""]
         include:
-          - ruby: "3.2"
-            rails_version: "6.1.7.8"
           - ruby: "3.2"
             rails_version: "7.0.8.4"
           - ruby: "3.2"
diff --git a/.rubocop.yml b/.rubocop.yml
index 8ffedb887..61a24c546 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -11,7 +11,7 @@ inherit_from:
 AllCops:
   DisplayCopNames: true
   TargetRubyVersion: 3.0
-  TargetRailsVersion: 6.1
+  TargetRailsVersion: 7.0
   Exclude:
     - "lib/generators/blacklight/templates/**/*"
     - "blacklight.gemspec"
diff --git a/blacklight.gemspec b/blacklight.gemspec
index b616e680c..1dada3887 100644
--- a/blacklight.gemspec
+++ b/blacklight.gemspec
@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>= 2.7'
 
-  s.add_dependency "rails", '>= 6.1', '< 8'
+  s.add_dependency "rails", '>= 7.0', '< 8'
   s.add_dependency "globalid"
   s.add_dependency "jbuilder", '~> 2.7'
   s.add_dependency "kaminari", ">= 0.15" # the pagination (page 1,2,3, etc..) of our search results
diff --git a/lib/generators/blacklight/assets/importmap_generator.rb b/lib/generators/blacklight/assets/importmap_generator.rb
index 3fe4b9c35..159d3e4c8 100644
--- a/lib/generators/blacklight/assets/importmap_generator.rb
+++ b/lib/generators/blacklight/assets/importmap_generator.rb
@@ -38,7 +38,7 @@ def append_blacklight_javascript
       end
 
       def add_stylesheet
-        gem "sassc-rails", "~> 2.1" if Rails.version > '7'
+        gem "sassc-rails", "~> 2.1"
 
         create_file 'app/assets/stylesheets/blacklight.scss' do
           <<~CONTENT
diff --git a/lib/generators/blacklight/assets/sprockets_generator.rb b/lib/generators/blacklight/assets/sprockets_generator.rb
index fa3093971..fdb203255 100644
--- a/lib/generators/blacklight/assets/sprockets_generator.rb
+++ b/lib/generators/blacklight/assets/sprockets_generator.rb
@@ -15,8 +15,6 @@ def add_javascript_dependencies
       # Remove the empty generated app/assets/images directory. Without doing this,
       # the default Sprockets 4 manifest will raise an exception.
       def appease_sprockets4
-        return if Rails.version > '7' || Sprockets::VERSION < '4'
-
         append_to_file 'app/assets/config/manifest.js', "\n//= link application.js"
         append_to_file 'app/assets/config/manifest.js', "\n//= link blacklight/manifest.js"
         empty_directory 'app/assets/images'
@@ -30,7 +28,7 @@ def assets
           CONTENT
         end
 
-        gem "sassc-rails", "~> 2.1" if Rails.version > '7'
+        gem "sassc-rails", "~> 2.1"
 
         # Ensure this method is idempotent
         return if has_blacklight_assets?
diff --git a/spec/components/blacklight/document/action_component_spec.rb b/spec/components/blacklight/document/action_component_spec.rb
index 0873347aa..32ce8575c 100644
--- a/spec/components/blacklight/document/action_component_spec.rb
+++ b/spec/components/blacklight/document/action_component_spec.rb
@@ -23,11 +23,7 @@
   end
 
   it 'renders an action link' do
-    if Rails.version >= '6'
-      allow(view_context).to receive(:some_tool_solr_document_path).with(document, { only_path: true }).and_return('/asdf')
-    else
-      allow(view_context).to receive(:some_tool_solr_document_path).with(document).and_return('/asdf')
-    end
+    allow(view_context).to receive(:some_tool_solr_document_path).with(document, { only_path: true }).and_return('/asdf')
 
     expect(rendered).to have_link 'Some tool', href: '/asdf'
   end