Skip to content

Commit 5412857

Browse files
authored
Test against rails 8.0 (#3702)
* 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
1 parent b09f770 commit 5412857

14 files changed

+83
-12
lines changed

.github/workflows/test.yml

+5
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,11 @@ jobs:
5858
orm: active_record
5959
adapter: sqlite3
6060
asset: sprockets
61+
- ruby: "3.3"
62+
gemfile: gemfiles/rails_8.0.gemfile
63+
orm: active_record
64+
adapter: sqlite3
65+
asset: sprockets
6166
- ruby: "3.2"
6267
gemfile: gemfiles/composite_primary_keys.gemfile
6368
orm: active_record

Appraisals

+11
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,17 @@ appraise 'rails-7.2' do
9494
gem 'importmap-rails', require: false
9595
end
9696

97+
appraise 'rails-8.0' do
98+
gem 'rails', '~> 8.0.0'
99+
gem 'importmap-rails', require: false
100+
101+
group :active_record do
102+
platforms :ruby, :mswin, :mingw, :x64_mingw do
103+
gem 'sqlite3', '~> 2.2'
104+
end
105+
end
106+
end
107+
97108
appraise 'composite_primary_keys' do
98109
gem 'rails', '~> 7.0.0'
99110

Gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ group :active_record do
4949
platforms :ruby, :mswin, :mingw, :x64_mingw do
5050
gem 'mysql2', '>= 0.3.14'
5151
gem 'pg', '>= 1.0.0'
52-
gem 'sqlite3', '~> 1.3'
52+
gem 'sqlite3', '>= 1.3.0'
5353
end
5454
end
5555

gemfiles/composite_primary_keys.gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ group :active_record do
4848
platforms :ruby, :mswin, :mingw, :x64_mingw do
4949
gem "mysql2", ">= 0.3.14"
5050
gem "pg", ">= 1.0.0"
51-
gem "sqlite3", "~> 1.3"
51+
gem "sqlite3", ">= 1.3.0"
5252
end
5353
end
5454

gemfiles/rails_6.0.gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ group :active_record do
4848
platforms :ruby, :mswin, :mingw, :x64_mingw do
4949
gem "mysql2", ">= 0.3.14"
5050
gem "pg", ">= 1.0.0"
51-
gem "sqlite3", "~> 1.3"
51+
gem "sqlite3", ">= 1.3.0"
5252
end
5353

5454
platforms :jruby do

gemfiles/rails_6.1.gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ group :active_record do
4747
platforms :ruby, :mswin, :mingw, :x64_mingw do
4848
gem "mysql2", ">= 0.3.14"
4949
gem "pg", ">= 1.0.0"
50-
gem "sqlite3", "~> 1.3"
50+
gem "sqlite3", ">= 1.3.0"
5151
end
5252

5353
platforms :jruby do

gemfiles/rails_7.0.gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ group :active_record do
4848
platforms :ruby, :mswin, :mingw, :x64_mingw do
4949
gem "mysql2", ">= 0.3.14"
5050
gem "pg", ">= 1.0.0"
51-
gem "sqlite3", "~> 1.3"
51+
gem "sqlite3", ">= 1.3.0"
5252
end
5353

5454
platforms :jruby do

gemfiles/rails_7.1.gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ group :active_record do
4848
platforms :ruby, :mswin, :mingw, :x64_mingw do
4949
gem "mysql2", ">= 0.3.14"
5050
gem "pg", ">= 1.0.0"
51-
gem "sqlite3", "~> 1.3"
51+
gem "sqlite3", ">= 1.3.0"
5252
end
5353
end
5454

gemfiles/rails_7.2.gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ group :active_record do
4848
platforms :ruby, :mswin, :mingw, :x64_mingw do
4949
gem "mysql2", ">= 0.3.14"
5050
gem "pg", ">= 1.0.0"
51-
gem "sqlite3", "~> 1.3"
51+
gem "sqlite3", ">= 1.3.0"
5252
end
5353
end
5454

gemfiles/rails_8.0.gemfile

+55
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
# This file was generated by Appraisal
2+
3+
source "https://rubygems.org"
4+
5+
gem "appraisal", ">= 2.0"
6+
gem "devise", "~> 4.7"
7+
gem "net-smtp", require: false
8+
gem "rails", "~> 8.0.0"
9+
gem "sassc-rails", "~> 2.1"
10+
gem "turbo-rails"
11+
gem "vite_rails", require: false
12+
gem "webpacker", require: false
13+
gem "webrick"
14+
gem "importmap-rails", require: false
15+
16+
group :development, :test do
17+
gem "pry", ">= 0.9"
18+
end
19+
20+
group :test do
21+
gem "cancancan", "~> 3.0"
22+
gem "carrierwave", [">= 2.0.0.rc", "< 3"]
23+
gem "cuprite", "!= 0.15.1"
24+
gem "database_cleaner-active_record", ">= 2.0", require: false
25+
gem "dragonfly", "~> 1.0"
26+
gem "factory_bot", ">= 4.2", "!= 6.4.5"
27+
gem "generator_spec", ">= 0.8"
28+
gem "kt-paperclip"
29+
gem "launchy", ">= 2.2"
30+
gem "mini_magick", ">= 3.4"
31+
gem "pundit"
32+
gem "rack-cache", require: "rack/cache"
33+
gem "rspec-expectations", "!= 3.8.3"
34+
gem "rspec-rails", ">= 4.0.0.beta2"
35+
gem "rspec-retry"
36+
gem "rubocop", ["~> 1.20", "!= 1.22.2"], require: false
37+
gem "rubocop-performance", require: false
38+
gem "shrine", "~> 3.0"
39+
gem "simplecov", ">= 0.9", require: false
40+
gem "simplecov-lcov", require: false
41+
gem "timecop", ">= 0.5"
42+
gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby]
43+
end
44+
45+
group :active_record do
46+
gem "paper_trail", ">= 12.0"
47+
48+
platforms :ruby, :mswin, :mingw, :x64_mingw do
49+
gem "mysql2", ">= 0.3.14"
50+
gem "pg", ">= 1.0.0"
51+
gem "sqlite3", "~> 2.2"
52+
end
53+
end
54+
55+
gemspec path: "../"

rails_admin.gemspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Gem::Specification.new do |spec|
88
spec.add_dependency 'csv'
99
spec.add_dependency 'kaminari', '>= 0.14', '< 2.0'
1010
spec.add_dependency 'nested_form', '~> 0.3'
11-
spec.add_dependency 'rails', ['>= 6.0', '< 8']
11+
spec.add_dependency 'rails', ['>= 6.0', '< 9']
1212
spec.add_dependency 'turbo-rails', ['>= 1.0', '< 3']
1313
spec.add_development_dependency 'bundler', '>= 1.0'
1414
spec.authors = ['Erik Michaels-Ober', 'Bogdan Gaza', 'Petteri Kaapa', 'Benoit Benezech', 'Mitsuhiro Shibuya']

spec/dummy_app/Gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ group :active_record do
1414
platforms :ruby, :mswin, :mingw do
1515
gem 'mysql2', '>= 0.3.14'
1616
gem 'pg', '>= 0.14'
17-
gem 'sqlite3', '~> 1.3'
17+
gem 'sqlite3', '>= 1.3.0'
1818
end
1919

2020
gem 'paper_trail', '>= 12.0'

spec/dummy_app/Gemfile.rails6

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ group :active_record do
1313
platforms :ruby, :mswin, :mingw do
1414
gem 'mysql2', '>= 0.3.14'
1515
gem 'pg', '>= 0.14'
16-
gem 'sqlite3', '>= 1.3.0'
16+
gem 'sqlite3', '~> 2.2'
1717
end
1818

1919
gem 'paper_trail', '>= 12.0'

spec/rails_admin/config/fields/types/json_spec.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
it 'returns correct value for empty json' do
2525
allow(object).to receive(:json_field) { {} }
2626
actual = field.with(bindings).formatted_value
27-
expect(actual).to match(/{\n+}/)
27+
expect(actual).to match(/{\n*}/)
2828
end
2929

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

7878
it 'returns correct value' do

0 commit comments

Comments
 (0)