Skip to content

Update RSpec gem versions #2574

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Feb 15, 2022
Merged

Update RSpec gem versions #2574

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dfed7ab
Update RSpec gem versions
JonRowe Feb 14, 2022
2e4b4a9
Downgrade Rails on Ruby 2.2
JonRowe Feb 15, 2022
0244e1b
Drop 5-2-stable changes
JonRowe Feb 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion Gemfile-rails-dependencies
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
6 changes: 3 additions & 3 deletions rspec-rails.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down