Skip to content

Commit 643280a

Browse files
authored
Update all of rails to version 7.2.0 (#1219)
1 parent 3d9f92a commit 643280a

File tree

5 files changed

+80
-71
lines changed

5 files changed

+80
-71
lines changed

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
77

88
gem "dotenv-rails"
99

10-
gem "rails", "~> 7.1.0"
10+
gem "rails", "~> 7.2.0"
1111

1212
gem "bcrypt"
1313
gem "bootsnap", require: false

Gemfile.lock

Lines changed: 66 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -1,80 +1,76 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
actioncable (7.1.3.4)
5-
actionpack (= 7.1.3.4)
6-
activesupport (= 7.1.3.4)
4+
actioncable (7.2.0)
5+
actionpack (= 7.2.0)
6+
activesupport (= 7.2.0)
77
nio4r (~> 2.0)
88
websocket-driver (>= 0.6.1)
99
zeitwerk (~> 2.6)
10-
actionmailbox (7.1.3.4)
11-
actionpack (= 7.1.3.4)
12-
activejob (= 7.1.3.4)
13-
activerecord (= 7.1.3.4)
14-
activestorage (= 7.1.3.4)
15-
activesupport (= 7.1.3.4)
16-
mail (>= 2.7.1)
17-
net-imap
18-
net-pop
19-
net-smtp
20-
actionmailer (7.1.3.4)
21-
actionpack (= 7.1.3.4)
22-
actionview (= 7.1.3.4)
23-
activejob (= 7.1.3.4)
24-
activesupport (= 7.1.3.4)
25-
mail (~> 2.5, >= 2.5.4)
26-
net-imap
27-
net-pop
28-
net-smtp
10+
actionmailbox (7.2.0)
11+
actionpack (= 7.2.0)
12+
activejob (= 7.2.0)
13+
activerecord (= 7.2.0)
14+
activestorage (= 7.2.0)
15+
activesupport (= 7.2.0)
16+
mail (>= 2.8.0)
17+
actionmailer (7.2.0)
18+
actionpack (= 7.2.0)
19+
actionview (= 7.2.0)
20+
activejob (= 7.2.0)
21+
activesupport (= 7.2.0)
22+
mail (>= 2.8.0)
2923
rails-dom-testing (~> 2.2)
30-
actionpack (7.1.3.4)
31-
actionview (= 7.1.3.4)
32-
activesupport (= 7.1.3.4)
24+
actionpack (7.2.0)
25+
actionview (= 7.2.0)
26+
activesupport (= 7.2.0)
3327
nokogiri (>= 1.8.5)
3428
racc
35-
rack (>= 2.2.4)
29+
rack (>= 2.2.4, < 3.2)
3630
rack-session (>= 1.0.1)
3731
rack-test (>= 0.6.3)
3832
rails-dom-testing (~> 2.2)
3933
rails-html-sanitizer (~> 1.6)
40-
actiontext (7.1.3.4)
41-
actionpack (= 7.1.3.4)
42-
activerecord (= 7.1.3.4)
43-
activestorage (= 7.1.3.4)
44-
activesupport (= 7.1.3.4)
34+
useragent (~> 0.16)
35+
actiontext (7.2.0)
36+
actionpack (= 7.2.0)
37+
activerecord (= 7.2.0)
38+
activestorage (= 7.2.0)
39+
activesupport (= 7.2.0)
4540
globalid (>= 0.6.0)
4641
nokogiri (>= 1.8.5)
47-
actionview (7.1.3.4)
48-
activesupport (= 7.1.3.4)
42+
actionview (7.2.0)
43+
activesupport (= 7.2.0)
4944
builder (~> 3.1)
5045
erubi (~> 1.11)
5146
rails-dom-testing (~> 2.2)
5247
rails-html-sanitizer (~> 1.6)
53-
activejob (7.1.3.4)
54-
activesupport (= 7.1.3.4)
48+
activejob (7.2.0)
49+
activesupport (= 7.2.0)
5550
globalid (>= 0.3.6)
56-
activemodel (7.1.3.4)
57-
activesupport (= 7.1.3.4)
58-
activerecord (7.1.3.4)
59-
activemodel (= 7.1.3.4)
60-
activesupport (= 7.1.3.4)
51+
activemodel (7.2.0)
52+
activesupport (= 7.2.0)
53+
activerecord (7.2.0)
54+
activemodel (= 7.2.0)
55+
activesupport (= 7.2.0)
6156
timeout (>= 0.4.0)
62-
activestorage (7.1.3.4)
63-
actionpack (= 7.1.3.4)
64-
activejob (= 7.1.3.4)
65-
activerecord (= 7.1.3.4)
66-
activesupport (= 7.1.3.4)
57+
activestorage (7.2.0)
58+
actionpack (= 7.2.0)
59+
activejob (= 7.2.0)
60+
activerecord (= 7.2.0)
61+
activesupport (= 7.2.0)
6762
marcel (~> 1.0)
68-
activesupport (7.1.3.4)
63+
activesupport (7.2.0)
6964
base64
7065
bigdecimal
71-
concurrent-ruby (~> 1.0, >= 1.0.2)
66+
concurrent-ruby (~> 1.0, >= 1.3.1)
7267
connection_pool (>= 2.2.5)
7368
drb
7469
i18n (>= 1.6, < 2)
70+
logger (>= 1.4.2)
7571
minitest (>= 5.1)
76-
mutex_m
77-
tzinfo (~> 2.0)
72+
securerandom (>= 0.3)
73+
tzinfo (~> 2.0, >= 2.0.5)
7874
addressable (2.8.7)
7975
public_suffix (>= 2.0.2, < 7.0)
8076
ast (2.4.2)
@@ -173,6 +169,7 @@ GEM
173169
reline (>= 0.4.2)
174170
json (2.7.2)
175171
language_server-protocol (3.17.0.3)
172+
logger (1.6.0)
176173
loofah (2.22.0)
177174
crass (~> 1.0.2)
178175
nokogiri (>= 1.12.0)
@@ -190,7 +187,6 @@ GEM
190187
msgpack (1.7.2)
191188
multi_xml (0.7.1)
192189
bigdecimal (~> 3.1)
193-
mutex_m (0.2.0)
194190
net-imap (0.4.14)
195191
date
196192
net-protocol
@@ -232,31 +228,31 @@ GEM
232228
rackup (2.1.0)
233229
rack (>= 3)
234230
webrick (~> 1.8)
235-
rails (7.1.3.4)
236-
actioncable (= 7.1.3.4)
237-
actionmailbox (= 7.1.3.4)
238-
actionmailer (= 7.1.3.4)
239-
actionpack (= 7.1.3.4)
240-
actiontext (= 7.1.3.4)
241-
actionview (= 7.1.3.4)
242-
activejob (= 7.1.3.4)
243-
activemodel (= 7.1.3.4)
244-
activerecord (= 7.1.3.4)
245-
activestorage (= 7.1.3.4)
246-
activesupport (= 7.1.3.4)
231+
rails (7.2.0)
232+
actioncable (= 7.2.0)
233+
actionmailbox (= 7.2.0)
234+
actionmailer (= 7.2.0)
235+
actionpack (= 7.2.0)
236+
actiontext (= 7.2.0)
237+
actionview (= 7.2.0)
238+
activejob (= 7.2.0)
239+
activemodel (= 7.2.0)
240+
activerecord (= 7.2.0)
241+
activestorage (= 7.2.0)
242+
activesupport (= 7.2.0)
247243
bundler (>= 1.15.0)
248-
railties (= 7.1.3.4)
244+
railties (= 7.2.0)
249245
rails-dom-testing (2.2.0)
250246
activesupport (>= 5.0.0)
251247
minitest
252248
nokogiri (>= 1.6)
253249
rails-html-sanitizer (1.6.0)
254250
loofah (~> 2.21)
255251
nokogiri (~> 1.14)
256-
railties (7.1.3.4)
257-
actionpack (= 7.1.3.4)
258-
activesupport (= 7.1.3.4)
259-
irb
252+
railties (7.2.0)
253+
actionpack (= 7.2.0)
254+
activesupport (= 7.2.0)
255+
irb (~> 1.13)
260256
rackup (>= 1.0.0)
261257
rake (>= 12.2)
262258
thor (~> 1.0, >= 1.2.2)
@@ -331,6 +327,7 @@ GEM
331327
rb-fsevent (~> 0.9, >= 0.9.4)
332328
rb-inotify (~> 0.9, >= 0.9.7)
333329
sax-machine (1.3.2)
330+
securerandom (0.3.1)
334331
selenium-webdriver (4.10.0)
335332
rexml (~> 3.2, >= 3.2.5)
336333
rubyzip (>= 1.2.2, < 3.0)
@@ -366,6 +363,7 @@ GEM
366363
uglifier (4.2.0)
367364
execjs (>= 0.3.0, < 3)
368365
unicode-display_width (2.5.0)
366+
useragent (0.16.10)
369367
virtus (2.0.0)
370368
axiom-types (~> 0.1)
371369
coercible (~> 1.0)
@@ -416,7 +414,7 @@ DEPENDENCIES
416414
pry-byebug
417415
puma (~> 6.4)
418416
rack-ssl
419-
rails (~> 7.1.0)
417+
rails (~> 7.2.0)
420418
rspec
421419
rspec-rails
422420
rubocop

app/models/migration_status.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
module MigrationStatus
44
def self.call
5-
migrator = ActiveRecord::Base.connection.migration_context.open
5+
migrator = ActiveRecord::Base.connection.pool.migration_context.open
66

77
migrator.pending_migrations.map do |migration|
88
"#{migration.name} - #{migration.version}"

spec/models/migration_status_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
RSpec.describe "MigrationStatus" do
44
it "returns array of strings representing pending migrations" do
5-
migrator = ActiveRecord::Base.connection.migration_context.open
5+
migrator = ActiveRecord::Base.connection.pool.migration_context.open
66

77
allow(migrator).to receive(:pending_migrations).and_return(
88
[

spec/requests/feeds_controller_spec.rb

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,10 +101,21 @@ def params(feed, **overrides)
101101
end
102102
end
103103

104+
def with_test_adapter
105+
adapter = ActiveJob::Base.queue_adapter
106+
ActiveJob::Base.queue_adapter = :test
107+
108+
yield
109+
110+
ActiveJob::Base.queue_adapter = adapter
111+
end
112+
104113
describe "#create" do
105114
context "when the feed url is valid" do
106115
feed_url = "http://example.com/"
107116

117+
around { |example| with_test_adapter(&example) }
118+
108119
it "adds the feed and queues it to be fetched" do
109120
login_as(default_user)
110121
stub_request(:get, feed_url).to_return(status: 200, body: "<rss></rss>")

0 commit comments

Comments
 (0)