Skip to content

Commit

Permalink
Test against Rails 7.2
Browse files Browse the repository at this point in the history 
Also fixes a couple of warnings for missing assertions

Close #922
  • Loading branch information
@tagliala
tagliala committed Jun 10, 2024
1 parent a8cd775 commit 6c2ee90
Show file tree
Hide file tree
Showing 7 changed files with 363 additions and 90 deletions.
28 changes: 14 additions & 14 deletions .github/workflows/ci.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,48 +8,48 @@ on:

jobs:
test:
name: test (${{ matrix.ruby.name }}, ${{ matrix.rails }})
name: test (ruby-${{ matrix.ruby }}, ${{ matrix.rails }})
runs-on: ubuntu-latest
timeout-minutes: 15
strategy:
fail-fast: false
matrix:
ruby:
- name: ruby-3.0
value: "3.0"
- name: ruby-3.1
value: 3.1
- name: ruby-3.2
value: 3.2
- name: ruby-3.3
value: 3.3
- "3.0"
- "3.1"
- "3.2"
- "3.3"
rails:
- rails_61
- rails_70
- rails_71
- rails_72
exclude:
- ruby: "3.0"
rails: rails_72
steps:
- uses: actions/checkout@v4
- name: Configure bundler (default)
run: |
echo "BUNDLE_GEMFILE=Gemfile" >> "$GITHUB_ENV"
if: matrix.rails == 'rails_71'
if: matrix.rails == 'rails_72'
- name: Configure bundler (alternative)
run: |
echo "BUNDLE_GEMFILE=gemfiles/${{ matrix.rails }}/Gemfile" >> "$GITHUB_ENV"
if: matrix.rails != 'rails_71'
if: matrix.rails != 'rails_72'
- uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ matrix.ruby.value }}
ruby-version: ${{ matrix.ruby }}
bundler-cache: true
- name: Run tests
env:
COVERAGE: true
run: |
bundle exec rake test TESTOPTS="--verbose"
mv coverage/coverage.xml coverage/coverage-ruby-${{ matrix.ruby.value }}-${{ matrix.rails }}.xml
mv coverage/coverage.xml coverage/coverage-ruby-${{ matrix.ruby }}-${{ matrix.rails }}.xml
- uses: actions/upload-artifact@v4
with:
name: coverage-ruby-${{ matrix.ruby.value }}-${{ matrix.rails }}
name: coverage-ruby-${{ matrix.ruby }}-${{ matrix.rails }}
path: coverage
if-no-files-found: error

Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

## unreleased

* Test against Rails 7.2 [#921][].

## Version 1.14.0

* Remove upper bound dependency limits from gemspec.
Expand Down Expand Up @@ -223,3 +227,5 @@ _No changes_.
* Added more helper_methods.
* Added Rails 2.3.0 and changed tests to work with ActionController::TestCase.
* First release. Support to I18n, singleton controllers, polymorphic controllers, belongs_to, nested_belongs_to and url helpers.

[#921]: https://github.com/activeadmin/inherited_resources/pull/921
2 changes: 1 addition & 1 deletion Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ source 'https://rubygems.org'
gemspec path: '.'

group :development do
gem 'rails', '~> 7.1.0'
gem 'rails', '~> 7.2.0.beta2'

gem 'mocha'
gem 'minitest'
Expand Down
142 changes: 68 additions & 74 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,87 +10,81 @@ PATH
GEM
remote: https://rubygems.org/
specs:
actioncable (7.1.3.3)
actionpack (= 7.1.3.3)
activesupport (= 7.1.3.3)
actioncable (7.2.0.beta2)
actionpack (= 7.2.0.beta2)
activesupport (= 7.2.0.beta2)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
zeitwerk (~> 2.6)
actionmailbox (7.1.3.3)
actionpack (= 7.1.3.3)
activejob (= 7.1.3.3)
activerecord (= 7.1.3.3)
activestorage (= 7.1.3.3)
activesupport (= 7.1.3.3)
mail (>= 2.7.1)
net-imap
net-pop
net-smtp
actionmailer (7.1.3.3)
actionpack (= 7.1.3.3)
actionview (= 7.1.3.3)
activejob (= 7.1.3.3)
activesupport (= 7.1.3.3)
mail (~> 2.5, >= 2.5.4)
net-imap
net-pop
net-smtp
actionmailbox (7.2.0.beta2)
actionpack (= 7.2.0.beta2)
activejob (= 7.2.0.beta2)
activerecord (= 7.2.0.beta2)
activestorage (= 7.2.0.beta2)
activesupport (= 7.2.0.beta2)
mail (>= 2.8.0)
actionmailer (7.2.0.beta2)
actionpack (= 7.2.0.beta2)
actionview (= 7.2.0.beta2)
activejob (= 7.2.0.beta2)
activesupport (= 7.2.0.beta2)
mail (>= 2.8.0)
rails-dom-testing (~> 2.2)
actionpack (7.1.3.3)
actionview (= 7.1.3.3)
activesupport (= 7.1.3.3)
actionpack (7.2.0.beta2)
actionview (= 7.2.0.beta2)
activesupport (= 7.2.0.beta2)
nokogiri (>= 1.8.5)
racc
rack (>= 2.2.4)
rack-session (>= 1.0.1)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6)
actiontext (7.1.3.3)
actionpack (= 7.1.3.3)
activerecord (= 7.1.3.3)
activestorage (= 7.1.3.3)
activesupport (= 7.1.3.3)
useragent (~> 0.16)
actiontext (7.2.0.beta2)
actionpack (= 7.2.0.beta2)
activerecord (= 7.2.0.beta2)
activestorage (= 7.2.0.beta2)
activesupport (= 7.2.0.beta2)
globalid (>= 0.6.0)
nokogiri (>= 1.8.5)
actionview (7.1.3.3)
activesupport (= 7.1.3.3)
actionview (7.2.0.beta2)
activesupport (= 7.2.0.beta2)
builder (~> 3.1)
erubi (~> 1.11)
rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6)
activejob (7.1.3.3)
activesupport (= 7.1.3.3)
activejob (7.2.0.beta2)
activesupport (= 7.2.0.beta2)
globalid (>= 0.3.6)
activemodel (7.1.3.3)
activesupport (= 7.1.3.3)
activerecord (7.1.3.3)
activemodel (= 7.1.3.3)
activesupport (= 7.1.3.3)
activemodel (7.2.0.beta2)
activesupport (= 7.2.0.beta2)
activerecord (7.2.0.beta2)
activemodel (= 7.2.0.beta2)
activesupport (= 7.2.0.beta2)
timeout (>= 0.4.0)
activestorage (7.1.3.3)
actionpack (= 7.1.3.3)
activejob (= 7.1.3.3)
activerecord (= 7.1.3.3)
activesupport (= 7.1.3.3)
activestorage (7.2.0.beta2)
actionpack (= 7.2.0.beta2)
activejob (= 7.2.0.beta2)
activerecord (= 7.2.0.beta2)
activesupport (= 7.2.0.beta2)
marcel (~> 1.0)
activesupport (7.1.3.3)
activesupport (7.2.0.beta2)
base64
bigdecimal
concurrent-ruby (~> 1.0, >= 1.0.2)
concurrent-ruby (~> 1.0, >= 1.3.1)
connection_pool (>= 2.2.5)
drb
i18n (>= 1.6, < 2)
minitest (>= 5.1)
mutex_m
tzinfo (~> 2.0)
tzinfo (~> 2.0, >= 2.0.5)
ansi (1.5.0)
ast (2.4.2)
base64 (0.2.0)
bigdecimal (3.1.8)
bigdecimal (3.1.8-java)
builder (3.2.4)
concurrent-ruby (1.3.1)
builder (3.3.0)
concurrent-ruby (1.3.3)
connection_pool (2.4.1)
crass (1.0.6)
date (3.3.4)
Expand Down Expand Up @@ -124,7 +118,7 @@ GEM
net-smtp
marcel (1.0.4)
mini_mime (1.1.5)
mini_portile2 (2.8.6)
mini_portile2 (2.8.7)
minitest (5.23.1)
minitest-reporters (1.6.1)
ansi
Expand All @@ -133,8 +127,7 @@ GEM
ruby-progressbar
mocha (2.3.0)
ruby2_keywords (>= 0.0.5)
mutex_m (0.2.0)
net-imap (0.4.11)
net-imap (0.4.12)
date
net-protocol
net-pop (0.1.2)
Expand All @@ -156,7 +149,7 @@ GEM
racc (~> 1.4)
nokogiri (1.16.5-x86_64-linux)
racc (~> 1.4)
parallel (1.24.0)
parallel (1.25.1)
parser (3.3.2.0)
ast (~> 2.4.1)
racc
Expand All @@ -174,20 +167,20 @@ GEM
rackup (2.1.0)
rack (>= 3)
webrick (~> 1.8)
rails (7.1.3.3)
actioncable (= 7.1.3.3)
actionmailbox (= 7.1.3.3)
actionmailer (= 7.1.3.3)
actionpack (= 7.1.3.3)
actiontext (= 7.1.3.3)
actionview (= 7.1.3.3)
activejob (= 7.1.3.3)
activemodel (= 7.1.3.3)
activerecord (= 7.1.3.3)
activestorage (= 7.1.3.3)
activesupport (= 7.1.3.3)
rails (7.2.0.beta2)
actioncable (= 7.2.0.beta2)
actionmailbox (= 7.2.0.beta2)
actionmailer (= 7.2.0.beta2)
actionpack (= 7.2.0.beta2)
actiontext (= 7.2.0.beta2)
actionview (= 7.2.0.beta2)
activejob (= 7.2.0.beta2)
activemodel (= 7.2.0.beta2)
activerecord (= 7.2.0.beta2)
activestorage (= 7.2.0.beta2)
activesupport (= 7.2.0.beta2)
bundler (>= 1.15.0)
railties (= 7.1.3.3)
railties (= 7.2.0.beta2)
rails-controller-testing (1.0.5)
actionpack (>= 5.0.1.rc1)
actionview (>= 5.0.1.rc1)
Expand All @@ -199,10 +192,10 @@ GEM
rails-html-sanitizer (1.6.0)
loofah (~> 2.21)
nokogiri (~> 1.14)
railties (7.1.3.3)
actionpack (= 7.1.3.3)
activesupport (= 7.1.3.3)
irb
railties (7.2.0.beta2)
actionpack (= 7.2.0.beta2)
activesupport (= 7.2.0.beta2)
irb (~> 1.13)
rackup (>= 1.0.0)
rake (>= 12.2)
thor (~> 1.0, >= 1.2.2)
Expand All @@ -217,8 +210,8 @@ GEM
responders (3.1.1)
actionpack (>= 5.2)
railties (>= 5.2)
rexml (3.2.8)
strscan (>= 3.0.9)
rexml (3.2.9)
strscan
rubocop (1.64.1)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
Expand Down Expand Up @@ -257,6 +250,7 @@ GEM
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
unicode-display_width (2.5.0)
useragent (0.16.10)
warning (1.4.0)
webrick (1.8.1)
websocket-driver (0.7.6)
Expand All @@ -278,7 +272,7 @@ DEPENDENCIES
minitest
minitest-reporters
mocha
rails (~> 7.1.0)
rails (~> 7.2.0.beta2)
rails-controller-testing
rubocop
rubocop-minitest
Expand Down
15 changes: 15 additions & 0 deletions gemfiles/rails_71/Gemfile
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
source 'https://rubygems.org'

gemspec path: '../..'

group :development do
gem 'rails', '~> 7.1.0'

gem 'mocha'
gem 'minitest'
gem 'minitest-reporters'
gem 'rails-controller-testing'
gem 'simplecov', require: false
gem 'simplecov-cobertura'
gem 'warning'
end
Loading

0 comments on commit 6c2ee90

Please sign in to comment.