Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions Appraisals
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
7 changes: 5 additions & 2 deletions config.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion spec/app/rails_8.0/config/initializers/assets.rb
Original file line number Diff line number Diff line change
@@ -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
7 changes: 6 additions & 1 deletion spec/spec_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down