diff options
| author | nagachika <nagachika@ruby-lang.org> | 2022-05-01 18:44:55 +0900 |
|---|---|---|
| committer | nagachika <nagachika@ruby-lang.org> | 2022-05-01 18:44:55 +0900 |
| commit | 7202f862ab423bb0f45ebb62eeccc6fd520f435d (patch) | |
| tree | 58d98aceba1f82dffddf69fc2d6027b77d37b64a | |
| parent | be7bcee858c5c05239893c3db115c3ff78c1c6ae (diff) | |
merge revision(s) 1ff174bfd17f80433f2cb9888eafd1c297efd2a5:
[rubygems/rubygems] Fix a test for `bin/bundle update --bundler` to
pass on ruby/ruby.
Consider the case that the latest Bundler version on RubyGems is higher than
the `system_bundler_version` (= `Bundler::VERSION`) in `make test-bundler` on
ruby/ruby.
See <https://bugs.ruby-lang.org/issues/18643>.
https://github.com/rubygems/rubygems/commit/bfa2f72cfa
---
spec/bundler/commands/binstubs_spec.rb | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
| -rw-r--r-- | spec/bundler/commands/binstubs_spec.rb | 5 | ||||
| -rw-r--r-- | tool/bundler/rubocop_gems.rb.lock | 1 | ||||
| -rw-r--r-- | tool/bundler/standard_gems.rb.lock | 1 | ||||
| -rw-r--r-- | version.h | 2 |
4 files changed, 7 insertions, 2 deletions
diff --git a/spec/bundler/commands/binstubs_spec.rb b/spec/bundler/commands/binstubs_spec.rb index 198226207b..2634f43417 100644 --- a/spec/bundler/commands/binstubs_spec.rb +++ b/spec/bundler/commands/binstubs_spec.rb @@ -226,7 +226,10 @@ RSpec.describe "bundle binstubs <gem>" do it "calls through to the latest bundler version" do sys_exec "bin/bundle update --bundler", :env => { "DEBUG" => "1" } - expect(out).to include %(Using bundler #{system_bundler_version}\n) + using_bundler_line = /Using bundler ([\w\.]+)\n/.match(out) + expect(using_bundler_line).to_not be_nil + latest_version = using_bundler_line[1] + expect(Gem::Version.new(latest_version)).to be >= Gem::Version.new(system_bundler_version) end it "calls through to the explicit bundler version" do diff --git a/tool/bundler/rubocop_gems.rb.lock b/tool/bundler/rubocop_gems.rb.lock index 2d0439f0c3..bcf1972f8b 100644 --- a/tool/bundler/rubocop_gems.rb.lock +++ b/tool/bundler/rubocop_gems.rb.lock @@ -49,6 +49,7 @@ PLATFORMS universal-java-11 x86_64-darwin-19 x86_64-darwin-20 + x86_64-darwin-21 x86_64-linux DEPENDENCIES diff --git a/tool/bundler/standard_gems.rb.lock b/tool/bundler/standard_gems.rb.lock index b29da06064..0ae48a1974 100644 --- a/tool/bundler/standard_gems.rb.lock +++ b/tool/bundler/standard_gems.rb.lock @@ -55,6 +55,7 @@ PLATFORMS universal-java-11 x86_64-darwin-19 x86_64-darwin-20 + x86_64-darwin-21 x86_64-linux DEPENDENCIES @@ -11,7 +11,7 @@ # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR #define RUBY_VERSION_TEENY 3 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR -#define RUBY_PATCHLEVEL 24 +#define RUBY_PATCHLEVEL 25 #define RUBY_RELEASE_YEAR 2022 #define RUBY_RELEASE_MONTH 5 |