diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 094a095d..b3c3e257 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -16,18 +16,13 @@ jobs: fail-fast: false matrix: gemfile: - - "6.1" - "7.0" - "7.1" - "7.2" ruby: - - "3.0.7" - "3.1.6" - "3.2.5" - - "3.3.4" - exclude: - - gemfile: "7.2" - ruby: "3.0.7" + - "3.3.5" env: BUNDLE_GEMFILE: gemfiles/rails_${{ matrix.gemfile }}.gemfile diff --git a/Appraisals b/Appraisals index dd0ff564..c160559c 100644 --- a/Appraisals +++ b/Appraisals @@ -1,13 +1,3 @@ -appraise "rails_6.1" do - gem "railties", "~> 6.1.0" - gem "net-smtp", require: false # not bundled in ruby 3.1 - # The following gems will not be bundled with Ruby 3.4 - gem "base64", require: false - gem "bigdecimal", require: false - gem "drb", require: false - gem "mutex_m", require: false -end - appraise "rails_7.0" do gem "railties", "~> 7.0.0" # The following gems will not be bundled with Ruby 3.4 diff --git a/README.md b/README.md index 8fe71485..40c6dfbd 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ monitored by contributors. ## Getting Started -Clearance is a Rails engine tested against Rails `>= 6.1` and Ruby `>= 3.0.0`. +Clearance is a Rails engine tested against Rails `>= 7.0` and Ruby `>= 3.1.6`. You can add it to your Gemfile with: diff --git a/gemfiles/rails_6.1.gemfile b/gemfiles/rails_6.1.gemfile deleted file mode 100644 index e5b063d3..00000000 --- a/gemfiles/rails_6.1.gemfile +++ /dev/null @@ -1,25 +0,0 @@ -# This file was generated by Appraisal - -source "https://rubygems.org" - -gem "addressable" -gem "ammeter" -gem "appraisal" -gem "capybara" -gem "database_cleaner" -gem "erb_lint", require: false -gem "factory_bot_rails" -gem "nokogiri" -gem "pry", require: false -gem "rails-controller-testing" -gem "rspec-rails" -gem "shoulda-matchers" -gem "sqlite3", "~> 1.7" -gem "railties", "~> 6.1.0" -gem "net-smtp", require: false -gem "base64", require: false -gem "bigdecimal", require: false -gem "drb", require: false -gem "mutex_m", require: false - -gemspec path: "../" diff --git a/spec/support/html_escape_helper.rb b/spec/support/html_escape_helper.rb index d47edc11..08617861 100644 --- a/spec/support/html_escape_helper.rb +++ b/spec/support/html_escape_helper.rb @@ -1,6 +1,6 @@ module HTMLEscapeHelper def translated_string(key) - if [7.0, 7.1].include?(Rails::VERSION::STRING.to_f) + if [7.0].include?(Rails::VERSION::STRING.to_f) ERB::Util.html_escape_once(I18n.t(key)) else I18n.t(key)