diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3809b9fe5..22abd9ad8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -70,55 +70,6 @@ jobs: - ruby: 2.5 env: RAILS_VERSION: '~> 6.1.0' - - ruby: jruby-9.3.1.0 - env: - RAILS_VERSION: '~> 6.1.0' - JRUBY_OPT: '--dev' - JAVA_OPTS: '--add-opens java.base/sun.nio.ch=org.jruby.dist --add-opens java.base/java.io=org.jruby.dist --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.security=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.security.cert=ALL-UNNAMED --add-opens=java.base/java.util.zip=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/java.util.regex=ALL-UNNAMED --add-opens=java.base/java.net=ALL-UNNAMED --add-opens=java.base/java.io=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/javax.crypto=ALL-UNNAMED --add-opens=java.management/sun.management=ALL-UNNAMED' - - # Rails 6.0 builds >= 2.5.0 - - ruby: '3.0' - env: - RAILS_VERSION: '~> 6.0.0' - - ruby: 2.7 - env: - RAILS_VERSION: '~> 6.0.0' - - ruby: 2.6 - env: - RAILS_VERSION: '~> 6.0.0' - - ruby: 2.5 - env: - RAILS_VERSION: '~> 6.0.0' - - ruby: jruby-9.3.1.0 - env: - RAILS_VERSION: '~> 6.0.0' - JRUBY_OPT: '--dev' - JAVA_OPTS: '--add-opens java.base/sun.nio.ch=org.jruby.dist --add-opens java.base/java.io=org.jruby.dist --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.security=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.security.cert=ALL-UNNAMED --add-opens=java.base/java.util.zip=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/java.util.regex=ALL-UNNAMED --add-opens=java.base/java.net=ALL-UNNAMED --add-opens=java.base/java.io=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/javax.crypto=ALL-UNNAMED --add-opens=java.management/sun.management=ALL-UNNAMED' - - # Rails 5.2 builds >= 2.2.2 - - ruby: 2.6.6 - env: - RAILS_VERSION: '~> 5.2.0' - - ruby: 2.5.8 - env: - RAILS_VERSION: '~> 5.2.0' - - ruby: 2.4.10 - env: - RAILS_VERSION: '~> 5.2.0' - - ruby: 2.3.8 - env: - RAILS_VERSION: '~> 5.2.0' - - ruby: 2.2.10 - env: - RAILS_VERSION: '~> 5.2.0' - - ruby: 2.2.10 - env: - RAILS_VERSION: '5-2-stable' - - ruby: jruby-9.3.1.0 - env: - RAILS_VERSION: '~> 5.2.0' - JRUBY_OPT: '--dev' - JAVA_OPTS: '--add-opens java.base/sun.nio.ch=org.jruby.dist --add-opens java.base/java.io=org.jruby.dist --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.security=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.security.cert=ALL-UNNAMED --add-opens=java.base/java.util.zip=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/java.util.regex=ALL-UNNAMED --add-opens=java.base/java.net=ALL-UNNAMED --add-opens=java.base/java.io=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/javax.crypto=ALL-UNNAMED --add-opens=java.management/sun.management=ALL-UNNAMED' env: ${{ matrix.env }} steps: diff --git a/Gemfile-rails-dependencies b/Gemfile-rails-dependencies index 4cede628d..1e29eb66a 100644 --- a/Gemfile-rails-dependencies +++ b/Gemfile-rails-dependencies @@ -26,23 +26,14 @@ when /stable$/ gem rails_gem, :git => "https://github.com/rails/rails.git", :branch => version end when nil, false, "" - add_net_gems_dependency # TODO: remove when we use switch to "~> 7.0.0" that declares dependency on those gems on itself - gem "rails", "~> 6.0.0" + gem "rails", "~> 7.0.0" gem "puma" gem 'activerecord-jdbcsqlite3-adapter', platforms: [:jruby] gem 'selenium-webdriver', require: false else - rails_version = version.split(' ').last - - add_net_gems_dependency if rails_version < '7.0' + add_net_gems_dependency if version.split(' ').last < '7.0' gem "rails", version - - if rails_version < '6.0' && RUBY_VERSION < '2.3' - gem "activesupport", "~> 5.2", "!= 5.2.6.1", "!= 5.2.6.2" - end - - gem "sprockets", '~> 3.0' if RUBY_VERSION < '2.5' gem "puma" gem 'activerecord-jdbcsqlite3-adapter', platforms: [:jruby] gem 'selenium-webdriver', require: false diff --git a/README.md b/README.md index e5c0e135d..09ed156aa 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,8 @@ detailed explanations of how the application is supposed to behave, expressed in plain English. According to [RSpec Rails new versioning strategy][] use: -* **[`rspec-rails` 5.x][]** for Rails 6.x. +* **[`rspec-rails` 6.x][]** for Rails 6.1 or 7.x. +* **[`rspec-rails` 5.x][]** for Rails 5.2 or 6.x. * **[`rspec-rails` 4.x][]** for Rails from 5.x or 6.x. * **[`rspec-rails` 3.x][]** for Rails earlier than 5.0. * **[`rspec-rails` 1.x][]** for Rails 2.x. @@ -25,13 +26,14 @@ According to [RSpec Rails new versioning strategy][] use: [`rspec-rails` 1.x]: https://github.com/dchelimsky/rspec-rails [`rspec-rails` 3.x]: https://github.com/rspec/rspec-rails/tree/3-9-maintenance [`rspec-rails` 4.x]: https://github.com/rspec/rspec-rails/tree/4-1-maintenance -[`rspec-rails` 5.x]: https://github.com/rspec/rspec-rails/tree/5-0-maintenance +[`rspec-rails` 5.x]: https://github.com/rspec/rspec-rails/tree/5-1-maintenance +[`rspec-rails` 6.x]: https://github.com/rspec/rspec-rails/tree/6-0-maintenance [RSpec Rails new versioning strategy]: https://github.com/rspec/rspec-rails/blob/main/rfcs/versioning-strategy.md ## Installation **IMPORTANT** This README / branch refers to the current development build. -See the [`5-0-maintenance` branch on Github](https://github.com/rspec/rspec-rails/tree/5-0-maintenance) if you want or require the latest stable release. +See the [`6-0-maintenance` branch on Github](https://github.com/rspec/rspec-rails/tree/6-0-maintenance) if you want or require the latest stable release. 1. Add `rspec-rails` to **both** the `:development` and `:test` groups of your app’s `Gemfile`: @@ -39,7 +41,7 @@ See the [`5-0-maintenance` branch on Github](https://github.com/rspec/rspec-rail ```ruby # Run against this stable release group :development, :test do - gem 'rspec-rails', '~> 5.0.0' + gem 'rspec-rails', '~> 6.0.0' end # Or, run against the main branch diff --git a/rspec-rails.gemspec b/rspec-rails.gemspec index 0b2775bde..d285a9008 100644 --- a/rspec-rails.gemspec +++ b/rspec-rails.gemspec @@ -11,7 +11,7 @@ Gem::Specification.new do |s| s.homepage = "https://github.com/rspec/rspec-rails" s.summary = "RSpec for Rails" s.description = "rspec-rails is a testing framework for Rails 5+." - s.required_ruby_version = ">= 2.2.0" + s.required_ruby_version = ">= 2.5.0" s.metadata = { 'bug_tracker_uri' => 'https://github.com/rspec/rspec-rails/issues', @@ -33,7 +33,7 @@ Gem::Specification.new do |s| s.cert_chain = [File.expand_path('~/.gem/rspec-gem-public_cert.pem')] end - version_string = ['>= 5.2'] + version_string = ['>= 6.1'] s.add_runtime_dependency 'actionpack', version_string s.add_runtime_dependency 'activesupport', version_string