Skip to content

Commit 0ba80a1

Browse files
Fixes 1378 - Add Ruby 3.1 and Rails 7.0 to the CI matrix (#1379)
* Add Ruby 3.1 and Rails 7 to the CI matrix * Adding Ruby 3.2 * Bump up patch versions
1 parent d19ab43 commit 0ba80a1

File tree

3 files changed

+35
-15
lines changed

3 files changed

+35
-15
lines changed

.github/workflows/ruby.yml

Lines changed: 30 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -26,37 +26,54 @@ jobs:
2626
fail-fast: false
2727
matrix:
2828
ruby:
29-
- 2.6.6
30-
- 2.7.2
31-
- 3.0.0
29+
- 2.6
30+
- 2.7
31+
- '3.0'
32+
- 3.1
33+
- 3.2
3234
rails:
33-
- 6.1.3.1
34-
- 6.0.3.4
35-
- 5.2.4.4
35+
- 7.0.4
36+
- 6.1.7
37+
- 6.0.6
38+
- 5.2.8.1
3639
- 5.1.7
3740
database_url:
3841
- postgresql://postgres:password@localhost:5432/test
3942
- sqlite3:test_db
4043
exclude:
41-
- ruby: 3.0.0
42-
rails: 6.0.3.4
43-
- ruby: 3.0.0
44-
rails: 5.2.4.4
45-
- ruby: 3.0.0
44+
- ruby: 3.2
45+
rails: 6.0.6
46+
- ruby: 3.2
47+
rails: 5.2.8.1
48+
- ruby: 3.2
4649
rails: 5.1.7
50+
- ruby: 3.1
51+
rails: 6.0.6
52+
- ruby: 3.1
53+
rails: 5.2.8.1
54+
- ruby: 3.1
55+
rails: 5.1.7
56+
- ruby: '3.0'
57+
rails: 6.0.6
58+
- ruby: '3.0'
59+
rails: 5.2.8.1
60+
- ruby: '3.0'
61+
rails: 5.1.7
62+
- ruby: 2.6
63+
rails: 7.0.4
4764
- database_url: postgresql://postgres:password@localhost:5432/test
4865
rails: 5.1.7
4966
env:
5067
RAILS_VERSION: ${{ matrix.rails }}
5168
DATABASE_URL: ${{ matrix.database_url }}
5269
name: Ruby ${{ matrix.ruby }} Rails ${{ matrix.rails }} DB ${{ matrix.database_url }}
5370
steps:
54-
- uses: actions/checkout@v2
71+
- uses: actions/checkout@v3
5572
- name: Set up Ruby
5673
uses: ruby/setup-ruby@v1
5774
with:
5875
ruby-version: ${{ matrix.ruby }}
5976
- name: Install dependencies
6077
run: bundle install --jobs 4 --retry 3
6178
- name: Run tests
62-
run: bundle exec rake test
79+
run: bundle exec rake test

test/test_helper.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ class TestApp < Rails::Application
6262
config.active_support.halt_callback_chains_on_return_false = false
6363
config.active_record.time_zone_aware_types = [:time, :datetime]
6464
config.active_record.belongs_to_required_by_default = false
65-
unless Rails::VERSION::MAJOR == 5 && Rails::VERSION::MINOR < 2 || Rails::VERSION::MAJOR == 6 && Rails::VERSION::MINOR >= 1
65+
if Rails::VERSION::MAJOR == 5 && Rails::VERSION::MINOR == 2
6666
config.active_record.sqlite3.represent_boolean_as_integer = true
6767
end
6868
end

test/unit/resource/resource_test.rb

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,10 @@ def test_derived_not_abstract
174174
end
175175

176176
def test_inherited_calls_superclass
177-
assert_equal(BaseResource.subclasses, [PersonResource, SpecialBaseResource])
177+
subclasses = BaseResource.subclasses
178+
assert_includes(subclasses, PersonResource)
179+
assert_includes(subclasses, SpecialBaseResource)
180+
assert_equal(2, subclasses.size)
178181
end
179182

180183
def test_nil_model_class

0 commit comments

Comments
 (0)