Support rails7

alpaca-tc · Jul 13, 2022 · ffc9a46 · ffc9a46
1 parent 6ae998e
commit ffc9a46
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/Gemfile b/Gemfile
@@ -2,7 +2,7 @@ source "https://rubygems.org"
 
 gemspec
 
-gem "rails", ">= 5.2.0", "< 6.1"
+gem "rails", ">= 5.2.0", "< 7.1"
 
 group :test do
   gem "aruba", "~> 1.0"

diff --git a/spec/rails_spec.rb b/spec/rails_spec.rb
@@ -1,11 +1,18 @@
 describe Figaro::Rails do
   before do
+    spec = Bundler.locked_gems.specs.find { |spec| spec.name == 'rails' }
+    skip_asset_pipeline_option = if spec.version >= '7.0.0'
+                                   '--skip_asset_pipeline'
+                                 else
+                                   '--skip-sprockets'
+                                 end
+
     run_command_and_stop(<<-CMD)
       rails new example \
         --skip-gemfile \
         --skip-git \
         --skip-keeps \
-        --skip-sprockets \
+        #{skip_asset_pipeline_option} \
         --skip-spring \
         --skip-listen \
         --skip-javascript \