diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index a2d4b05..bed7e61 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -13,20 +13,17 @@ jobs: fail-fast: false matrix: ruby-version: - - '2.6' - - '2.7' + - '3.3' gemfile: - - gemfiles/rails_5.1_active_admin_1.x.gemfile - - gemfiles/rails_5.x_active_admin_1.x.gemfile - - gemfiles/rails_5.x_active_admin_2.x.gemfile - gemfiles/rails_6.x_active_admin_2.x.gemfile + - gemfiles/rails_6.x_active_admin_3.x.gemfile + - gemfiles/rails_7.x_active_admin_3.x.gemfile + - gemfiles/rails_8.x_active_admin_3.x.gemfile include: - - ruby-version: '3.0' - gemfile: gemfiles/rails_6.x_active_admin_2.x.gemfile - - ruby-version: '3.0' - gemfile: gemfiles/rails_6.x_active_admin_3.x.gemfile - - ruby-version: '3.0' + - ruby-version: '4.0' gemfile: gemfiles/rails_7.x_active_admin_3.x.gemfile + - ruby-version: '4.0' + gemfile: gemfiles/rails_8.x_active_admin_3.x.gemfile env: BUNDLE_GEMFILE: ${{ matrix.gemfile }} diff --git a/Appraisals b/Appraisals index 086d5fe..a8e950d 100644 --- a/Appraisals +++ b/Appraisals @@ -16,14 +16,21 @@ end appraise 'rails-6.x-active-admin-2.x' do gem 'rails', '~> 6.1' gem 'activeadmin', '~> 2.0' + gem 'sqlite3', '~> 1.4' end appraise 'rails-6.x-active-admin-3.x' do gem 'rails', '~> 6.1' gem 'activeadmin', '~> 3.0' + gem 'sqlite3', '~> 1.4' end appraise 'rails-7.x-active-admin-3.x' do gem 'rails', '~> 7.1' gem 'activeadmin', '~> 3.0' end + +appraise 'rails-8.x-active-admin-3.x' do + gem 'rails', '~> 8.0' + gem 'activeadmin', '~> 3.0' +end diff --git a/activeadmin-searchable_select.gemspec b/activeadmin-searchable_select.gemspec index 664bd4f..3cf494b 100644 --- a/activeadmin-searchable_select.gemspec +++ b/activeadmin-searchable_select.gemspec @@ -14,20 +14,19 @@ Gem::Specification.new do |spec| spec.files = `git ls-files -z`.split("\x0") spec.require_paths = ['lib'] - spec.required_ruby_version = ['>= 2.1', '< 4'] + spec.required_ruby_version = '>= 3.0' - spec.add_development_dependency 'bundler', ['>= 1.5', '< 3'] + spec.add_development_dependency 'bundler', '>= 1.5' spec.add_development_dependency 'rake' spec.add_development_dependency 'appraisal', '~> 2.2' - spec.add_development_dependency 'rspec-rails', '~> 3.6' + spec.add_development_dependency 'rspec-rails', '>= 3.6' spec.add_development_dependency 'combustion', '~> 1.0' spec.add_development_dependency 'database_cleaner-active_record', '~> 2.1' - spec.add_development_dependency 'sqlite3', '~> 1.3' + spec.add_development_dependency 'sqlite3', '>= 1.3' spec.add_development_dependency 'capybara', '~> 3.9' spec.add_development_dependency 'puma', '~> 5.0' - spec.add_development_dependency 'selenium-webdriver', '~> 4.1' - spec.add_development_dependency 'webdrivers', '= 5.3.0' + spec.add_development_dependency 'selenium-webdriver', '>= 4.11' spec.add_development_dependency 'coffee-rails' spec.add_development_dependency 'rails' diff --git a/gemfiles/rails_6.x_active_admin_2.x.gemfile b/gemfiles/rails_6.x_active_admin_2.x.gemfile index a10ce61..2281328 100644 --- a/gemfiles/rails_6.x_active_admin_2.x.gemfile +++ b/gemfiles/rails_6.x_active_admin_2.x.gemfile @@ -5,5 +5,6 @@ source "https://rubygems.org" gem "sass-rails" gem "rails", "~> 6.1" gem "activeadmin", "~> 2.0" +gem "sqlite3", "~> 1.4" gemspec path: "../" diff --git a/gemfiles/rails_6.x_active_admin_3.x.gemfile b/gemfiles/rails_6.x_active_admin_3.x.gemfile index b86b845..fef869f 100644 --- a/gemfiles/rails_6.x_active_admin_3.x.gemfile +++ b/gemfiles/rails_6.x_active_admin_3.x.gemfile @@ -5,5 +5,6 @@ source "https://rubygems.org" gem "sass-rails" gem "rails", "~> 6.1" gem "activeadmin", "~> 3.0" +gem "sqlite3", "~> 1.4" gemspec path: "../" diff --git a/gemfiles/rails_8.x_active_admin_3.x.gemfile b/gemfiles/rails_8.x_active_admin_3.x.gemfile new file mode 100644 index 0000000..fd2b1aa --- /dev/null +++ b/gemfiles/rails_8.x_active_admin_3.x.gemfile @@ -0,0 +1,9 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "sass-rails" +gem "rails", "~> 8.0" +gem "activeadmin", "~> 3.0" + +gemspec path: "../" diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb index eac0bd0..6742a39 100644 --- a/spec/rails_helper.rb +++ b/spec/rails_helper.rb @@ -1,8 +1,15 @@ ENV['RAILS_ENV'] ||= 'test' +require 'logger' require 'combustion' Combustion.initialize!(:active_record, :action_controller, :action_view, :sprockets) +if Rails.version >= '7.1' + Rails.application.config.action_dispatch.show_exceptions = :none +else + Rails.application.config.action_dispatch.show_exceptions = false +end + require 'rspec/rails' require 'support/reset_settings' diff --git a/spec/support/capybara.rb b/spec/support/capybara.rb index 3c499d6..0686082 100644 --- a/spec/support/capybara.rb +++ b/spec/support/capybara.rb @@ -1,6 +1,5 @@ require 'capybara/rspec' require 'selenium-webdriver' -require 'webdrivers/chromedriver' Capybara.javascript_driver = :selenium_chrome_headless