Skip to content

Commit 01e4640

Browse files
committed
Merge pull request #3430 from jdufresne/eol-ruby
Remove support for EOL Ruby 2.5
2 parents 8abea83 + 9e1b24c commit 01e4640

7 files changed

Lines changed: 8 additions & 9 deletions

File tree

.github/workflows/test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ jobs:
88
strategy:
99
fail-fast: false
1010
matrix:
11-
ruby: [2.6, 2.7, "3.0", jruby]
11+
ruby: [2.7, "3.0", jruby]
1212
gemfile: [gemfiles/rails_6.1.gemfile]
1313
orm: [active_record]
1414
adapter: [sqlite3]
1515
asset: [sprockets]
1616
include:
17-
- ruby: 2.5
17+
- ruby: 2.6
1818
gemfile: gemfiles/rails_6.0.gemfile
1919
orm: active_record
2020
adapter: sqlite3

.rubocop.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ AllCops:
1313
- "vendor/bundle/**/*"
1414
NewCops: disable
1515
SuggestExtensions: false
16-
TargetRubyVersion: 2.5
16+
TargetRubyVersion: 2.6
1717

1818
Gemspec/DateAssignment:
1919
Enabled: true

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,6 @@ If you think you found a bug in RailsAdmin, you can [submit an issue](https://gi
103103

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

106-
- Ruby 2.5
107106
- Ruby 2.6
108107
- Ruby 2.7
109108
- Ruby 3.0

rails_admin.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
1919
spec.homepage = 'https://github.com/railsadminteam/rails_admin'
2020
spec.name = 'rails_admin'
2121
spec.require_paths = %w[lib]
22-
spec.required_ruby_version = '>= 2.5.0'
22+
spec.required_ruby_version = '>= 2.6.0'
2323
spec.required_rubygems_version = '>= 1.8.11'
2424
spec.summary = 'Admin for Rails'
2525
spec.version = RailsAdmin::Version

spec/integration/actions/export_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
click_button 'Export to csv'
8787
csv = CSV.parse page.driver.response.body
8888
expect(csv[0]).to match_array ['Id', 'Commentable', 'Commentable type', 'Content', 'Created at', 'Updated at']
89-
csv[1..-1].each do |line|
89+
csv[1..].each do |line|
9090
expect(line[csv[0].index('Commentable')]).to eq(@player.id.to_s)
9191
expect(line[csv[0].index('Commentable type')]).to eq(@player.class.to_s)
9292
end

spec/integration/actions/index_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -886,7 +886,7 @@ def visit_page(page)
886886
end
887887
end
888888
end
889-
visit index_path(model_name: 'player', query: player.name[1..-1])
889+
visit index_path(model_name: 'player', query: player.name[1..])
890890
is_expected.to have_no_content(player.name)
891891
end
892892
end
@@ -1168,7 +1168,7 @@ def visit_page(page)
11681168
visit index_path(model_name: 'team')
11691169
cols = all('th').collect(&:text)
11701170
expect(cols[0..3]).to eq(all_team_columns[1..4])
1171-
expect(cols).to contain_exactly(*all_team_columns[1..-1])
1171+
expect(cols).to contain_exactly(*all_team_columns[1..])
11721172
end
11731173
end
11741174
end

spec/rails_admin/adapters/active_record_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ class PlayerWithDefaultScope < Player
101101

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

107107
it '#where returns filtered results' do

0 commit comments

Comments
 (0)