Merge pull request #2574 from rspec/update-rspec-versions

Update RSpec gem versions
rspec · Feb 15, 2022 · b4f58f4 · b4f58f4
2 parents 620a869 + 0244e1b
commit b4f58f4
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/Gemfile-rails-dependencies b/Gemfile-rails-dependencies
@@ -32,8 +32,16 @@ when nil, false, ""
   gem 'activerecord-jdbcsqlite3-adapter', platforms: [:jruby]
   gem 'selenium-webdriver', require: false
 else
-  add_net_gems_dependency if version.split(' ').last < '7.0'
+  rails_version = version.split(' ').last
+
+  add_net_gems_dependency if rails_version < '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]

diff --git a/rspec-rails.gemspec b/rspec-rails.gemspec
@@ -46,12 +46,12 @@ Gem::Specification.new do |s|
   # get released.
   %w[core expectations mocks support].each do |name|
     if ENV['RSPEC_CI']
-      s.add_runtime_dependency "rspec-#{name}", ENV.fetch('RSPEC_VERSION', '3.11.0.pre')
+      s.add_runtime_dependency "rspec-#{name}", ENV.fetch('RSPEC_VERSION', '3.12.0.pre')
     elsif RSpec::Rails::Version::STRING =~ /pre/ # prerelease builds
-      expected_rspec_version = "3.11.0.pre"
+      expected_rspec_version = "3.12.0.pre"
       s.add_runtime_dependency "rspec-#{name}", "= #{expected_rspec_version}"
     else
-      expected_rspec_version = "3.10.0"
+      expected_rspec_version = "3.11.0"
       s.add_runtime_dependency "rspec-#{name}", "~> #{expected_rspec_version.split(".")[0..1].join(".")}"
     end
   end