Skip to content

Commit 542df36

Browse files
carlosantoniodasilvacarlosantoniodasilva
authored
Merge pull request heartcombo#5450 from petergoldstein/feature/add_ruby_3_1
Add Ruby 3.1 to CI matrix
2 parents 025b1c8 + 3c5acaf commit 542df36

9 files changed

Lines changed: 132 additions & 88 deletions

File tree

‎.github/workflows/test.yml‎

Lines changed: 23 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ jobs:
2323
- 2.5
2424
- 2.6
2525
- 2.7
26-
- 3.0
26+
- '3.0'
27+
- 3.1
2728
env:
2829
- DEVISE_ORM=active_record
2930
- DEVISE_ORM=mongoid
@@ -94,16 +95,32 @@ jobs:
9495
gemfile: gemfiles/Gemfile-rails-5-1
9596
- ruby: 2.7
9697
gemfile: gemfiles/Gemfile-rails-5-2
97-
- ruby: 3.0
98+
- ruby: '3.0'
9899
gemfile: gemfiles/Gemfile-rails-4-1
99-
- ruby: 3.0
100+
- ruby: '3.0'
100101
gemfile: gemfiles/Gemfile-rails-4-2
101-
- ruby: 3.0
102+
- ruby: '3.0'
102103
gemfile: gemfiles/Gemfile-rails-5-0
103-
- ruby: 3.0
104+
- ruby: '3.0'
104105
gemfile: gemfiles/Gemfile-rails-5-1
105-
- ruby: 3.0
106+
- ruby: '3.0'
106107
gemfile: gemfiles/Gemfile-rails-5-2
108+
- ruby: 3.1
109+
gemfile: gemfiles/Gemfile-rails-5-1
110+
- ruby: 3.1
111+
gemfile: gemfiles/Gemfile-rails-5-2
112+
- ruby: 3.1
113+
gemfile: gemfiles/Gemfile-rails-4-1
114+
- ruby: 3.1
115+
gemfile: gemfiles/Gemfile-rails-4-2
116+
- ruby: 3.1
117+
gemfile: gemfiles/Gemfile-rails-5-0
118+
- ruby: 3.1
119+
gemfile: gemfiles/Gemfile-rails-5-1
120+
- ruby: 3.1
121+
gemfile: gemfiles/Gemfile-rails-5-2
122+
- ruby: 3.1
123+
gemfile: gemfiles/Gemfile-rails-6-0
107124
- env: DEVISE_ORM=mongoid
108125
gemfile: Gemfile
109126
- env: DEVISE_ORM=mongoid

‎Gemfile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ gem "rails-controller-testing", github: "rails/rails-controller-testing"
1414
gem "responders", "~> 3.0"
1515

1616
group :test do
17+
gem "nokogiri", "< 1.13"
1718
gem "omniauth-facebook"
1819
gem "omniauth-openid"
1920
gem "rexml"

‎Gemfile.lock‎

Lines changed: 96 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
GIT
22
remote: https://github.com/rails/rails-controller-testing.git
3-
revision: 36e84822ee997d69c971f03f3f3759ee4f4bdc37
3+
revision: 351c0162df0771c0c48e6a5a886c4c2f0a5d1a74
44
specs:
55
rails-controller-testing (1.0.5)
66
actionpack (>= 5.0.1.rc1)
@@ -20,61 +20,67 @@ PATH
2020
GEM
2121
remote: https://rubygems.org/
2222
specs:
23-
actioncable (7.0.0)
24-
actionpack (= 7.0.0)
25-
activesupport (= 7.0.0)
23+
actioncable (7.0.2.2)
24+
actionpack (= 7.0.2.2)
25+
activesupport (= 7.0.2.2)
2626
nio4r (~> 2.0)
2727
websocket-driver (>= 0.6.1)
28-
actionmailbox (7.0.0)
29-
actionpack (= 7.0.0)
30-
activejob (= 7.0.0)
31-
activerecord (= 7.0.0)
32-
activestorage (= 7.0.0)
33-
activesupport (= 7.0.0)
28+
actionmailbox (7.0.2.2)
29+
actionpack (= 7.0.2.2)
30+
activejob (= 7.0.2.2)
31+
activerecord (= 7.0.2.2)
32+
activestorage (= 7.0.2.2)
33+
activesupport (= 7.0.2.2)
3434
mail (>= 2.7.1)
35-
actionmailer (7.0.0)
36-
actionpack (= 7.0.0)
37-
actionview (= 7.0.0)
38-
activejob (= 7.0.0)
39-
activesupport (= 7.0.0)
35+
net-imap
36+
net-pop
37+
net-smtp
38+
actionmailer (7.0.2.2)
39+
actionpack (= 7.0.2.2)
40+
actionview (= 7.0.2.2)
41+
activejob (= 7.0.2.2)
42+
activesupport (= 7.0.2.2)
4043
mail (~> 2.5, >= 2.5.4)
44+
net-imap
45+
net-pop
46+
net-smtp
4147
rails-dom-testing (~> 2.0)
42-
actionpack (7.0.0)
43-
actionview (= 7.0.0)
44-
activesupport (= 7.0.0)
48+
actionpack (7.0.2.2)
49+
actionview (= 7.0.2.2)
50+
activesupport (= 7.0.2.2)
4551
rack (~> 2.0, >= 2.2.0)
4652
rack-test (>= 0.6.3)
4753
rails-dom-testing (~> 2.0)
4854
rails-html-sanitizer (~> 1.0, >= 1.2.0)
49-
actiontext (7.0.0)
50-
actionpack (= 7.0.0)
51-
activerecord (= 7.0.0)
52-
activestorage (= 7.0.0)
53-
activesupport (= 7.0.0)
55+
actiontext (7.0.2.2)
56+
actionpack (= 7.0.2.2)
57+
activerecord (= 7.0.2.2)
58+
activestorage (= 7.0.2.2)
59+
activesupport (= 7.0.2.2)
5460
globalid (>= 0.6.0)
5561
nokogiri (>= 1.8.5)
56-
actionview (7.0.0)
57-
activesupport (= 7.0.0)
62+
actionview (7.0.2.2)
63+
activesupport (= 7.0.2.2)
5864
builder (~> 3.1)
5965
erubi (~> 1.4)
6066
rails-dom-testing (~> 2.0)
6167
rails-html-sanitizer (~> 1.1, >= 1.2.0)
62-
activejob (7.0.0)
63-
activesupport (= 7.0.0)
68+
activejob (7.0.2.2)
69+
activesupport (= 7.0.2.2)
6470
globalid (>= 0.3.6)
65-
activemodel (7.0.0)
66-
activesupport (= 7.0.0)
67-
activerecord (7.0.0)
68-
activemodel (= 7.0.0)
69-
activesupport (= 7.0.0)
70-
activestorage (7.0.0)
71-
actionpack (= 7.0.0)
72-
activejob (= 7.0.0)
73-
activerecord (= 7.0.0)
74-
activesupport (= 7.0.0)
71+
activemodel (7.0.2.2)
72+
activesupport (= 7.0.2.2)
73+
activerecord (7.0.2.2)
74+
activemodel (= 7.0.2.2)
75+
activesupport (= 7.0.2.2)
76+
activestorage (7.0.2.2)
77+
actionpack (= 7.0.2.2)
78+
activejob (= 7.0.2.2)
79+
activerecord (= 7.0.2.2)
80+
activesupport (= 7.0.2.2)
7581
marcel (~> 1.0)
7682
mini_mime (>= 1.1.0)
77-
activesupport (7.0.0)
83+
activesupport (7.0.2.2)
7884
concurrent-ruby (~> 1.0, >= 1.0.2)
7985
i18n (>= 1.6, < 2)
8086
minitest (>= 5.1)
@@ -83,33 +89,20 @@ GEM
8389
builder (3.2.4)
8490
concurrent-ruby (1.1.9)
8591
crass (1.0.6)
92+
digest (3.1.0)
8693
erubi (1.10.0)
87-
faraday (1.8.0)
88-
faraday-em_http (~> 1.0)
89-
faraday-em_synchrony (~> 1.0)
90-
faraday-excon (~> 1.1)
91-
faraday-httpclient (~> 1.0.1)
92-
faraday-net_http (~> 1.0)
93-
faraday-net_http_persistent (~> 1.1)
94-
faraday-patron (~> 1.0)
95-
faraday-rack (~> 1.0)
96-
multipart-post (>= 1.2, < 3)
94+
faraday (2.2.0)
95+
faraday-net_http (~> 2.0)
9796
ruby2_keywords (>= 0.0.4)
98-
faraday-em_http (1.0.0)
99-
faraday-em_synchrony (1.0.0)
100-
faraday-excon (1.1.0)
101-
faraday-httpclient (1.0.1)
102-
faraday-net_http (1.0.1)
103-
faraday-net_http_persistent (1.2.0)
104-
faraday-patron (1.0.0)
105-
faraday-rack (1.0.0)
97+
faraday-net_http (2.0.1)
10698
globalid (1.0.0)
10799
activesupport (>= 5.0)
108100
hashie (5.0.0)
109-
i18n (1.8.11)
101+
i18n (1.10.0)
110102
concurrent-ruby (~> 1.0)
103+
io-wait (0.2.1)
111104
jwt (2.3.0)
112-
loofah (2.13.0)
105+
loofah (2.14.0)
113106
crass (~> 1.0.2)
114107
nokogiri (>= 1.5.9)
115108
mail (2.7.1)
@@ -122,13 +115,27 @@ GEM
122115
mocha (1.13.0)
123116
multi_json (1.15.0)
124117
multi_xml (0.6.0)
125-
multipart-post (2.1.1)
118+
net-imap (0.2.3)
119+
digest
120+
net-protocol
121+
strscan
122+
net-pop (0.1.1)
123+
digest
124+
net-protocol
125+
timeout
126+
net-protocol (0.1.2)
127+
io-wait
128+
timeout
129+
net-smtp (0.3.1)
130+
digest
131+
net-protocol
132+
timeout
126133
nio4r (2.5.8)
127134
nokogiri (1.12.5)
128135
mini_portile2 (~> 2.6.1)
129136
racc (~> 1.4)
130-
oauth2 (1.4.7)
131-
faraday (>= 0.8, < 2.0)
137+
oauth2 (1.4.9)
138+
faraday (>= 0.17.3, < 3.0)
132139
jwt (>= 1.0, < 3.0)
133140
multi_json (~> 1.3)
134141
multi_xml (~> 0.5)
@@ -146,52 +153,58 @@ GEM
146153
omniauth (>= 1.0, < 3.0)
147154
rack-openid (~> 1.4.0)
148155
orm_adapter (0.5.0)
156+
psych (4.0.3)
157+
stringio
149158
racc (1.6.0)
150159
rack (2.2.3)
151160
rack-openid (1.4.2)
152161
rack (>= 1.1.0)
153162
ruby-openid (>= 2.1.8)
154-
rack-protection (2.1.0)
163+
rack-protection (2.2.0)
155164
rack
156165
rack-test (1.1.0)
157166
rack (>= 1.0, < 3)
158-
rails (7.0.0)
159-
actioncable (= 7.0.0)
160-
actionmailbox (= 7.0.0)
161-
actionmailer (= 7.0.0)
162-
actionpack (= 7.0.0)
163-
actiontext (= 7.0.0)
164-
actionview (= 7.0.0)
165-
activejob (= 7.0.0)
166-
activemodel (= 7.0.0)
167-
activerecord (= 7.0.0)
168-
activestorage (= 7.0.0)
169-
activesupport (= 7.0.0)
167+
rails (7.0.2.2)
168+
actioncable (= 7.0.2.2)
169+
actionmailbox (= 7.0.2.2)
170+
actionmailer (= 7.0.2.2)
171+
actionpack (= 7.0.2.2)
172+
actiontext (= 7.0.2.2)
173+
actionview (= 7.0.2.2)
174+
activejob (= 7.0.2.2)
175+
activemodel (= 7.0.2.2)
176+
activerecord (= 7.0.2.2)
177+
activestorage (= 7.0.2.2)
178+
activesupport (= 7.0.2.2)
170179
bundler (>= 1.15.0)
171-
railties (= 7.0.0)
180+
railties (= 7.0.2.2)
172181
rails-dom-testing (2.0.3)
173182
activesupport (>= 4.2.0)
174183
nokogiri (>= 1.6)
175184
rails-html-sanitizer (1.4.2)
176185
loofah (~> 2.3)
177-
railties (7.0.0)
178-
actionpack (= 7.0.0)
179-
activesupport (= 7.0.0)
186+
railties (7.0.2.2)
187+
actionpack (= 7.0.2.2)
188+
activesupport (= 7.0.2.2)
180189
method_source
181190
rake (>= 12.2)
182191
thor (~> 1.0)
183192
zeitwerk (~> 2.5)
184193
rake (13.0.6)
185-
rdoc (6.3.3)
194+
rdoc (6.4.0)
195+
psych (>= 4.0.0)
186196
responders (3.0.1)
187197
actionpack (>= 5.0)
188198
railties (>= 5.0)
189199
rexml (3.2.5)
190200
ruby-openid (2.9.2)
191201
ruby2_keywords (0.0.5)
192202
sqlite3 (1.4.2)
193-
thor (1.1.0)
203+
stringio (3.0.1)
204+
strscan (3.0.1)
205+
thor (1.2.1)
194206
timecop (0.9.4)
207+
timeout (0.2.0)
195208
tzinfo (2.0.4)
196209
concurrent-ruby (~> 1.0)
197210
warden (1.2.9)
@@ -203,14 +216,15 @@ GEM
203216
websocket-driver (0.7.5)
204217
websocket-extensions (>= 0.1.0)
205218
websocket-extensions (0.1.5)
206-
zeitwerk (2.5.1)
219+
zeitwerk (2.5.4)
207220

208221
PLATFORMS
209222
ruby
210223

211224
DEPENDENCIES
212225
devise!
213226
mocha (~> 1.1)
227+
nokogiri (< 1.13)
214228
omniauth
215229
omniauth-facebook
216230
omniauth-oauth2
@@ -225,4 +239,4 @@ DEPENDENCIES
225239
webrat (= 0.7.3)
226240

227241
BUNDLED WITH
228-
2.2.33
242+
2.3.4

‎gemfiles/Gemfile-rails-5-0‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ gem "rails-controller-testing"
1414
gem "responders", "~> 2.1"
1515

1616
group :test do
17+
gem "nokogiri", "< 1.13"
1718
gem "omniauth-facebook"
1819
gem "omniauth-openid"
1920
gem "timecop"

‎gemfiles/Gemfile-rails-5-1‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ gem "rails-controller-testing"
1212
gem "responders", "~> 2.1"
1313

1414
group :test do
15+
gem "nokogiri", "< 1.13"
1516
gem "omniauth-facebook"
1617
gem "omniauth-openid"
1718
gem "timecop"

‎gemfiles/Gemfile-rails-5-2‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ gem "rails-controller-testing"
1212
gem "responders", "~> 2.1"
1313

1414
group :test do
15+
gem "nokogiri", "< 1.13"
1516
gem "omniauth-facebook"
1617
gem "omniauth-openid"
1718
gem "timecop"

‎gemfiles/Gemfile-rails-6-0‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ gem "rails-controller-testing", github: "rails/rails-controller-testing"
1212
gem "responders", "~> 3.0"
1313

1414
group :test do
15+
gem "nokogiri", "< 1.13"
1516
gem "omniauth-facebook"
1617
gem "omniauth-openid"
1718
gem "rexml"

‎gemfiles/Gemfile-rails-6-1‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,14 @@ gem "rails-controller-testing", github: "rails/rails-controller-testing"
1313

1414
gem "responders", "~> 3.0"
1515

16+
if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new("3.1")
17+
gem "net-smtp", require: false
18+
gem "net-imap", require: false
19+
gem "net-pop", require: false
20+
end
21+
1622
group :test do
23+
gem "nokogiri", "< 1.13"
1724
gem "omniauth-facebook"
1825
gem "omniauth-openid"
1926
gem "rexml"

‎gemfiles/Gemfile-rails-main‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ gem "rails-controller-testing", github: "rails/rails-controller-testing"
1414
gem "responders", "~> 3.0"
1515

1616
group :test do
17+
gem "nokogiri", "< 1.13"
1718
gem "omniauth-facebook"
1819
gem "omniauth-openid"
1920
gem "rexml"

0 commit comments

Comments
 (0)