diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 67b8fd3..c9383e8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,19 +11,22 @@ jobs: strategy: fail-fast: false matrix: - ruby-version: ['3.0', '3.1', '3.2', '3.3'] - gemfile: ['rails_6.0','rails_6.1','rails_7.0', 'rails_7.1'] + ruby-version: ['3.1', '3.2', '3.3', '3.4'] + gemfile: ['rails_7.0', 'rails_7.1', 'rails_7.2', 'rails_8.0'] + exclude: + - ruby-version: '3.1' + gemfile: 'rails_8.0' runs-on: ubuntu-latest env: BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile name: Specs - Ruby ${{ matrix.ruby-version }} with ${{ matrix.gemfile }} steps: - - uses: actions/checkout@v4 - - name: Set up Ruby ${{ matrix.ruby-version }} with ${{ matrix.gemfile }} - uses: ruby/setup-ruby@v1 - with: - ruby-version: ${{ matrix.ruby-version }} - bundler-cache: true - rubygems: default - - name: Run specs - run: bundle exec rake spec + - uses: actions/checkout@v4 + - name: Set up Ruby ${{ matrix.ruby-version }} with ${{ matrix.gemfile }} + uses: ruby/setup-ruby@v1 + with: + ruby-version: ${{ matrix.ruby-version }} + bundler-cache: true + rubygems: default + - name: Run specs + run: bundle exec rake spec diff --git a/Appraisals b/Appraisals index dbae566..8d1a578 100644 --- a/Appraisals +++ b/Appraisals @@ -1,13 +1,20 @@ rails_versions = %w( - 6.0 - 6.1 7.0 7.1 + 7.2 + 8.0 ) rails_versions.each do |version| appraise "rails_#{version}" do gem "rails", "~> #{version}.0" + if version == "7.0" + gem "benchmark" + gem "bigdecimal" + gem "drb" + gem "logger" + gem "mutex_m" + end gem "rails-controller-testing" end end diff --git a/Gemfile.lock b/Gemfile.lock index 91638cb..9b9d164 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -141,7 +141,7 @@ PLATFORMS ruby DEPENDENCIES - activesupport (>= 6.0) + activesupport (>= 7.0) appraisal capybara high_voltage! @@ -149,4 +149,4 @@ DEPENDENCIES rspec-rails (~> 5.1.2) BUNDLED WITH - 2.2.33 + 2.6.3 diff --git a/gemfiles/rails_7.0.gemfile b/gemfiles/rails_7.0.gemfile index 2be2eae..a056ec4 100644 --- a/gemfiles/rails_7.0.gemfile +++ b/gemfiles/rails_7.0.gemfile @@ -3,6 +3,11 @@ source "https://rubygems.org" gem "rails", "~> 7.0.0" +gem "benchmark" +gem "bigdecimal" +gem "drb" +gem "logger" +gem "mutex_m" gem "rails-controller-testing" gemspec path: "../" diff --git a/gemfiles/rails_6.0.gemfile b/gemfiles/rails_7.2.gemfile similarity index 83% rename from gemfiles/rails_6.0.gemfile rename to gemfiles/rails_7.2.gemfile index 57b8b42..7a96841 100644 --- a/gemfiles/rails_6.0.gemfile +++ b/gemfiles/rails_7.2.gemfile @@ -2,7 +2,7 @@ source "https://rubygems.org" -gem "rails", "~> 6.0.0" +gem "rails", "~> 7.2.0" gem "rails-controller-testing" gemspec path: "../" diff --git a/gemfiles/rails_6.1.gemfile b/gemfiles/rails_8.0.gemfile similarity index 83% rename from gemfiles/rails_6.1.gemfile rename to gemfiles/rails_8.0.gemfile index 1a36ab8..1d09e73 100644 --- a/gemfiles/rails_6.1.gemfile +++ b/gemfiles/rails_8.0.gemfile @@ -2,7 +2,7 @@ source "https://rubygems.org" -gem "rails", "~> 6.1.0" +gem "rails", "~> 8.0.0" gem "rails-controller-testing" gemspec path: "../" diff --git a/high_voltage.gemspec b/high_voltage.gemspec index c43bedc..cb5ec34 100644 --- a/high_voltage.gemspec +++ b/high_voltage.gemspec @@ -21,8 +21,8 @@ Gem::Specification.new do |s| s.test_files = [] s.require_paths = ["lib"] - s.required_ruby_version = '>= 3.0' - s.add_development_dependency('activesupport', '>= 6.0') + s.required_ruby_version = '>= 3.1' + s.add_development_dependency('activesupport', '>= 7.0') s.add_development_dependency('appraisal') s.add_development_dependency('capybara') s.add_development_dependency('pry') diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 28ec2b9..86d6a15 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,6 +1,7 @@ ENV["RAILS_ENV"] = "test" require "pry" +require "logger" require "active_model/railtie" require "action_controller/railtie" require "action_view/railtie"