Skip to content

Commit 1c19909

Browse files
chore(deps): update dependency rails to v7 (#324)
* chore(deps): update dependency rails to v7 * chore(deps): update dependency rails to v7 * Fix dependencies * Fix job name * Fix dependencies * Fix lint --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Wilco van Beijnum <wilcovanbeijnum@gmail.com>
1 parent f6728a8 commit 1c19909

File tree

4 files changed

+119
-90
lines changed

4 files changed

+119
-90
lines changed

.vscode/settings.json

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"files.exclude": {
3+
"**/.git": true,
4+
"**/.svn": true,
5+
"**/.hg": true,
6+
"**/CVS": true,
7+
"**/.DS_Store": true,
8+
"**/Thumbs.db": true
9+
},
10+
"hide-files.files": []
11+
}

Gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ gem 'puma', '~> 6.0'
3232
gem 'pundit', '~> 2.0'
3333
gem 'rack-attack', '~> 6.0'
3434
gem 'rack-cors', '~> 2.0', '>= 2.0.1', require: 'rack/cors'
35-
gem 'rails', '~> 6.0'
35+
gem 'rails', '~> 7.0', '>= 7.0.4.3'
3636
gem 'rails-i18n', '~> 7.0'
3737
gem 'redis', '~> 4.0'
3838
gem 'roo', '~> 2.9'
@@ -43,7 +43,7 @@ gem 'sepa_king', '~> 0.11'
4343
gem 'sidekiq', '~> 6.0'
4444
gem 'sidekiq-scheduler', '~> 5.0', '>= 5.0.2'
4545
gem 'slack-notifier', '~> 2.0'
46-
gem 'validates_timeliness', '~> 6.0.0.beta2'
46+
gem 'validates_timeliness', '~> 7.0.0.beta2'
4747
gem 'vpim', '~> 13.11'
4848

4949
group :development, :test do

Gemfile.lock

Lines changed: 101 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -22,65 +22,71 @@ GIT
2222
GEM
2323
remote: https://rubygems.org/
2424
specs:
25-
actioncable (6.1.5.1)
26-
actionpack (= 6.1.5.1)
27-
activesupport (= 6.1.5.1)
25+
actioncable (7.0.4.3)
26+
actionpack (= 7.0.4.3)
27+
activesupport (= 7.0.4.3)
2828
nio4r (~> 2.0)
2929
websocket-driver (>= 0.6.1)
30-
actionmailbox (6.1.5.1)
31-
actionpack (= 6.1.5.1)
32-
activejob (= 6.1.5.1)
33-
activerecord (= 6.1.5.1)
34-
activestorage (= 6.1.5.1)
35-
activesupport (= 6.1.5.1)
30+
actionmailbox (7.0.4.3)
31+
actionpack (= 7.0.4.3)
32+
activejob (= 7.0.4.3)
33+
activerecord (= 7.0.4.3)
34+
activestorage (= 7.0.4.3)
35+
activesupport (= 7.0.4.3)
3636
mail (>= 2.7.1)
37-
actionmailer (6.1.5.1)
38-
actionpack (= 6.1.5.1)
39-
actionview (= 6.1.5.1)
40-
activejob (= 6.1.5.1)
41-
activesupport (= 6.1.5.1)
37+
net-imap
38+
net-pop
39+
net-smtp
40+
actionmailer (7.0.4.3)
41+
actionpack (= 7.0.4.3)
42+
actionview (= 7.0.4.3)
43+
activejob (= 7.0.4.3)
44+
activesupport (= 7.0.4.3)
4245
mail (~> 2.5, >= 2.5.4)
46+
net-imap
47+
net-pop
48+
net-smtp
4349
rails-dom-testing (~> 2.0)
44-
actionpack (6.1.5.1)
45-
actionview (= 6.1.5.1)
46-
activesupport (= 6.1.5.1)
47-
rack (~> 2.0, >= 2.0.9)
50+
actionpack (7.0.4.3)
51+
actionview (= 7.0.4.3)
52+
activesupport (= 7.0.4.3)
53+
rack (~> 2.0, >= 2.2.0)
4854
rack-test (>= 0.6.3)
4955
rails-dom-testing (~> 2.0)
5056
rails-html-sanitizer (~> 1.0, >= 1.2.0)
51-
actiontext (6.1.5.1)
52-
actionpack (= 6.1.5.1)
53-
activerecord (= 6.1.5.1)
54-
activestorage (= 6.1.5.1)
55-
activesupport (= 6.1.5.1)
57+
actiontext (7.0.4.3)
58+
actionpack (= 7.0.4.3)
59+
activerecord (= 7.0.4.3)
60+
activestorage (= 7.0.4.3)
61+
activesupport (= 7.0.4.3)
62+
globalid (>= 0.6.0)
5663
nokogiri (>= 1.8.5)
57-
actionview (6.1.5.1)
58-
activesupport (= 6.1.5.1)
64+
actionview (7.0.4.3)
65+
activesupport (= 7.0.4.3)
5966
builder (~> 3.1)
6067
erubi (~> 1.4)
6168
rails-dom-testing (~> 2.0)
6269
rails-html-sanitizer (~> 1.1, >= 1.2.0)
63-
activejob (6.1.5.1)
64-
activesupport (= 6.1.5.1)
70+
activejob (7.0.4.3)
71+
activesupport (= 7.0.4.3)
6572
globalid (>= 0.3.6)
66-
activemodel (6.1.5.1)
67-
activesupport (= 6.1.5.1)
68-
activerecord (6.1.5.1)
69-
activemodel (= 6.1.5.1)
70-
activesupport (= 6.1.5.1)
71-
activestorage (6.1.5.1)
72-
actionpack (= 6.1.5.1)
73-
activejob (= 6.1.5.1)
74-
activerecord (= 6.1.5.1)
75-
activesupport (= 6.1.5.1)
73+
activemodel (7.0.4.3)
74+
activesupport (= 7.0.4.3)
75+
activerecord (7.0.4.3)
76+
activemodel (= 7.0.4.3)
77+
activesupport (= 7.0.4.3)
78+
activestorage (7.0.4.3)
79+
actionpack (= 7.0.4.3)
80+
activejob (= 7.0.4.3)
81+
activerecord (= 7.0.4.3)
82+
activesupport (= 7.0.4.3)
7683
marcel (~> 1.0)
7784
mini_mime (>= 1.1.0)
78-
activesupport (6.1.5.1)
85+
activesupport (7.0.4.3)
7986
concurrent-ruby (~> 1.0, >= 1.0.2)
8087
i18n (>= 1.6, < 2)
8188
minitest (>= 5.1)
8289
tzinfo (~> 2.0)
83-
zeitwerk (~> 2.3)
8490
addressable (2.8.0)
8591
public_suffix (>= 2.0.2, < 5.0)
8692
ast (2.4.2)
@@ -130,6 +136,8 @@ GEM
130136
crack (0.4.5)
131137
rexml
132138
crass (1.0.6)
139+
date (3.3.3)
140+
date (3.3.3-java)
133141
dav4rack_ext (1.0.0)
134142
dav4rack
135143
http_router
@@ -147,7 +155,7 @@ GEM
147155
dotenv-rails (2.7.6)
148156
dotenv (= 2.7.6)
149157
railties (>= 3.2)
150-
erubi (1.10.0)
158+
erubi (1.12.0)
151159
et-orbi (1.2.7)
152160
tzinfo
153161
exifr (1.3.9)
@@ -179,7 +187,7 @@ GEM
179187
fuubar (2.5.1)
180188
rspec-core (~> 3.0)
181189
ruby-progressbar (~> 1.4)
182-
globalid (1.0.0)
190+
globalid (1.1.0)
183191
activesupport (>= 5.0)
184192
guard (2.18.0)
185193
formatador (>= 0.2.4)
@@ -208,7 +216,7 @@ GEM
208216
http_router (0.11.2)
209217
rack (>= 1.0.0)
210218
url_mount (~> 0.2.1)
211-
i18n (1.12.0)
219+
i18n (1.13.0)
212220
concurrent-ruby (~> 1.0)
213221
iban-tools (1.1.0)
214222
icalendar (2.7.1)
@@ -234,12 +242,15 @@ GEM
234242
llhttp-ffi (0.4.0)
235243
ffi-compiler (~> 1.0)
236244
rake (~> 13.0)
237-
loofah (2.16.0)
245+
loofah (2.20.0)
238246
crass (~> 1.0.2)
239247
nokogiri (>= 1.5.9)
240248
lumberjack (1.2.8)
241-
mail (2.7.1)
249+
mail (2.8.1)
242250
mini_mime (>= 0.1.1)
251+
net-imap
252+
net-pop
253+
net-smtp
243254
marcel (1.0.2)
244255
message_bus (4.2.0)
245256
rack (>= 1.1.3)
@@ -252,22 +263,31 @@ GEM
252263
rake
253264
mini_magick (4.11.0)
254265
mini_mime (1.1.2)
255-
mini_portile2 (2.8.0)
256-
minitest (5.16.3)
266+
mini_portile2 (2.8.2)
267+
minitest (5.18.0)
257268
msgpack (1.4.5)
258269
msgpack (1.4.5-java)
259270
nenv (0.3.0)
271+
net-imap (0.3.4)
272+
date
273+
net-protocol
274+
net-pop (0.1.2)
275+
net-protocol
276+
net-protocol (0.2.1)
277+
timeout
278+
net-smtp (0.3.3)
279+
net-protocol
260280
netrc (0.11.0)
261281
nio4r (2.5.8)
262282
nio4r (2.5.8-java)
263-
nokogiri (1.13.4)
283+
nokogiri (1.14.3)
264284
mini_portile2 (~> 2.8.0)
265285
racc (~> 1.4)
266-
nokogiri (1.13.4-java)
286+
nokogiri (1.14.3-java)
267287
racc (~> 1.4)
268-
nokogiri (1.13.4-x64-mingw32)
288+
nokogiri (1.14.3-x64-mingw32)
269289
racc (~> 1.4)
270-
nokogiri (1.13.4-x86-mingw32)
290+
nokogiri (1.14.3-x86-mingw32)
271291
racc (~> 1.4)
272292
notiffany (0.1.3)
273293
nenv (~> 0.1)
@@ -305,46 +325,46 @@ GEM
305325
pundit (2.2.0)
306326
activesupport (>= 3.0.0)
307327
raabro (1.4.0)
308-
racc (1.6.0)
309-
racc (1.6.0-java)
310-
rack (2.2.6.4)
328+
racc (1.6.2)
329+
racc (1.6.2-java)
330+
rack (2.2.7)
311331
rack-attack (6.6.0)
312332
rack (>= 1.0, < 3)
313333
rack-cors (2.0.1)
314334
rack (>= 2.0.0)
315335
rack-mini-profiler (3.0.0)
316336
rack (>= 1.2.0)
317-
rack-test (1.1.0)
318-
rack (>= 1.0, < 3)
319-
rails (6.1.5.1)
320-
actioncable (= 6.1.5.1)
321-
actionmailbox (= 6.1.5.1)
322-
actionmailer (= 6.1.5.1)
323-
actionpack (= 6.1.5.1)
324-
actiontext (= 6.1.5.1)
325-
actionview (= 6.1.5.1)
326-
activejob (= 6.1.5.1)
327-
activemodel (= 6.1.5.1)
328-
activerecord (= 6.1.5.1)
329-
activestorage (= 6.1.5.1)
330-
activesupport (= 6.1.5.1)
337+
rack-test (2.1.0)
338+
rack (>= 1.3)
339+
rails (7.0.4.3)
340+
actioncable (= 7.0.4.3)
341+
actionmailbox (= 7.0.4.3)
342+
actionmailer (= 7.0.4.3)
343+
actionpack (= 7.0.4.3)
344+
actiontext (= 7.0.4.3)
345+
actionview (= 7.0.4.3)
346+
activejob (= 7.0.4.3)
347+
activemodel (= 7.0.4.3)
348+
activerecord (= 7.0.4.3)
349+
activestorage (= 7.0.4.3)
350+
activesupport (= 7.0.4.3)
331351
bundler (>= 1.15.0)
332-
railties (= 6.1.5.1)
333-
sprockets-rails (>= 2.0.0)
352+
railties (= 7.0.4.3)
334353
rails-dom-testing (2.0.3)
335354
activesupport (>= 4.2.0)
336355
nokogiri (>= 1.6)
337-
rails-html-sanitizer (1.4.2)
338-
loofah (~> 2.3)
356+
rails-html-sanitizer (1.5.0)
357+
loofah (~> 2.19, >= 2.19.1)
339358
rails-i18n (7.0.3)
340359
i18n (>= 0.7, < 2)
341360
railties (>= 6.0.0, < 8)
342-
railties (6.1.5.1)
343-
actionpack (= 6.1.5.1)
344-
activesupport (= 6.1.5.1)
361+
railties (7.0.4.3)
362+
actionpack (= 7.0.4.3)
363+
activesupport (= 7.0.4.3)
345364
method_source
346365
rake (>= 12.2)
347366
thor (~> 1.0)
367+
zeitwerk (~> 2.5)
348368
rainbow (3.1.1)
349369
rake (13.0.6)
350370
rb-fsevent (0.11.1)
@@ -463,19 +483,13 @@ GEM
463483
spring-watcher-listen (2.0.1)
464484
listen (>= 2.7, < 4.0)
465485
spring (>= 1.2, < 3.0)
466-
sprockets (4.0.3)
467-
concurrent-ruby (~> 1.0)
468-
rack (> 1, < 3)
469-
sprockets-rails (3.4.2)
470-
actionpack (>= 5.2)
471-
activesupport (>= 5.2)
472-
sprockets (>= 3.0.0)
473486
ssrf_filter (1.0.7)
474487
terminal-notifier-guard (1.7.0)
475488
thor (1.2.1)
476489
tilt (2.1.0)
477490
timecop (0.9.5)
478-
timeliness (0.4.4)
491+
timeliness (0.4.5)
492+
timeout (0.3.2)
479493
tzinfo (2.0.6)
480494
concurrent-ruby (~> 1.0)
481495
tzinfo-data (1.2022.1)
@@ -491,8 +505,8 @@ GEM
491505
url_mount (0.2.1)
492506
rack
493507
uuidtools (2.2.0)
494-
validates_timeliness (6.0.0.beta2)
495-
activemodel (>= 6.0.0, < 7)
508+
validates_timeliness (7.0.0.beta2)
509+
activemodel (>= 7.0.0, < 8)
496510
timeliness (>= 0.3.10, < 1)
497511
vcard_parser (0.0.9)
498512
vcr (6.1.0)
@@ -507,7 +521,7 @@ GEM
507521
websocket-driver (0.7.5-java)
508522
websocket-extensions (>= 0.1.0)
509523
websocket-extensions (0.1.5)
510-
zeitwerk (2.6.6)
524+
zeitwerk (2.6.8)
511525

512526
PLATFORMS
513527
java
@@ -565,7 +579,7 @@ DEPENDENCIES
565579
rack-attack (~> 6.0)
566580
rack-cors (~> 2.0, >= 2.0.1)
567581
rack-mini-profiler
568-
rails (~> 6.0)
582+
rails (~> 7.0, >= 7.0.4.3)
569583
rails-i18n (~> 7.0)
570584
rb-readline
571585
redis (~> 4.0)
@@ -589,7 +603,7 @@ DEPENDENCIES
589603
terminal-notifier-guard
590604
timecop
591605
tzinfo-data
592-
validates_timeliness (~> 6.0.0.beta2)
606+
validates_timeliness (~> 7.0.0.beta2)
593607
vcr
594608
vpim (~> 13.11)
595609
webmock

spec/requests/v1/stored_mails_controller/accept_spec.rb

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,11 @@
88
let(:record_permission) { 'stored_mail.destroy' }
99

1010
it_behaves_like 'a destroyable and permissible model' do
11-
let(:request) { perform_enqueued_jobs(only: ActionMailer::DeliveryJob) { post(record_url) } }
11+
let(:request) do
12+
perform_enqueued_jobs(only: ActionMailer::MailDeliveryJob) do
13+
post(record_url)
14+
end
15+
end
1216
end
1317

1418
context 'sends accept mail' do

0 commit comments

Comments
 (0)