Previous approach for not walking further up from test folderbetter_test_specific_file_searching

I tried monkeypatching the gemfile finder methods in hax.rb, but that
resulted in loading parts of bundler too early, and getting redefinition
warnings when loading them again from exe/bundle, resulting in actual
errors in some cases. The fix for that required eagerly loading the
monkeypatched parts of bundler, but that involves changing lib just for
the sake of making existing tests pass, and that's what the original
changes intend to avoid.

So, I'm just reverting to the previous approach of setting an
environment variable just for testing and check that.

Reverts 11597fef24274bf1542384512faed697d7f41e3b.

1 files changed, 13 insertions, 0 deletions

diff --git a/lib/bundler/shared_helpers.rb b/lib/bundler/shared_helpers.rb
index da2a384d29..d259f20e6b 100644
--- a/lib/bundler/shared_helpers.rb
+++ b/lib/bundler/shared_helpers.rb
@@ -253,6 +253,19 @@ module Bundler
       current  = File.expand_path(SharedHelpers.pwd).untaint
 
       until !File.directory?(current) || current == previous
+        if ENV["BUNDLE_SPEC_RUN"]
+          # avoid stepping above the tmp directory when testing
+          gemspec = if ENV["BUNDLE_RUBY"] && ENV["BUNDLE_GEM"]
+            # for Ruby Core
+            "lib/bundler/bundler.gemspec"
+          else
+            "bundler.gemspec"
+          end
+
+          # avoid stepping above the tmp directory when testing
+          return nil if File.file?(File.join(current, gemspec))
+        end
+
         names.each do |name|
           filename = File.join(current, name)
           yield filename