Skip to content

Commit cb1d247

Browse files
committed
Test against Rails 7.2
Close #922
1 parent fe00f74 commit cb1d247

File tree

6 files changed

+344
-77
lines changed

6 files changed

+344
-77
lines changed

.github/workflows/ci.yaml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,20 @@ jobs:
2323
- rails_61
2424
- rails_70
2525
- rails_71
26+
- rails_72
27+
exclude:
28+
- ruby: "3.0"
29+
rails: rails_72
2630
steps:
2731
- uses: actions/checkout@v4
2832
- name: Configure bundler (default)
2933
run: |
3034
echo "BUNDLE_GEMFILE=Gemfile" >> "$GITHUB_ENV"
31-
if: matrix.rails == 'rails_71'
35+
if: matrix.rails == 'rails_72'
3236
- name: Configure bundler (alternative)
3337
run: |
3438
echo "BUNDLE_GEMFILE=gemfiles/${{ matrix.rails }}/Gemfile" >> "$GITHUB_ENV"
35-
if: matrix.rails != 'rails_71'
39+
if: matrix.rails != 'rails_72'
3640
- uses: ruby/setup-ruby@v1
3741
with:
3842
ruby-version: ${{ matrix.ruby }}

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Changelog
22

3+
## Unreleased
4+
5+
* Test against Rails 7.2 [#921][].
6+
37
## Version 1.14.0
48

59
* Remove upper bound dependency limits from gemspec.
@@ -225,3 +229,4 @@ _No changes_.
225229
* First release. Support to I18n, singleton controllers, polymorphic controllers, belongs_to, nested_belongs_to and url helpers.
226230

227231
[#873]: https://github.com/activeadmin/inherited_resources/pull/873
232+
[#921]: https://github.com/activeadmin/inherited_resources/pull/921

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ source 'https://rubygems.org'
33
gemspec path: '.'
44

55
group :development do
6-
gem 'rails', '~> 7.1.0'
6+
gem 'rails', '~> 7.2.0.beta3'
77

88
gem 'mocha'
99
gem 'minitest'

Gemfile.lock

Lines changed: 70 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -10,80 +10,75 @@ PATH
1010
GEM
1111
remote: https://rubygems.org/
1212
specs:
13-
actioncable (7.1.3.4)
14-
actionpack (= 7.1.3.4)
15-
activesupport (= 7.1.3.4)
13+
actioncable (7.2.0.beta3)
14+
actionpack (= 7.2.0.beta3)
15+
activesupport (= 7.2.0.beta3)
1616
nio4r (~> 2.0)
1717
websocket-driver (>= 0.6.1)
1818
zeitwerk (~> 2.6)
19-
actionmailbox (7.1.3.4)
20-
actionpack (= 7.1.3.4)
21-
activejob (= 7.1.3.4)
22-
activerecord (= 7.1.3.4)
23-
activestorage (= 7.1.3.4)
24-
activesupport (= 7.1.3.4)
25-
mail (>= 2.7.1)
26-
net-imap
27-
net-pop
28-
net-smtp
29-
actionmailer (7.1.3.4)
30-
actionpack (= 7.1.3.4)
31-
actionview (= 7.1.3.4)
32-
activejob (= 7.1.3.4)
33-
activesupport (= 7.1.3.4)
34-
mail (~> 2.5, >= 2.5.4)
35-
net-imap
36-
net-pop
37-
net-smtp
19+
actionmailbox (7.2.0.beta3)
20+
actionpack (= 7.2.0.beta3)
21+
activejob (= 7.2.0.beta3)
22+
activerecord (= 7.2.0.beta3)
23+
activestorage (= 7.2.0.beta3)
24+
activesupport (= 7.2.0.beta3)
25+
mail (>= 2.8.0)
26+
actionmailer (7.2.0.beta3)
27+
actionpack (= 7.2.0.beta3)
28+
actionview (= 7.2.0.beta3)
29+
activejob (= 7.2.0.beta3)
30+
activesupport (= 7.2.0.beta3)
31+
mail (>= 2.8.0)
3832
rails-dom-testing (~> 2.2)
39-
actionpack (7.1.3.4)
40-
actionview (= 7.1.3.4)
41-
activesupport (= 7.1.3.4)
33+
actionpack (7.2.0.beta3)
34+
actionview (= 7.2.0.beta3)
35+
activesupport (= 7.2.0.beta3)
4236
nokogiri (>= 1.8.5)
4337
racc
4438
rack (>= 2.2.4)
4539
rack-session (>= 1.0.1)
4640
rack-test (>= 0.6.3)
4741
rails-dom-testing (~> 2.2)
4842
rails-html-sanitizer (~> 1.6)
49-
actiontext (7.1.3.4)
50-
actionpack (= 7.1.3.4)
51-
activerecord (= 7.1.3.4)
52-
activestorage (= 7.1.3.4)
53-
activesupport (= 7.1.3.4)
43+
useragent (~> 0.16)
44+
actiontext (7.2.0.beta3)
45+
actionpack (= 7.2.0.beta3)
46+
activerecord (= 7.2.0.beta3)
47+
activestorage (= 7.2.0.beta3)
48+
activesupport (= 7.2.0.beta3)
5449
globalid (>= 0.6.0)
5550
nokogiri (>= 1.8.5)
56-
actionview (7.1.3.4)
57-
activesupport (= 7.1.3.4)
51+
actionview (7.2.0.beta3)
52+
activesupport (= 7.2.0.beta3)
5853
builder (~> 3.1)
5954
erubi (~> 1.11)
6055
rails-dom-testing (~> 2.2)
6156
rails-html-sanitizer (~> 1.6)
62-
activejob (7.1.3.4)
63-
activesupport (= 7.1.3.4)
57+
activejob (7.2.0.beta3)
58+
activesupport (= 7.2.0.beta3)
6459
globalid (>= 0.3.6)
65-
activemodel (7.1.3.4)
66-
activesupport (= 7.1.3.4)
67-
activerecord (7.1.3.4)
68-
activemodel (= 7.1.3.4)
69-
activesupport (= 7.1.3.4)
60+
activemodel (7.2.0.beta3)
61+
activesupport (= 7.2.0.beta3)
62+
activerecord (7.2.0.beta3)
63+
activemodel (= 7.2.0.beta3)
64+
activesupport (= 7.2.0.beta3)
7065
timeout (>= 0.4.0)
71-
activestorage (7.1.3.4)
72-
actionpack (= 7.1.3.4)
73-
activejob (= 7.1.3.4)
74-
activerecord (= 7.1.3.4)
75-
activesupport (= 7.1.3.4)
66+
activestorage (7.2.0.beta3)
67+
actionpack (= 7.2.0.beta3)
68+
activejob (= 7.2.0.beta3)
69+
activerecord (= 7.2.0.beta3)
70+
activesupport (= 7.2.0.beta3)
7671
marcel (~> 1.0)
77-
activesupport (7.1.3.4)
72+
activesupport (7.2.0.beta3)
7873
base64
7974
bigdecimal
80-
concurrent-ruby (~> 1.0, >= 1.0.2)
75+
concurrent-ruby (~> 1.0, >= 1.3.1)
8176
connection_pool (>= 2.2.5)
8277
drb
8378
i18n (>= 1.6, < 2)
79+
logger (>= 1.4.2)
8480
minitest (>= 5.1)
85-
mutex_m
86-
tzinfo (~> 2.0)
81+
tzinfo (~> 2.0, >= 2.0.5)
8782
ansi (1.5.0)
8883
ast (2.4.2)
8984
base64 (0.2.0)
@@ -93,7 +88,7 @@ GEM
9388
connection_pool (2.4.1)
9489
crass (1.0.6)
9590
date (3.3.4)
96-
docile (1.4.0)
91+
docile (1.4.1)
9792
drb (2.2.1)
9893
erubi (1.13.0)
9994
globalid (1.2.1)
@@ -109,6 +104,7 @@ GEM
109104
reline (>= 0.4.2)
110105
json (2.7.2)
111106
language_server-protocol (3.17.0.3)
107+
logger (1.6.0)
112108
loofah (2.22.0)
113109
crass (~> 1.0.2)
114110
nokogiri (>= 1.12.0)
@@ -126,9 +122,8 @@ GEM
126122
builder
127123
minitest (>= 5.0)
128124
ruby-progressbar
129-
mocha (2.4.4)
125+
mocha (2.4.5)
130126
ruby2_keywords (>= 0.0.5)
131-
mutex_m (0.2.0)
132127
net-imap (0.4.14)
133128
date
134129
net-protocol
@@ -151,7 +146,7 @@ GEM
151146
nokogiri (1.16.6-x86_64-linux)
152147
racc (~> 1.4)
153148
parallel (1.25.1)
154-
parser (3.3.3.0)
149+
parser (3.3.4.0)
155150
ast (~> 2.4.1)
156151
racc
157152
psych (5.1.2)
@@ -165,20 +160,20 @@ GEM
165160
rackup (2.1.0)
166161
rack (>= 3)
167162
webrick (~> 1.8)
168-
rails (7.1.3.4)
169-
actioncable (= 7.1.3.4)
170-
actionmailbox (= 7.1.3.4)
171-
actionmailer (= 7.1.3.4)
172-
actionpack (= 7.1.3.4)
173-
actiontext (= 7.1.3.4)
174-
actionview (= 7.1.3.4)
175-
activejob (= 7.1.3.4)
176-
activemodel (= 7.1.3.4)
177-
activerecord (= 7.1.3.4)
178-
activestorage (= 7.1.3.4)
179-
activesupport (= 7.1.3.4)
163+
rails (7.2.0.beta3)
164+
actioncable (= 7.2.0.beta3)
165+
actionmailbox (= 7.2.0.beta3)
166+
actionmailer (= 7.2.0.beta3)
167+
actionpack (= 7.2.0.beta3)
168+
actiontext (= 7.2.0.beta3)
169+
actionview (= 7.2.0.beta3)
170+
activejob (= 7.2.0.beta3)
171+
activemodel (= 7.2.0.beta3)
172+
activerecord (= 7.2.0.beta3)
173+
activestorage (= 7.2.0.beta3)
174+
activesupport (= 7.2.0.beta3)
180175
bundler (>= 1.15.0)
181-
railties (= 7.1.3.4)
176+
railties (= 7.2.0.beta3)
182177
rails-controller-testing (1.0.5)
183178
actionpack (>= 5.0.1.rc1)
184179
actionview (>= 5.0.1.rc1)
@@ -190,10 +185,10 @@ GEM
190185
rails-html-sanitizer (1.6.0)
191186
loofah (~> 2.21)
192187
nokogiri (~> 1.14)
193-
railties (7.1.3.4)
194-
actionpack (= 7.1.3.4)
195-
activesupport (= 7.1.3.4)
196-
irb
188+
railties (7.2.0.beta3)
189+
actionpack (= 7.2.0.beta3)
190+
activesupport (= 7.2.0.beta3)
191+
irb (~> 1.13)
197192
rackup (>= 1.0.0)
198193
rake (>= 12.2)
199194
thor (~> 1.0, >= 1.2.2)
@@ -210,23 +205,23 @@ GEM
210205
railties (>= 5.2)
211206
rexml (3.3.2)
212207
strscan
213-
rubocop (1.64.1)
208+
rubocop (1.65.0)
214209
json (~> 2.3)
215210
language_server-protocol (>= 3.17.0)
216211
parallel (~> 1.10)
217212
parser (>= 3.3.0.2)
218213
rainbow (>= 2.2.2, < 4.0)
219-
regexp_parser (>= 1.8, < 3.0)
214+
regexp_parser (>= 2.4, < 3.0)
220215
rexml (>= 3.2.5, < 4.0)
221216
rubocop-ast (>= 1.31.1, < 2.0)
222217
ruby-progressbar (~> 1.7)
223218
unicode-display_width (>= 2.4.0, < 3.0)
224219
rubocop-ast (1.31.3)
225220
parser (>= 3.3.1.0)
226-
rubocop-minitest (0.35.0)
221+
rubocop-minitest (0.35.1)
227222
rubocop (>= 1.61, < 2.0)
228223
rubocop-ast (>= 1.31.1, < 2.0)
229-
rubocop-performance (1.21.0)
224+
rubocop-performance (1.21.1)
230225
rubocop (>= 1.48.1, < 2.0)
231226
rubocop-ast (>= 1.31.1, < 2.0)
232227
ruby-progressbar (1.13.0)
@@ -247,6 +242,7 @@ GEM
247242
tzinfo (2.0.6)
248243
concurrent-ruby (~> 1.0)
249244
unicode-display_width (2.5.0)
245+
useragent (0.16.10)
250246
warning (1.4.0)
251247
webrick (1.8.1)
252248
websocket-driver (0.7.6)
@@ -266,7 +262,7 @@ DEPENDENCIES
266262
minitest
267263
minitest-reporters
268264
mocha
269-
rails (~> 7.1.0)
265+
rails (~> 7.2.0.beta3)
270266
rails-controller-testing
271267
rubocop
272268
rubocop-minitest

gemfiles/rails_71/Gemfile

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
source 'https://rubygems.org'
2+
3+
gemspec path: '../..'
4+
5+
group :development do
6+
gem 'rails', '~> 7.1.0'
7+
8+
gem 'mocha'
9+
gem 'minitest'
10+
gem 'minitest-reporters'
11+
gem 'rails-controller-testing'
12+
gem 'simplecov', require: false
13+
gem 'simplecov-cobertura'
14+
gem 'warning'
15+
end

0 commit comments

Comments
 (0)