Skip to content

Commit

Permalink
Merge pull request #224 from tbotaq/update-ci-to-work-against-ruby-3
Browse files Browse the repository at this point in the history
CI against Ruby 3.0
  • Loading branch information
kbrock committed Apr 9, 2021
2 parents 3f4efb6 + f0b1a9f commit 1c95f99
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 25 deletions.
7 changes: 7 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ rvm:
- "2.5.7"
- "2.6.5"
- "2.7.0"
- "3.0.0"
gemfile:
- gemfiles/rails_5.0.gemfile
- gemfiles/rails_5.1.gemfile
Expand All @@ -19,5 +20,11 @@ matrix:
exclude:
- rvm: 2.4.9
gemfile: gemfiles/rails_6.0.gemfile
- rvm: 3.0.0
gemfile: gemfiles/rails_5.0.gemfile
- rvm: 3.0.0
gemfile: gemfiles/rails_5.1.gemfile
- rvm: 3.0.0
gemfile: gemfiles/rails_5.2.gemfile

script: "bundle exec rake spec"
6 changes: 0 additions & 6 deletions gemfiles/rails_5.0.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,4 @@ platform :ruby do
gem 'sqlite3', '~> 1.3.0'
end

platforms :rbx do
gem 'racc'
gem 'rubysl', '~> 2.0'
gem 'psych'
end

gemspec :path => '../'
6 changes: 0 additions & 6 deletions gemfiles/rails_5.1.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,4 @@ platform :ruby do
gem 'sqlite3', '~> 1.3.0'
end

platforms :rbx do
gem 'racc'
gem 'rubysl', '~> 2.0'
gem 'psych'
end

gemspec :path => '../'
6 changes: 0 additions & 6 deletions gemfiles/rails_5.2.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,4 @@ platform :ruby do
gem 'sqlite3', '~> 1.3.0'
end

platforms :rbx do
gem 'racc'
gem 'rubysl', '~> 2.0'
gem 'psych'
end

gemspec :path => '../'
6 changes: 0 additions & 6 deletions gemfiles/rails_6.0.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,4 @@ platform :ruby do
gem 'sqlite3'
end

platforms :rbx do
gem 'racc'
gem 'rubysl', '~> 2.0'
gem 'psych'
end

gemspec :path => '../'
2 changes: 1 addition & 1 deletion spec/associations/active_record_extensions_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ class Book < ActiveRecord::Base
it "doesn't raise any exception when the belongs_to association class can't be autoloaded" do
# Simulate autoloader
allow_any_instance_of(String).to receive(:constantize).and_raise(LoadError, "Unable to autoload constant NonExistent")
expect { School.belongs_to :city, {class_name: 'NonExistent'} }.not_to raise_error
expect { School.belongs_to :city, class_name: 'NonExistent' }.not_to raise_error
end
end

Expand Down

0 comments on commit 1c95f99

Please sign in to comment.