From bfa2f72cfa3bfde34049d26dcb24976316074ad7 Mon Sep 17 00:00:00 2001

From: Jun Aruga <jaruga@redhat.com>

Date: Mon, 21 Mar 2022 15:36:51 +0100

Subject: [PATCH] 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>.

---

 spec/bundler/commands/binstubs_spec.rb | 5 ++++-

 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/spec/bundler/commands/binstubs_spec.rb b/spec/bundler/commands/binstubs_spec.rb

index 198226207bc..2634f43417c 100644

--- a/spec/bundler/commands/binstubs_spec.rb

+++ b/spec/bundler/commands/binstubs_spec.rb

@@ -226,7 +226,10 @@

         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