Skip to content

Commit 715f475

Browse files
authored
Merge pull request #55 from luizkowalski/patch-1
Relax Ruby version requirement
2 parents c359ee4 + a0b85c8 commit 715f475

File tree

8 files changed

+37
-17
lines changed

8 files changed

+37
-17
lines changed

.github/workflows/tests.yml

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,17 @@ jobs:
1313
fail-fast: false
1414
matrix:
1515
ruby-version:
16-
- '2.6'
17-
- '2.7'
16+
- '3.3'
1817
gemfile:
19-
- gemfiles/rails_5.1_active_admin_1.x.gemfile
20-
- gemfiles/rails_5.x_active_admin_1.x.gemfile
21-
- gemfiles/rails_5.x_active_admin_2.x.gemfile
2218
- gemfiles/rails_6.x_active_admin_2.x.gemfile
19+
- gemfiles/rails_6.x_active_admin_3.x.gemfile
20+
- gemfiles/rails_7.x_active_admin_3.x.gemfile
21+
- gemfiles/rails_8.x_active_admin_3.x.gemfile
2322
include:
24-
- ruby-version: '3.0'
25-
gemfile: gemfiles/rails_6.x_active_admin_2.x.gemfile
26-
- ruby-version: '3.0'
27-
gemfile: gemfiles/rails_6.x_active_admin_3.x.gemfile
28-
- ruby-version: '3.0'
23+
- ruby-version: '4.0'
2924
gemfile: gemfiles/rails_7.x_active_admin_3.x.gemfile
25+
- ruby-version: '4.0'
26+
gemfile: gemfiles/rails_8.x_active_admin_3.x.gemfile
3027

3128
env:
3229
BUNDLE_GEMFILE: ${{ matrix.gemfile }}

Appraisals

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,21 @@ end
1616
appraise 'rails-6.x-active-admin-2.x' do
1717
gem 'rails', '~> 6.1'
1818
gem 'activeadmin', '~> 2.0'
19+
gem 'sqlite3', '~> 1.4'
1920
end
2021

2122
appraise 'rails-6.x-active-admin-3.x' do
2223
gem 'rails', '~> 6.1'
2324
gem 'activeadmin', '~> 3.0'
25+
gem 'sqlite3', '~> 1.4'
2426
end
2527

2628
appraise 'rails-7.x-active-admin-3.x' do
2729
gem 'rails', '~> 7.1'
2830
gem 'activeadmin', '~> 3.0'
2931
end
32+
33+
appraise 'rails-8.x-active-admin-3.x' do
34+
gem 'rails', '~> 8.0'
35+
gem 'activeadmin', '~> 3.0'
36+
end

activeadmin-searchable_select.gemspec

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,19 @@ Gem::Specification.new do |spec|
1414
spec.files = `git ls-files -z`.split("\x0")
1515
spec.require_paths = ['lib']
1616

17-
spec.required_ruby_version = ['>= 2.1', '< 4']
17+
spec.required_ruby_version = '>= 3.0'
1818

19-
spec.add_development_dependency 'bundler', ['>= 1.5', '< 3']
19+
spec.add_development_dependency 'bundler', '>= 1.5'
2020
spec.add_development_dependency 'rake'
2121
spec.add_development_dependency 'appraisal', '~> 2.2'
22-
spec.add_development_dependency 'rspec-rails', '~> 3.6'
22+
spec.add_development_dependency 'rspec-rails', '>= 3.6'
2323
spec.add_development_dependency 'combustion', '~> 1.0'
2424
spec.add_development_dependency 'database_cleaner-active_record', '~> 2.1'
25-
spec.add_development_dependency 'sqlite3', '~> 1.3'
25+
spec.add_development_dependency 'sqlite3', '>= 1.3'
2626

2727
spec.add_development_dependency 'capybara', '~> 3.9'
2828
spec.add_development_dependency 'puma', '~> 5.0'
29-
spec.add_development_dependency 'selenium-webdriver', '~> 4.1'
30-
spec.add_development_dependency 'webdrivers', '= 5.3.0'
29+
spec.add_development_dependency 'selenium-webdriver', '>= 4.11'
3130

3231
spec.add_development_dependency 'coffee-rails'
3332
spec.add_development_dependency 'rails'

gemfiles/rails_6.x_active_admin_2.x.gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,6 @@ source "https://rubygems.org"
55
gem "sass-rails"
66
gem "rails", "~> 6.1"
77
gem "activeadmin", "~> 2.0"
8+
gem "sqlite3", "~> 1.4"
89

910
gemspec path: "../"

gemfiles/rails_6.x_active_admin_3.x.gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,6 @@ source "https://rubygems.org"
55
gem "sass-rails"
66
gem "rails", "~> 6.1"
77
gem "activeadmin", "~> 3.0"
8+
gem "sqlite3", "~> 1.4"
89

910
gemspec path: "../"
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# This file was generated by Appraisal
2+
3+
source "https://rubygems.org"
4+
5+
gem "sass-rails"
6+
gem "rails", "~> 8.0"
7+
gem "activeadmin", "~> 3.0"
8+
9+
gemspec path: "../"

spec/rails_helper.rb

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,15 @@
11
ENV['RAILS_ENV'] ||= 'test'
22

3+
require 'logger'
34
require 'combustion'
45
Combustion.initialize!(:active_record, :action_controller, :action_view, :sprockets)
56

7+
if Rails.version >= '7.1'
8+
Rails.application.config.action_dispatch.show_exceptions = :none
9+
else
10+
Rails.application.config.action_dispatch.show_exceptions = false
11+
end
12+
613
require 'rspec/rails'
714
require 'support/reset_settings'
815

spec/support/capybara.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
require 'capybara/rspec'
22
require 'selenium-webdriver'
3-
require 'webdrivers/chromedriver'
43

54
Capybara.javascript_driver = :selenium_chrome_headless
65

0 commit comments

Comments
 (0)