diff --git a/Appraisals b/Appraisals index a5cb7356..075f1126 100644 --- a/Appraisals +++ b/Appraisals @@ -84,8 +84,7 @@ if min_ruby_version.call('3.2.0') && RUBY_ENGINE != 'jruby' gem 'rails', '~> 8.0.0' gem 'rspec-rails', '~> 8.0' gem 'psych', '>= 4' - gem 'sprockets-rails', '~> 3.5.2' - gem 'sqlite3', '~> 1', platform: :ruby + gem 'sqlite3', '>= 2.1', platform: :ruby end end diff --git a/config.gemspec b/config.gemspec index 91ecd58d..63b1bbd1 100644 --- a/config.gemspec +++ b/config.gemspec @@ -42,8 +42,11 @@ Gem::Specification.new do |s| gems_to_install = /gem "(.*?)", "(.*?)"(?!, platform: (?!\[:ruby\]))/ if Dir.exist?('gemfiles') - File.read(Dir['gemfiles/rails*.gemfile'].sort.last).scan(gems_to_install) do |name, version| - s.add_development_dependency name, version + rails_gemfiles = Dir['gemfiles/rails*.gemfile'].sort + unless rails_gemfiles.empty? + File.read(rails_gemfiles.last).scan(gems_to_install) do |name, version| + s.add_development_dependency name, version + end end end end diff --git a/spec/app/rails_8.0/config/initializers/assets.rb b/spec/app/rails_8.0/config/initializers/assets.rb index 48732442..a80efb15 100644 --- a/spec/app/rails_8.0/config/initializers/assets.rb +++ b/spec/app/rails_8.0/config/initializers/assets.rb @@ -1,7 +1,8 @@ # Be sure to restart your server when you modify this file. +# Rails 8.0 uses Propshaft instead of Sprockets # Version of your assets, change this if you want to expire all your assets. -Rails.application.config.assets.version = "1.0" +# Rails.application.config.assets.version = "1.0" # Add additional assets to the asset load path. # Rails.application.config.assets.paths << Emoji.images_path diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 9becdaa4..aff76763 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -43,7 +43,12 @@ # Configure RSpec.configure do |config| - config.fixture_path = FixtureHelper::FIXTURE_PATH + # Use fixture_paths (plural) for newer versions of RSpec + if config.respond_to?(:fixture_paths) + config.fixture_paths = [FixtureHelper::FIXTURE_PATH] + else + config.fixture_path = FixtureHelper::FIXTURE_PATH + end end when 'sinatra'