Skip to content

Commit f18c2d9

Browse files
author
Mattia Roccoberton
authored
Merge pull request #22 from blocknotes/support-for-rails-7.0
Support for rails 7.0
2 parents 8d00876 + f81f848 commit f18c2d9

10 files changed

+687
-273
lines changed

‎.github/workflows/specs3.yml‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
---
2+
name: Specs Rails 7.0
3+
4+
on:
5+
pull_request:
6+
branches: [master]
7+
push:
8+
branches: [master]
9+
10+
jobs:
11+
test:
12+
runs-on: ubuntu-latest
13+
14+
strategy:
15+
matrix:
16+
ruby: ['2.7', '3.0']
17+
gemfile: ['rails70_activeadmin']
18+
19+
env:
20+
BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile
21+
22+
steps:
23+
- name: Checkout repository
24+
uses: actions/checkout@v2
25+
26+
- name: Set up Ruby
27+
uses: ruby/setup-ruby@v1
28+
with:
29+
ruby-version: ${{ matrix.ruby }}
30+
bundler-cache: true
31+
32+
- name: Run tests
33+
run: bundle exec rspec --profile
34+
35+
- name: On failure, archive screenshots as artifacts
36+
uses: actions/upload-artifact@v2
37+
if: failure()
38+
with:
39+
name: test-failed-screenshots
40+
path: spec/dummy/tmp/screenshots

‎Appraisals‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,11 @@ appraise 'rails61-activeadmin' do
2626
gem 'activeadmin'
2727
gem 'rails', '~> 6.1.0'
2828
end
29+
30+
appraise 'rails70-activeadmin' do
31+
gem 'activeadmin'
32+
gem 'rails', '~> 7.0.0'
33+
34+
# NOTE: workaround for "undefined method `assets' for #<Rails::Application::Configuration:...>"
35+
gem 'sprockets-rails', '~> 3.4.2'
36+
end

‎gemfiles/rails52_activeadmin20.gemfile.lock‎

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -7,25 +7,25 @@ PATH
77
GEM
88
remote: https://rubygems.org/
99
specs:
10-
actioncable (5.2.6.3)
11-
actionpack (= 5.2.6.3)
10+
actioncable (5.2.7)
11+
actionpack (= 5.2.7)
1212
nio4r (~> 2.0)
1313
websocket-driver (>= 0.6.1)
14-
actionmailer (5.2.6.3)
15-
actionpack (= 5.2.6.3)
16-
actionview (= 5.2.6.3)
17-
activejob (= 5.2.6.3)
14+
actionmailer (5.2.7)
15+
actionpack (= 5.2.7)
16+
actionview (= 5.2.7)
17+
activejob (= 5.2.7)
1818
mail (~> 2.5, >= 2.5.4)
1919
rails-dom-testing (~> 2.0)
20-
actionpack (5.2.6.3)
21-
actionview (= 5.2.6.3)
22-
activesupport (= 5.2.6.3)
20+
actionpack (5.2.7)
21+
actionview (= 5.2.7)
22+
activesupport (= 5.2.7)
2323
rack (~> 2.0, >= 2.0.8)
2424
rack-test (>= 0.6.3)
2525
rails-dom-testing (~> 2.0)
2626
rails-html-sanitizer (~> 1.0, >= 1.0.2)
27-
actionview (5.2.6.3)
28-
activesupport (= 5.2.6.3)
27+
actionview (5.2.7)
28+
activesupport (= 5.2.7)
2929
builder (~> 3.1)
3030
erubi (~> 1.4)
3131
rails-dom-testing (~> 2.0)
@@ -42,20 +42,20 @@ GEM
4242
sass (~> 3.4)
4343
sprockets (>= 3.0, < 4.1)
4444
sprockets-es6 (~> 0.9, >= 0.9.2)
45-
activejob (5.2.6.3)
46-
activesupport (= 5.2.6.3)
45+
activejob (5.2.7)
46+
activesupport (= 5.2.7)
4747
globalid (>= 0.3.6)
48-
activemodel (5.2.6.3)
49-
activesupport (= 5.2.6.3)
50-
activerecord (5.2.6.3)
51-
activemodel (= 5.2.6.3)
52-
activesupport (= 5.2.6.3)
48+
activemodel (5.2.7)
49+
activesupport (= 5.2.7)
50+
activerecord (5.2.7)
51+
activemodel (= 5.2.7)
52+
activesupport (= 5.2.7)
5353
arel (>= 9.0)
54-
activestorage (5.2.6.3)
55-
actionpack (= 5.2.6.3)
56-
activerecord (= 5.2.6.3)
54+
activestorage (5.2.7)
55+
actionpack (= 5.2.7)
56+
activerecord (= 5.2.7)
5757
marcel (~> 1.0.0)
58-
activesupport (5.2.6.3)
58+
activesupport (5.2.7)
5959
concurrent-ruby (~> 1.0, >= 1.0.2)
6060
i18n (>= 0.7, < 2)
6161
minitest (~> 5.1)
@@ -166,27 +166,27 @@ GEM
166166
rack (2.2.3)
167167
rack-test (1.1.0)
168168
rack (>= 1.0, < 3)
169-
rails (5.2.6.3)
170-
actioncable (= 5.2.6.3)
171-
actionmailer (= 5.2.6.3)
172-
actionpack (= 5.2.6.3)
173-
actionview (= 5.2.6.3)
174-
activejob (= 5.2.6.3)
175-
activemodel (= 5.2.6.3)
176-
activerecord (= 5.2.6.3)
177-
activestorage (= 5.2.6.3)
178-
activesupport (= 5.2.6.3)
169+
rails (5.2.7)
170+
actioncable (= 5.2.7)
171+
actionmailer (= 5.2.7)
172+
actionpack (= 5.2.7)
173+
actionview (= 5.2.7)
174+
activejob (= 5.2.7)
175+
activemodel (= 5.2.7)
176+
activerecord (= 5.2.7)
177+
activestorage (= 5.2.7)
178+
activesupport (= 5.2.7)
179179
bundler (>= 1.3.0)
180-
railties (= 5.2.6.3)
180+
railties (= 5.2.7)
181181
sprockets-rails (>= 2.0.0)
182182
rails-dom-testing (2.0.3)
183183
activesupport (>= 4.2.0)
184184
nokogiri (>= 1.6)
185185
rails-html-sanitizer (1.4.2)
186186
loofah (~> 2.3)
187-
railties (5.2.6.3)
188-
actionpack (= 5.2.6.3)
189-
activesupport (= 5.2.6.3)
187+
railties (5.2.7)
188+
actionpack (= 5.2.7)
189+
activesupport (= 5.2.7)
190190
method_source
191191
rake (>= 0.8.7)
192192
thor (>= 0.19.0, < 2.0)
@@ -225,13 +225,13 @@ GEM
225225
rspec-support (3.11.0)
226226
rspec_junit_formatter (0.5.1)
227227
rspec-core (>= 2, < 4, != 2.12.0)
228-
rubocop (1.25.1)
228+
rubocop (1.26.0)
229229
parallel (~> 1.10)
230230
parser (>= 3.1.0.0)
231231
rainbow (>= 2.2.2, < 4.0)
232232
regexp_parser (>= 1.8, < 3.0)
233233
rexml
234-
rubocop-ast (>= 1.15.1, < 2.0)
234+
rubocop-ast (>= 1.16.0, < 2.0)
235235
ruby-progressbar (~> 1.7)
236236
unicode-display_width (>= 1.4.0, < 3.0)
237237
rubocop-ast (1.16.0)

‎gemfiles/rails60_activeadmin.gemfile.lock‎

Lines changed: 57 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -7,65 +7,65 @@ PATH
77
GEM
88
remote: https://rubygems.org/
99
specs:
10-
actioncable (6.0.4.6)
11-
actionpack (= 6.0.4.6)
10+
actioncable (6.0.4.7)
11+
actionpack (= 6.0.4.7)
1212
nio4r (~> 2.0)
1313
websocket-driver (>= 0.6.1)
14-
actionmailbox (6.0.4.6)
15-
actionpack (= 6.0.4.6)
16-
activejob (= 6.0.4.6)
17-
activerecord (= 6.0.4.6)
18-
activestorage (= 6.0.4.6)
19-
activesupport (= 6.0.4.6)
14+
actionmailbox (6.0.4.7)
15+
actionpack (= 6.0.4.7)
16+
activejob (= 6.0.4.7)
17+
activerecord (= 6.0.4.7)
18+
activestorage (= 6.0.4.7)
19+
activesupport (= 6.0.4.7)
2020
mail (>= 2.7.1)
21-
actionmailer (6.0.4.6)
22-
actionpack (= 6.0.4.6)
23-
actionview (= 6.0.4.6)
24-
activejob (= 6.0.4.6)
21+
actionmailer (6.0.4.7)
22+
actionpack (= 6.0.4.7)
23+
actionview (= 6.0.4.7)
24+
activejob (= 6.0.4.7)
2525
mail (~> 2.5, >= 2.5.4)
2626
rails-dom-testing (~> 2.0)
27-
actionpack (6.0.4.6)
28-
actionview (= 6.0.4.6)
29-
activesupport (= 6.0.4.6)
27+
actionpack (6.0.4.7)
28+
actionview (= 6.0.4.7)
29+
activesupport (= 6.0.4.7)
3030
rack (~> 2.0, >= 2.0.8)
3131
rack-test (>= 0.6.3)
3232
rails-dom-testing (~> 2.0)
3333
rails-html-sanitizer (~> 1.0, >= 1.2.0)
34-
actiontext (6.0.4.6)
35-
actionpack (= 6.0.4.6)
36-
activerecord (= 6.0.4.6)
37-
activestorage (= 6.0.4.6)
38-
activesupport (= 6.0.4.6)
34+
actiontext (6.0.4.7)
35+
actionpack (= 6.0.4.7)
36+
activerecord (= 6.0.4.7)
37+
activestorage (= 6.0.4.7)
38+
activesupport (= 6.0.4.7)
3939
nokogiri (>= 1.8.5)
40-
actionview (6.0.4.6)
41-
activesupport (= 6.0.4.6)
40+
actionview (6.0.4.7)
41+
activesupport (= 6.0.4.7)
4242
builder (~> 3.1)
4343
erubi (~> 1.4)
4444
rails-dom-testing (~> 2.0)
4545
rails-html-sanitizer (~> 1.1, >= 1.2.0)
46-
activeadmin (2.10.1)
46+
activeadmin (2.11.0)
4747
arbre (~> 1.2, >= 1.2.1)
4848
formtastic (>= 3.1, < 5.0)
4949
formtastic_i18n (~> 0.4)
5050
inherited_resources (~> 1.7)
5151
jquery-rails (~> 4.2)
5252
kaminari (~> 1.0, >= 1.2.1)
53-
railties (>= 6.0, < 6.2)
53+
railties (>= 6.0, < 7.1)
5454
ransack (~> 2.1, >= 2.1.1)
55-
activejob (6.0.4.6)
56-
activesupport (= 6.0.4.6)
55+
activejob (6.0.4.7)
56+
activesupport (= 6.0.4.7)
5757
globalid (>= 0.3.6)
58-
activemodel (6.0.4.6)
59-
activesupport (= 6.0.4.6)
60-
activerecord (6.0.4.6)
61-
activemodel (= 6.0.4.6)
62-
activesupport (= 6.0.4.6)
63-
activestorage (6.0.4.6)
64-
actionpack (= 6.0.4.6)
65-
activejob (= 6.0.4.6)
66-
activerecord (= 6.0.4.6)
58+
activemodel (6.0.4.7)
59+
activesupport (= 6.0.4.7)
60+
activerecord (6.0.4.7)
61+
activemodel (= 6.0.4.7)
62+
activesupport (= 6.0.4.7)
63+
activestorage (6.0.4.7)
64+
actionpack (= 6.0.4.7)
65+
activejob (= 6.0.4.7)
66+
activerecord (= 6.0.4.7)
6767
marcel (~> 1.0.0)
68-
activesupport (6.0.4.6)
68+
activesupport (6.0.4.7)
6969
concurrent-ruby (~> 1.0, >= 1.0.2)
7070
i18n (>= 0.7, < 2)
7171
minitest (~> 5.1)
@@ -172,37 +172,37 @@ GEM
172172
rack (2.2.3)
173173
rack-test (1.1.0)
174174
rack (>= 1.0, < 3)
175-
rails (6.0.4.6)
176-
actioncable (= 6.0.4.6)
177-
actionmailbox (= 6.0.4.6)
178-
actionmailer (= 6.0.4.6)
179-
actionpack (= 6.0.4.6)
180-
actiontext (= 6.0.4.6)
181-
actionview (= 6.0.4.6)
182-
activejob (= 6.0.4.6)
183-
activemodel (= 6.0.4.6)
184-
activerecord (= 6.0.4.6)
185-
activestorage (= 6.0.4.6)
186-
activesupport (= 6.0.4.6)
175+
rails (6.0.4.7)
176+
actioncable (= 6.0.4.7)
177+
actionmailbox (= 6.0.4.7)
178+
actionmailer (= 6.0.4.7)
179+
actionpack (= 6.0.4.7)
180+
actiontext (= 6.0.4.7)
181+
actionview (= 6.0.4.7)
182+
activejob (= 6.0.4.7)
183+
activemodel (= 6.0.4.7)
184+
activerecord (= 6.0.4.7)
185+
activestorage (= 6.0.4.7)
186+
activesupport (= 6.0.4.7)
187187
bundler (>= 1.3.0)
188-
railties (= 6.0.4.6)
188+
railties (= 6.0.4.7)
189189
sprockets-rails (>= 2.0.0)
190190
rails-dom-testing (2.0.3)
191191
activesupport (>= 4.2.0)
192192
nokogiri (>= 1.6)
193193
rails-html-sanitizer (1.4.2)
194194
loofah (~> 2.3)
195-
railties (6.0.4.6)
196-
actionpack (= 6.0.4.6)
197-
activesupport (= 6.0.4.6)
195+
railties (6.0.4.7)
196+
actionpack (= 6.0.4.7)
197+
activesupport (= 6.0.4.7)
198198
method_source
199199
rake (>= 0.8.7)
200200
thor (>= 0.20.3, < 2.0)
201201
rainbow (3.1.1)
202202
rake (13.0.6)
203-
ransack (2.5.0)
204-
activerecord (>= 5.2.4)
205-
activesupport (>= 5.2.4)
203+
ransack (2.6.0)
204+
activerecord (>= 6.0.4)
205+
activesupport (>= 6.0.4)
206206
i18n
207207
regexp_parser (2.2.1)
208208
responders (3.0.1)
@@ -230,13 +230,13 @@ GEM
230230
rspec-support (3.11.0)
231231
rspec_junit_formatter (0.5.1)
232232
rspec-core (>= 2, < 4, != 2.12.0)
233-
rubocop (1.25.1)
233+
rubocop (1.26.0)
234234
parallel (~> 1.10)
235235
parser (>= 3.1.0.0)
236236
rainbow (>= 2.2.2, < 4.0)
237237
regexp_parser (>= 1.8, < 3.0)
238238
rexml
239-
rubocop-ast (>= 1.15.1, < 2.0)
239+
rubocop-ast (>= 1.16.0, < 2.0)
240240
ruby-progressbar (~> 1.7)
241241
unicode-display_width (>= 1.4.0, < 3.0)
242242
rubocop-ast (1.16.0)

0 commit comments

Comments
 (0)