From 26523bfdbd2002094c09108f506a2fec539b1633 Mon Sep 17 00:00:00 2001
From: Jessie Keck <jessie.keck@gmail.com>
Date: Fri, 13 Dec 2019 10:10:35 -0800
Subject: [PATCH] Update the build to work w/ rails 5 & 6.

---
 Gemfile                                                   | 5 +++++
 blacklight-hierarchy.gemspec                              | 2 +-
 .../lib/generators/test_app_generator.rb                  | 8 ++++++++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index 5022490..60f70fb 100644
--- a/Gemfile
+++ b/Gemfile
@@ -31,6 +31,11 @@ else
       gem 'rails', ENV['RAILS_VERSION']
     end
   end
+
+  case ENV['RAILS_VERSION']
+  when /^5.[12]/, /^6.0/
+    gem 'sass-rails', '~> 5.0'
+  end
 end
 # END ENGINE_CART BLOCK
 eval_gemfile File.expand_path("spec/test_app_templates/Gemfile.extra", File.dirname(__FILE__))
diff --git a/blacklight-hierarchy.gemspec b/blacklight-hierarchy.gemspec
index 3f42199..fb32598 100644
--- a/blacklight-hierarchy.gemspec
+++ b/blacklight-hierarchy.gemspec
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
 
   # Most likely available for even earlier versions of Blacklight, but this is what I validated
   s.add_dependency 'blacklight', '> 6.20', '< 8.0'
-  s.add_dependency 'rails', '>= 4.1', '< 6'
+  s.add_dependency 'rails', '>= 5.1', '< 7'
   s.add_dependency 'jquery-rails'
 
   s.add_development_dependency 'rsolr'
diff --git a/spec/test_app_templates/lib/generators/test_app_generator.rb b/spec/test_app_templates/lib/generators/test_app_generator.rb
index 09292f9..4523b6c 100644
--- a/spec/test_app_templates/lib/generators/test_app_generator.rb
+++ b/spec/test_app_templates/lib/generators/test_app_generator.rb
@@ -17,4 +17,12 @@ def run_blacklight_generator
   def run_hierarchy_install
     generate 'blacklight_hierarchy:install'
   end
+
+  def create_images_directory
+    run 'mkdir app/assets/images'
+  end
+
+  def add_js_reference
+    inject_into_file 'app/assets/config/manifest.js', "\n//= link application.js", after: '//= link_directory ../stylesheets .css'
+  end
 end