Skip to content

Commit

Permalink
Test against rails 8.0 (#3702)
Browse files Browse the repository at this point in the history
* test against rails 8.0

* allow rails 8

* Require more recent version of sqlite for rails 8

* Upgrade required sqlite version to 2.2, fix json spec

* Make sure the dummy uses sqlite3 2.2 as well

* Only upgrade sqlite3 for rails 8

* Don't use the newer version of sqlite in the dummy app
  • Loading branch information
jewilmeer authored Nov 23, 2024
1 parent b09f770 commit 5412857
Show file tree
Hide file tree
Showing 14 changed files with 83 additions and 12 deletions.
5 changes: 5 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,11 @@ jobs:
orm: active_record
adapter: sqlite3
asset: sprockets
- ruby: "3.3"
gemfile: gemfiles/rails_8.0.gemfile
orm: active_record
adapter: sqlite3
asset: sprockets
- ruby: "3.2"
gemfile: gemfiles/composite_primary_keys.gemfile
orm: active_record
Expand Down
11 changes: 11 additions & 0 deletions Appraisals
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,17 @@ appraise 'rails-7.2' do
gem 'importmap-rails', require: false
end

appraise 'rails-8.0' do
gem 'rails', '~> 8.0.0'
gem 'importmap-rails', require: false

group :active_record do
platforms :ruby, :mswin, :mingw, :x64_mingw do
gem 'sqlite3', '~> 2.2'
end
end
end

appraise 'composite_primary_keys' do
gem 'rails', '~> 7.0.0'

Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ group :active_record do
platforms :ruby, :mswin, :mingw, :x64_mingw do
gem 'mysql2', '>= 0.3.14'
gem 'pg', '>= 1.0.0'
gem 'sqlite3', '~> 1.3'
gem 'sqlite3', '>= 1.3.0'
end
end

Expand Down
2 changes: 1 addition & 1 deletion gemfiles/composite_primary_keys.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ group :active_record do
platforms :ruby, :mswin, :mingw, :x64_mingw do
gem "mysql2", ">= 0.3.14"
gem "pg", ">= 1.0.0"
gem "sqlite3", "~> 1.3"
gem "sqlite3", ">= 1.3.0"
end
end

Expand Down
2 changes: 1 addition & 1 deletion gemfiles/rails_6.0.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ group :active_record do
platforms :ruby, :mswin, :mingw, :x64_mingw do
gem "mysql2", ">= 0.3.14"
gem "pg", ">= 1.0.0"
gem "sqlite3", "~> 1.3"
gem "sqlite3", ">= 1.3.0"
end

platforms :jruby do
Expand Down
2 changes: 1 addition & 1 deletion gemfiles/rails_6.1.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ group :active_record do
platforms :ruby, :mswin, :mingw, :x64_mingw do
gem "mysql2", ">= 0.3.14"
gem "pg", ">= 1.0.0"
gem "sqlite3", "~> 1.3"
gem "sqlite3", ">= 1.3.0"
end

platforms :jruby do
Expand Down
2 changes: 1 addition & 1 deletion gemfiles/rails_7.0.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ group :active_record do
platforms :ruby, :mswin, :mingw, :x64_mingw do
gem "mysql2", ">= 0.3.14"
gem "pg", ">= 1.0.0"
gem "sqlite3", "~> 1.3"
gem "sqlite3", ">= 1.3.0"
end

platforms :jruby do
Expand Down
2 changes: 1 addition & 1 deletion gemfiles/rails_7.1.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ group :active_record do
platforms :ruby, :mswin, :mingw, :x64_mingw do
gem "mysql2", ">= 0.3.14"
gem "pg", ">= 1.0.0"
gem "sqlite3", "~> 1.3"
gem "sqlite3", ">= 1.3.0"
end
end

Expand Down
2 changes: 1 addition & 1 deletion gemfiles/rails_7.2.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ group :active_record do
platforms :ruby, :mswin, :mingw, :x64_mingw do
gem "mysql2", ">= 0.3.14"
gem "pg", ">= 1.0.0"
gem "sqlite3", "~> 1.3"
gem "sqlite3", ">= 1.3.0"
end
end

Expand Down
55 changes: 55 additions & 0 deletions gemfiles/rails_8.0.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
# This file was generated by Appraisal

source "https://rubygems.org"

gem "appraisal", ">= 2.0"
gem "devise", "~> 4.7"
gem "net-smtp", require: false
gem "rails", "~> 8.0.0"
gem "sassc-rails", "~> 2.1"
gem "turbo-rails"
gem "vite_rails", require: false
gem "webpacker", require: false
gem "webrick"
gem "importmap-rails", require: false

group :development, :test do
gem "pry", ">= 0.9"
end

group :test do
gem "cancancan", "~> 3.0"
gem "carrierwave", [">= 2.0.0.rc", "< 3"]
gem "cuprite", "!= 0.15.1"
gem "database_cleaner-active_record", ">= 2.0", require: false
gem "dragonfly", "~> 1.0"
gem "factory_bot", ">= 4.2", "!= 6.4.5"
gem "generator_spec", ">= 0.8"
gem "kt-paperclip"
gem "launchy", ">= 2.2"
gem "mini_magick", ">= 3.4"
gem "pundit"
gem "rack-cache", require: "rack/cache"
gem "rspec-expectations", "!= 3.8.3"
gem "rspec-rails", ">= 4.0.0.beta2"
gem "rspec-retry"
gem "rubocop", ["~> 1.20", "!= 1.22.2"], require: false
gem "rubocop-performance", require: false
gem "shrine", "~> 3.0"
gem "simplecov", ">= 0.9", require: false
gem "simplecov-lcov", require: false
gem "timecop", ">= 0.5"
gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby]
end

group :active_record do
gem "paper_trail", ">= 12.0"

platforms :ruby, :mswin, :mingw, :x64_mingw do
gem "mysql2", ">= 0.3.14"
gem "pg", ">= 1.0.0"
gem "sqlite3", "~> 2.2"
end
end

gemspec path: "../"
2 changes: 1 addition & 1 deletion rails_admin.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Gem::Specification.new do |spec|
spec.add_dependency 'csv'
spec.add_dependency 'kaminari', '>= 0.14', '< 2.0'
spec.add_dependency 'nested_form', '~> 0.3'
spec.add_dependency 'rails', ['>= 6.0', '< 8']
spec.add_dependency 'rails', ['>= 6.0', '< 9']
spec.add_dependency 'turbo-rails', ['>= 1.0', '< 3']
spec.add_development_dependency 'bundler', '>= 1.0'
spec.authors = ['Erik Michaels-Ober', 'Bogdan Gaza', 'Petteri Kaapa', 'Benoit Benezech', 'Mitsuhiro Shibuya']
Expand Down
2 changes: 1 addition & 1 deletion spec/dummy_app/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ group :active_record do
platforms :ruby, :mswin, :mingw do
gem 'mysql2', '>= 0.3.14'
gem 'pg', '>= 0.14'
gem 'sqlite3', '~> 1.3'
gem 'sqlite3', '>= 1.3.0'
end

gem 'paper_trail', '>= 12.0'
Expand Down
2 changes: 1 addition & 1 deletion spec/dummy_app/Gemfile.rails6
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ group :active_record do
platforms :ruby, :mswin, :mingw do
gem 'mysql2', '>= 0.3.14'
gem 'pg', '>= 0.14'
gem 'sqlite3', '>= 1.3.0'
gem 'sqlite3', '~> 2.2'
end

gem 'paper_trail', '>= 12.0'
Expand Down
4 changes: 2 additions & 2 deletions spec/rails_admin/config/fields/types/json_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
it 'returns correct value for empty json' do
allow(object).to receive(:json_field) { {} }
actual = field.with(bindings).formatted_value
expect(actual).to match(/{\n+}/)
expect(actual).to match(/{\n*}/)
end

it 'retuns correct value' do
Expand Down Expand Up @@ -72,7 +72,7 @@
it 'returns correct value for empty json' do
allow(object).to receive(:json_field) { {} }
actual = field.with(bindings).export_value
expect(actual).to match(/{\n+}/)
expect(actual).to match(/{\n*}/)
end

it 'returns correct value' do
Expand Down

0 comments on commit 5412857

Please sign in to comment.