diff options
author | David RodrÃguez <deivid.rodriguez@riseup.net> | 2022-04-01 09:23:09 +0200 |
---|---|---|
committer | git <svn-admin@ruby-lang.org> | 2022-05-11 16:55:47 +0900 |
commit | 54b1548760d3a159051247313256175904c6f36e (patch) | |
tree | aa746dfb7777218774d8875949537a5ba7f83e11 /spec/bundler | |
parent | a85cdb5a6e7d735b03eb5ae80e5ac0c5424eb259 (diff) | |
download | ruby-54b1548760d3a159051247313256175904c6f36e.tar.gz |
[rubygems/rubygems] Extract a `next_ruby_minor` helper method for specs
https://github.com/rubygems/rubygems/commit/66eae0ef1d
Diffstat (limited to 'spec/bundler')
-rw-r--r-- | spec/bundler/commands/lock_spec.rb | 10 | ||||
-rw-r--r-- | spec/bundler/support/helpers.rb | 4 |
2 files changed, 8 insertions, 6 deletions
diff --git a/spec/bundler/commands/lock_spec.rb b/spec/bundler/commands/lock_spec.rb index 9c5240157f..11f96315ca 100644 --- a/spec/bundler/commands/lock_spec.rb +++ b/spec/bundler/commands/lock_spec.rb @@ -493,27 +493,25 @@ RSpec.describe "bundle lock" do end it "does not conflict on ruby requirements when adding new platforms" do - next_minor = Gem.ruby_version.segments[0..1].map.with_index {|s, i| i == 1 ? s + 1 : s }.join(".") - build_repo4 do build_gem "raygun-apm", "1.0.78" do |s| s.platform = "x86_64-linux" - s.required_ruby_version = "< #{next_minor}.dev" + s.required_ruby_version = "< #{next_ruby_minor}.dev" end build_gem "raygun-apm", "1.0.78" do |s| s.platform = "universal-darwin" - s.required_ruby_version = "< #{next_minor}.dev" + s.required_ruby_version = "< #{next_ruby_minor}.dev" end build_gem "raygun-apm", "1.0.78" do |s| s.platform = "x64-mingw32" - s.required_ruby_version = "< #{next_minor}.dev" + s.required_ruby_version = "< #{next_ruby_minor}.dev" end build_gem "raygun-apm", "1.0.78" do |s| s.platform = "x64-mingw-ucrt" - s.required_ruby_version = "< #{next_minor}.dev" + s.required_ruby_version = "< #{next_ruby_minor}.dev" end end diff --git a/spec/bundler/support/helpers.rb b/spec/bundler/support/helpers.rb index d7556102b4..ab6a0625bb 100644 --- a/spec/bundler/support/helpers.rb +++ b/spec/bundler/support/helpers.rb @@ -471,6 +471,10 @@ module Spec end end + def next_ruby_minor + Gem.ruby_version.segments[0..1].map.with_index {|s, i| i == 1 ? s + 1 : s }.join(".") + end + # versions providing a bundler version finder but not including # https://github.com/rubygems/rubygems/commit/929e92d752baad3a08f3ac92eaec162cb96aedd1 def rubygems_version_failing_to_activate_bundler_prereleases |