8000 Backport Test against Rails 7.2 (#8434) · activeadmin/activeadmin@0e02889 · GitHub
[go: up one dir, main page]
Skip to content

Commit 0e02889

Browse files
mgrunbergmgrunberg
authored
Backport Test against Rails 7.2 (#8434)
test against Rails 7.2
1 parent d52a220 commit 0e02889

File tree

6 files changed

+630
-76
lines changed

6 files changed

+630
-76
lines changed

‎.github/workflows/ci.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ jobs:
2525
os:
2626
- ubuntu-latest
2727
deps:
28+
- rails_72
2829
- rails_71
2930
- rails_70
3031
- rails_61
@@ -37,11 +38,11 @@ jobs:
3738
- name: Configure bundler (default)
3839
run: |
3940
echo "BUNDLE_GEMFILE=Gemfile" >> "$GITHUB_ENV"
40-
if: matrix.deps == 'rails_71'
41+
if: matrix.deps == 'rails_72'
4142
- name: Configure bundler (alternative)
4243
run: |
4344
echo "BUNDLE_GEMFILE=gemfiles/${{ matrix.deps }}/Gemfile" >> "$GITHUB_ENV"
44-
if: matrix.deps != 'rails_71'
45+
if: matrix.deps != 'rails_72'
4546
- uses: ruby/setup-ruby@v1
4647
with:
4748
ruby-version: ${{ matrix.ruby }}

‎Gemfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ group :development, :test do
1010
gem "draper"
1111
gem "devise"
1212

13-
gem "rails", "~> 7.1.0"
13+
gem "rails", "~> 7.2.0"
1414

1515
gem "sprockets-rails"
1616
gem "sassc-rails"
17-
gem "ransack", ">= 4.1.0"
17+
gem "ransack", ">= 4.2.0"
1818
gem "formtastic", ">= 5.0.0"
1919
end
2020

@@ -31,7 +31,7 @@ group :test do
3131
gem "launchy"
3232
gem "parallel_tests"
3333
gem "rspec-rails"
34-
gem "sqlite3", "~> 1.7", platform: :mri
34+
gem "sqlite3", platform: :mri
3535

3636
# Translations
3737
gem "i18n-tasks"

‎Gemfile.lock

Lines changed: 67 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -15,84 +15,80 @@ PATH
1515
GEM
1616
remote: https://rubygems.org/
1717
specs:
18-
actioncable (7.1.3.4)
19-
actionpack (= 7.1.3.4)
20-
activesupport (= 7.1.3.4)
18+
actioncable (7.2.0)
19+
actionpack (= 7.2.0)
20+
activesupport (= 7.2.0)
2121
nio4r (~> 2.0)
2222
websocket-driver (>= 0.6.1)
2323
zeitwerk (~> 2.6)
24-
actionmailbox (7.1.3.4)
25-
actionpack (= 7.1.3.4)
26-
activejob (= 7.1.3.4)
27-
activerecord (= 7.1.3.4)
28-
activestorage (= 7.1.3.4)
29-
activesupport (= 7.1.3.4)
30-
mail (>= 2.7.1)
31-
net-imap
32-
net-pop
33-
net-smtp
34-
actionmailer (7.1.3.4)
35-
actionpack (= 7.1.3.4)
36-
actionview (= 7.1.3.4)
37-
activejob (= 7.1.3.4)
38-
activesupport (= 7.1.3.4)
39-
mail (~> 2.5, >= 2.5.4)
40-
net-imap
41-
net-pop
42-
net-smtp
24+
actionmailbox (7.2.0)
25+
actionpack (= 7.2.0)
26+
activejob (= 7.2.0)
27+
activerecord (= 7.2.0)
28+
activestorage (= 7.2.0)
29+
activesupport (= 7.2.0)
30+
mail (>= 2.8.0)
31+
actionmailer (7.2.0)
32+
actionpack (= 7.2.0)
33+
actionview (= 7.2.0)
34+
activejob (= 7.2.0)
35+
activesupport (= 7.2.0)
36+
mail (>= 2.8.0)
4337
rails-dom-testing (~> 2.2)
44-
actionpack (7.1.3.4)
45-
actionview (= 7.1.3.4)
46-
activesupport (= 7.1.3.4)
38+
actionpack (7.2.0)
39+
actionview (= 7.2.0)
40+
activesupport (= 7.2.0)
4741
nokogiri (>= 1.8.5)
4842
racc
49-
rack (>= 2.2.4)
43+
rack (>= 2.2.4, < 3.2)
5044
rack-session (>= 1.0.1)
5145
rack-test (>= 0.6.3)
5246
rails-dom-testing (~> 2.2)
5347
rails-html-sanitizer (~> 1.6)
54-
actiontext (7.1.3.4)
55-
actionpack (= 7.1.3.4)
56-
activerecord (= 7.1.3.4)
57-
activestorage (= 7.1.3.4)
58-
activesupport (= 7.1.3.4)
48+
useragent (~> 0.16)
49+
actiontext (7.2.0)
50+
actionpack (= 7.2.0)
51+
activerecord (= 7.2.0)
52+
activestorage (= 7.2.0)
53+
activesupport (= 7.2.0)
5954
globalid (>= 0.6.0)
6055
nokogiri (>= 1.8.5)
61-
actionview (7.1.3.4)
62-
activesupport (= 7.1.3.4)
56+
actionview (7.2.0)
57+
activesupport (= 7.2.0)
6358
builder (~> 3.1)
6459
erubi (~> 1.11)
6560
rails-dom-testing (~> 2.2)
6661
rails-html-sanitizer (~> 1.6)
67-
activejob (7.1.3.4)
68-
activesupport (= 7.1.3.4)
62+
activejob (7.2.0)
63+
activesupport (= 7.2.0)
6964
globalid (>= 0.3.6)
70-
activemodel (7.1.3.4)
71-
activesupport (= 7.1.3.4)
65+
activemodel (7.2.0)
66+
activesupport (= 7.2.0)
7267
activemodel-serializers-xml (1.0.2)
7368
activemodel (> 5.x)
7469
activesupport (> 5.x)
7570
builder (~> 3.1)
76-
activerecord (7.1.3.4)
77-
activemodel (= 7.1.3.4)
78-
activesupport (= 7.1.3.4)
71+
activerecord (7.2.0)
72+
activemodel (= 7.2.0)
73+
activesupport (= 7.2.0)
7974
timeout (>= 0.4.0)
80-
activestorage (7.1.3.4)
81-
actionpack (= 7.1.3.4)
82-
activejob (= 7.1.3.4)
83-
activerecord (= 7.1.3.4)
84-
activesupport (= 7.1.3.4)
75+
activestorage (7.2.0)
76+
actionpack (= 7.2.0)
77+
activejob (= 7.2.0)
78+
activerecord (= 7.2.0)
79+
activesupport (= 7.2.0)
8580
marcel (~> 1.0)
86-
activesupport (7.1.3.4)
81+
activesupport (7.2.0)
8782
base64
8883
bigdecimal
89-
concurrent-ruby (~> 1.0, >= 1.0.2)
84+
concurrent-ruby (~> 1.0, >= 1.3.1)
9085
connection_pool (>= 2.2.5)
9186
drb
9287
i18n (>= 1.6, < 2)
88+
logger (>= 1.4.2)
9389
minitest (>= 5.1)
94-
mutex_m
95-
tzinfo (~> 2.0)
90+
securerandom (>= 0.3)
91+
tzinfo (~> 2.0, >= 2.0.5)
9692
addressable (2.8.7)
9793
public_suffix (>= 2.0.2, < 7.0)
9894
arbre (1.7.0)
@@ -261,7 +257,6 @@ GEM
261257
mini_portile2 (2.8.7)
262258
minitest (5.24.1)
263259
multi_test (1.1.0)
264-
mutex_m (0.2.0)
265260
net-http (0.4.1)
266261
uri
267262
net-imap (0.4.14)
@@ -306,20 +301,20 @@ GEM
306301
rackup (2.1.0)
307302
rack (>= 3)
308303
webrick (~> 1.8)
309-
rails (7.1.3.4)
310-
actioncable (= 7.1.3.4)
311-
actionmailbox (= 7.1.3.4)
312-
actionmailer (= 7.1.3.4)
313-
actionpack (= 7.1.3.4)
314-
actiontext (= 7.1.3.4)
315-
actionview (= 7.1.3.4)
316-
activejob (= 7.1.3.4)
317-
activemodel (= 7.1.3.4)
318-
activerecord (= 7.1.3.4)
319-
activestorage (= 7.1.3.4)
320-
activesupport (= 7.1.3.4)
304+
rails (7.2.0< 10000 /span>)
305+
actioncable (= 7.2.0)
306+
actionmailbox (= 7.2.0)
307+
actionmailer (= 7.2.0)
308+
actionpack (= 7.2.0)
309+
actiontext (= 7.2.0)
310+
actionview (= 7.2.0)
311+
activejob (= 7.2.0)
312+
activemodel (= 7.2.0)
313+
activerecord (= 7.2.0)
314+
activestorage (= 7.2.0)
315+
activesupport (= 7.2.0)
321316
bundler (>= 1.15.0)
322-
railties (= 7.1.3.4)
317+
railties (= 7.2.0)
323318
rails-dom-testing (2.2.0)
324319
activesupport (>= 5.0.0)
325320
minitest
@@ -330,10 +325,10 @@ GEM
330325
rails-i18n (7.0.9)
331326
i18n (>= 0.7, < 2)
332327
railties (>= 6.0.0, < 8)
333-
railties (7.1.3.4)
334-
actionpack (= 7.1.3.4)
335-
activesupport (= 7.1.3.4)
336-
irb
328+
railties (7.2.0)
329+
actionpack (= 7.2.0)
330+
activesupport (= 7.2.0)
331+
irb (~> 1.13)
337332
rackup (>= 1.0.0)
338333
rake (>= 12.2)
339334
thor (~> 1.0, >= 1.2.2)
@@ -408,6 +403,7 @@ GEM
408403
sawyer (0.9.2)
409404
addressable (>= 2.3.5)
410405
faraday (>= 0.17.3, < 3)
406+
securerandom (0.3.1)
411407
simplecov (0.22.0)
412408
docile (~> 1.1)
413409
simplecov-html (~> 0.11)
@@ -441,6 +437,7 @@ GEM
441437
concurrent-ruby (~> 1.0)
442438
unicode-display_width (2.5.0)
443439
uri (0.13.0)
440+
useragent (0.16.10)
444441
warden (1.2.9)
445442
rack (>= 2.0.9)
446443
webrick (1.8.1)
@@ -476,10 +473,10 @@ DEPENDENCIES
476473
octokit
477474
parallel_tests
478475
pundit
479-
rails (~> 7.1.0)
476+
rails (~> 7.2.0)
480477
rails-i18n
481478
rake
482-
ransack (>= 4.1.0)
479+
ransack (>= 4.2.0)
483480
rspec-rails
484481
rubocop
485482
rubocop-packaging
@@ -489,7 +486,7 @@ DEPENDENCIES
489486
simplecov
490487
simplecov-cobertura
491488
sprockets-rails
492-
sqlite3 (~> 1.7)
489+
sqlite3
493490
webrick
494491
yard
495492

‎gemfiles/rails_71/Gemfile

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
# frozen_string_literal: true
2+
source "https://rubygems.org"
3+
4+
group :development, :test do
5+
gem "rake"
6+
7+
gem "cancancan"
8+
gem "pundit"
9+
10+
gem "draper"
11+
gem "devise"
12+
13+
gem "rails", "~> 7.1.0"
14+
15+
gem "sprockets-rails"
16+
gem "sassc-rails"
17+
gem "ransack", ">= 4.1.0"
18+
gem "formtastic", ">= 5.0.0"
19+
end
20+
21+
group :test do
22+
gem "cuprite"
23+
gem "capybara"
24+
gem "webrick"
25+
26+
gem "simplecov", require: false # Test coverage generator. Go to /coverage/ after running tests
27+
gem "simplecov-cobertura", require: false
28+
gem "cucumber-rails", require: false
29+
gem "cucumber"
30+
gem "database_cleaner-active_record"
31+
gem "launchy"
32+
gem "parallel_tests"
33+
gem "rspec-rails"
34+
gem "sqlite3", "~> 1.7", platform: :mri
35+
36+
# Translations
37+
gem "i18n-tasks"
38+
gem "i18n-spec"
39+
gem "rails-i18n" # Provides default i18n for many languages
40+
end
41+
42+
group :release do
43+
gem "chandler" # Github releases from changelog
44+
gem "octokit"
45+
end
46+
47+
group :rubocop do
48+
gem "rubocop"
49+
gem "rubocop-packaging"
50+
gem "rubocop-rspec"
51+
gem "rubocop-rails"
52+
end
53+
54+
group :docs do
55+
gem "yard" # Documentation generator
56+
gem "kramdown" # Markdown implementation (for yard)
57+
end
58+
59+
gemspec path: "../.."

0 commit comments

Comme 3055 nts
 (0)
0