Skip to content

Commit e01d82a

Browse files
Add support for Rails 7.1
1 parent 956cd87 commit e01d82a

File tree

7 files changed

+112
-58
lines changed

7 files changed

+112
-58
lines changed

.github/workflows/test.yml

+5
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ jobs:
88
gemfile:
99
- Gemfile
1010
- gemfiles/Gemfile-rails-main
11+
- gemfiles/Gemfile-rails-7-0
1112
- gemfiles/Gemfile-rails-6-1
1213
- gemfiles/Gemfile-rails-6-0
1314
- gemfiles/Gemfile-rails-5-2
@@ -27,6 +28,10 @@ jobs:
2728
ruby: '2.6'
2829
- gemfile: gemfiles/Gemfile-rails-main
2930
ruby: '2.5'
31+
- gemfile: gemfiles/Gemfile-rails-7-0
32+
ruby: '2.6'
33+
- gemfile: gemfiles/Gemfile-rails-7-0
34+
ruby: '2.5'
3035
- gemfile: gemfiles/Gemfile-rails-6-0
3136
ruby: '3.2'
3237
- gemfile: gemfiles/Gemfile-rails-6-0

CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
## Unreleased
22

3+
* Add support for Rails 7.1. (no changes required.)
34

45
## 3.1.0
56

Gemfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ source "https://rubygems.org"
44

55
gemspec
66

7-
gem "activemodel", "~> 7.0.0"
8-
gem "railties", "~> 7.0.0"
7+
gem "activemodel", "~> 7.1.0"
8+
gem "railties", "~> 7.1.0"
99
gem "mocha"
1010
gem "rails-controller-testing"
1111
gem "rubocop"

Gemfile.lock

+90-54
Original file line numberDiff line numberDiff line change
@@ -8,103 +8,139 @@ PATH
88
GEM
99
remote: https://rubygems.org/
1010
specs:
11-
actionpack (7.0.4)
12-
actionview (= 7.0.4)
13-
activesupport (= 7.0.4)
14-
rack (~> 2.0, >= 2.2.0)
11+
actionpack (7.1.0)
12+
actionview (= 7.1.0)
13+
activesupport (= 7.1.0)
14+
nokogiri (>= 1.8.5)
15+
rack (>= 2.2.4)
16+
rack-session (>= 1.0.1)
1517
rack-test (>= 0.6.3)
16-
rails-dom-testing (~> 2.0)
17-
rails-html-sanitizer (~> 1.0, >= 1.2.0)
18-
actionview (7.0.4)
19-
activesupport (= 7.0.4)
18+
rails-dom-testing (~> 2.2)
19+
rails-html-sanitizer (~> 1.6)
20+
actionview (7.1.0)
21+
activesupport (= 7.1.0)
2022
builder (~> 3.1)
21-
erubi (~> 1.4)
22-
rails-dom-testing (~> 2.0)
23-
rails-html-sanitizer (~> 1.1, >= 1.2.0)
24-
activemodel (7.0.4)
25-
activesupport (= 7.0.4)
26-
activesupport (7.0.4)
23+
erubi (~> 1.11)
24+
rails-dom-testing (~> 2.2)
25+
rails-html-sanitizer (~> 1.6)
26+
activemodel (7.1.0)
27+
activesupport (= 7.1.0)
28+
activesupport (7.1.0)
29+
base64
30+
bigdecimal
2731
concurrent-ruby (~> 1.0, >= 1.0.2)
32+
connection_pool (>= 2.2.5)
33+
drb
2834
i18n (>= 1.6, < 2)
2935
minitest (>= 5.1)
36+
mutex_m
3037
tzinfo (~> 2.0)
3138
ast (2.4.2)
39+
base64 (0.1.1)
40+
bigdecimal (3.1.4)
3241
builder (3.2.4)
33-
concurrent-ruby (1.1.10)
42+
concurrent-ruby (1.2.2)
43+
connection_pool (2.4.1)
3444
crass (1.0.6)
45+
drb (2.1.1)
46+
ruby2_keywords
3547
erubi (1.12.0)
36-
i18n (1.12.0)
48+
i18n (1.14.1)
3749
concurrent-ruby (~> 1.0)
50+
io-console (0.6.0)
51+
irb (1.8.1)
52+
rdoc
53+
reline (>= 0.3.8)
3854
json (2.6.3)
39-
loofah (2.19.1)
55+
language_server-protocol (3.17.0.3)
56+
loofah (2.21.4)
4057
crass (~> 1.0.2)
41-
nokogiri (>= 1.5.9)
42-
method_source (1.0.0)
43-
mini_portile2 (2.8.1)
44-
minitest (5.17.0)
45-
mocha (2.0.2)
58+
nokogiri (>= 1.12.0)
59+
mini_portile2 (2.8.4)
60+
minitest (5.20.0)
61+
mocha (2.1.0)
4662
ruby2_keywords (>= 0.0.5)
47-
nokogiri (1.14.0)
48-
mini_portile2 (~> 2.8.0)
63+
mutex_m (0.1.2)
64+
nokogiri (1.15.4)
65+
mini_portile2 (~> 2.8.2)
4966
racc (~> 1.4)
50-
parallel (1.22.1)
51-
parser (3.2.0.0)
67+
parallel (1.23.0)
68+
parser (3.2.2.4)
5269
ast (~> 2.4.1)
53-
racc (1.6.2)
54-
rack (2.2.6)
55-
rack-test (2.0.2)
70+
racc
71+
psych (5.1.0)
72+
stringio
73+
racc (1.7.1)
74+
rack (3.0.8)
75+
rack-session (2.0.0)
76+
rack (>= 3.0.0)
77+
rack-test (2.1.0)
5678
rack (>= 1.3)
79+
rackup (2.1.0)
80+
rack (>= 3)
81+
webrick (~> 1.8)
5782
rails-controller-testing (1.0.5)
5883
actionpack (>= 5.0.1.rc1)
5984
actionview (>= 5.0.1.rc1)
6085
activesupport (>= 5.0.1.rc1)
61-
rails-dom-testing (2.0.3)
62-
activesupport (>= 4.2.0)
86+
rails-dom-testing (2.2.0)
87+
activesupport (>= 5.0.0)
88+
minitest
6389
nokogiri (>= 1.6)
64-
rails-html-sanitizer (1.4.4)
65-
loofah (~> 2.19, >= 2.19.1)
66-
railties (7.0.4)
67-
actionpack (= 7.0.4)
68-
activesupport (= 7.0.4)
69-
method_source
90+
rails-html-sanitizer (1.6.0)
91+
loofah (~> 2.21)
92+
nokogiri (~> 1.14)
93+
railties (7.1.0)
94+
actionpack (= 7.1.0)
95+
activesupport (= 7.1.0)
96+
irb
97+
rackup (>= 1.0.0)
7098
rake (>= 12.2)
71-
thor (~> 1.0)
72-
zeitwerk (~> 2.5)
99+
thor (~> 1.0, >= 1.2.2)
100+
zeitwerk (~> 2.6)
73101
rainbow (3.1.1)
74102
rake (13.0.6)
75-
regexp_parser (2.6.1)
76-
rexml (3.2.5)
77-
rubocop (1.43.0)
103+
rdoc (6.5.0)
104+
psych (>= 4.0.0)
105+
regexp_parser (2.8.2)
106+
reline (0.3.9)
107+
io-console (~> 0.5)
108+
rexml (3.2.6)
109+
rubocop (1.56.4)
110+
base64 (~> 0.1.1)
78111
json (~> 2.3)
112+
language_server-protocol (>= 3.17.0)
79113
parallel (~> 1.10)
80-
parser (>= 3.2.0.0)
114+
parser (>= 3.2.2.3)
81115
rainbow (>= 2.2.2, < 4.0)
82116
regexp_parser (>= 1.8, < 3.0)
83117
rexml (>= 3.2.5, < 4.0)
84-
rubocop-ast (>= 1.24.1, < 2.0)
118+
rubocop-ast (>= 1.28.1, < 2.0)
85119
ruby-progressbar (~> 1.7)
86120
unicode-display_width (>= 2.4.0, < 3.0)
87-
rubocop-ast (1.24.1)
88-
parser (>= 3.1.1.0)
89-
rubocop-performance (1.15.2)
121+
rubocop-ast (1.29.0)
122+
parser (>= 3.2.1.0)
123+
rubocop-performance (1.19.1)
90124
rubocop (>= 1.7.0, < 2.0)
91125
rubocop-ast (>= 0.4.0)
92-
ruby-progressbar (1.11.0)
126+
ruby-progressbar (1.13.0)
93127
ruby2_keywords (0.0.5)
94-
thor (1.2.1)
95-
tzinfo (2.0.5)
128+
stringio (3.0.8)
129+
thor (1.2.2)
130+
tzinfo (2.0.6)
96131
concurrent-ruby (~> 1.0)
97-
unicode-display_width (2.4.2)
98-
zeitwerk (2.6.6)
132+
unicode-display_width (2.5.0)
133+
webrick (1.8.1)
134+
zeitwerk (2.6.12)
99135

100136
PLATFORMS
101137
ruby
102138

103139
DEPENDENCIES
104-
activemodel (~> 7.0.0)
140+
activemodel (~> 7.1.0)
105141
mocha
106142
rails-controller-testing
107-
railties (~> 7.0.0)
143+
railties (~> 7.1.0)
108144
responders!
109145
rubocop
110146
rubocop-performance

gemfiles/Gemfile-rails-7-0

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# frozen_string_literal: true
2+
3+
source "https://rubygems.org"
4+
5+
gemspec path: ".."
6+
7+
gem "activemodel", "~> 7.0.0"
8+
gem "railties", "~> 7.0.0"
9+
gem "mocha"
10+
gem "rails-controller-testing"
11+
gem "rubocop"
12+
gem "rubocop-performance"

test/action_controller/respond_with_test.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -763,7 +763,7 @@ def with_test_route_set
763763
resources :quiz_stores do
764764
resources :customers
765765
end
766-
ActiveSupport::Deprecation.silence do
766+
(ActionDispatch.try(:deprecator) || ActiveSupport::Deprecation).silence do
767767
get ":controller/:action"
768768
end
769769
end

test/test_helper.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
Responders::Routes = ActionDispatch::Routing::RouteSet.new
2323
Responders::Routes.draw do
2424
resources :news
25-
ActiveSupport::Deprecation.silence do
25+
(ActionDispatch.try(:deprecator) || ActiveSupport::Deprecation).silence do
2626
get "/admin/:action", controller: "admin/addresses"
2727
get "/:controller(/:action(/:id))"
2828
end

0 commit comments

Comments
 (0)