Build local bundler on a "thread-safe folder"thread_safe_local_bundler

1 files changed, 8 insertions, 3 deletions

diff --git a/spec/support/helpers.rb b/spec/support/helpers.rb
index dde8daaf6f..db5177f628 100644
--- a/spec/support/helpers.rb
+++ b/spec/support/helpers.rb
@@ -299,12 +299,17 @@ module Spec
     end
 
     def with_built_bundler
+      bundler_path = tmp + "bundler-#{Bundler::VERSION}.gem"
+
       with_root_gemspec do |gemspec|
-        gem_command! "build #{gemspec}", :dir => root
+        if Gem::Version.new(Gem::VERSION) >= Gem::Version.new("3.0.0")
+          gem_command! "build #{gemspec} --output #{bundler_path}", :dir => root
+        else
+          gem_command! "build #{gemspec}", :dir => root
+          FileUtils.mv root + File.basename(bundler_path), bundler_path
+        end
       end
 
-      bundler_path = root + "bundler-#{Bundler::VERSION}.gem"
-
       begin
         yield(bundler_path)
       ensure