Skip to content

Commit

Permalink
Merge pull request #3430 from jdufresne/eol-ruby
Browse files Browse the repository at this point in the history
Remove support for EOL Ruby 2.5
  • Loading branch information
mshibuya committed Feb 5, 2022
2 parents 8abea83 + 9e1b24c commit 01e4640
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 9 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ jobs:
strategy:
fail-fast: false
matrix:
ruby: [2.6, 2.7, "3.0", jruby]
ruby: [2.7, "3.0", jruby]
gemfile: [gemfiles/rails_6.1.gemfile]
orm: [active_record]
adapter: [sqlite3]
asset: [sprockets]
include:
- ruby: 2.5
- ruby: 2.6
gemfile: gemfiles/rails_6.0.gemfile
orm: active_record
adapter: sqlite3
Expand Down
2 changes: 1 addition & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ AllCops:
- "vendor/bundle/**/*"
NewCops: disable
SuggestExtensions: false
TargetRubyVersion: 2.5
TargetRubyVersion: 2.6

Gemspec/DateAssignment:
Enabled: true
Expand Down
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,6 @@ If you think you found a bug in RailsAdmin, you can [submit an issue](https://gi

This library aims to support and is [tested against][ghactions] the following Ruby implementations:

- Ruby 2.5
- Ruby 2.6
- Ruby 2.7
- Ruby 3.0
Expand Down
2 changes: 1 addition & 1 deletion rails_admin.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
spec.homepage = 'https://github.com/railsadminteam/rails_admin'
spec.name = 'rails_admin'
spec.require_paths = %w[lib]
spec.required_ruby_version = '>= 2.5.0'
spec.required_ruby_version = '>= 2.6.0'
spec.required_rubygems_version = '>= 1.8.11'
spec.summary = 'Admin for Rails'
spec.version = RailsAdmin::Version
Expand Down
2 changes: 1 addition & 1 deletion spec/integration/actions/export_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
click_button 'Export to csv'
csv = CSV.parse page.driver.response.body
expect(csv[0]).to match_array ['Id', 'Commentable', 'Commentable type', 'Content', 'Created at', 'Updated at']
csv[1..-1].each do |line|
csv[1..].each do |line|
expect(line[csv[0].index('Commentable')]).to eq(@player.id.to_s)
expect(line[csv[0].index('Commentable type')]).to eq(@player.class.to_s)
end
Expand Down
4 changes: 2 additions & 2 deletions spec/integration/actions/index_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -886,7 +886,7 @@ def visit_page(page)
end
end
end
visit index_path(model_name: 'player', query: player.name[1..-1])
visit index_path(model_name: 'player', query: player.name[1..])
is_expected.to have_no_content(player.name)
end
end
Expand Down Expand Up @@ -1168,7 +1168,7 @@ def visit_page(page)
visit index_path(model_name: 'team')
cols = all('th').collect(&:text)
expect(cols[0..3]).to eq(all_team_columns[1..4])
expect(cols).to contain_exactly(*all_team_columns[1..-1])
expect(cols).to contain_exactly(*all_team_columns[1..])
end
end
end
2 changes: 1 addition & 1 deletion spec/rails_admin/adapters/active_record_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ class PlayerWithDefaultScope < Player

it '#destroy destroys multiple items' do
abstract_model.destroy(@players[0..1])
expect(Player.all).to eq(@players[2..-1])
expect(Player.all).to eq(@players[2..])
end

it '#where returns filtered results' do
Expand Down

0 comments on commit 01e4640

Please sign in to comment.