Allow searching past bundler.gemspec outside of tests

1 files changed, 6 insertions, 3 deletions

diff --git a/lib/bundler/shared_helpers.rb b/lib/bundler/shared_helpers.rb
index 20354cd4..61dd448b 100644
--- a/lib/bundler/shared_helpers.rb
+++ b/lib/bundler/shared_helpers.rb
@@ -33,14 +33,17 @@ module Bundler
   private
 
     def find_gemfile
-      return ENV['BUNDLE_GEMFILE'] if ENV['BUNDLE_GEMFILE'] && !ENV['BUNDLE_GEMFILE'].empty?
+      given = ENV['BUNDLE_GEMFILE']
+      return given if given && !given.empty?
 
       previous = nil
       current  = File.expand_path(Dir.pwd)
 
       until !File.directory?(current) || current == previous
-        # avoid stepping above the tmp directory when testing
-        return nil if File.file?(File.join(current, 'bundler.gemspec'))
+        if ENV['BUNDLE_SPEC_RUN']
+          # avoid stepping above the tmp directory when testing
+          return nil if File.file?(File.join(current, 'bundler.gemspec'))
+        end
 
         # otherwise return the Gemfile if it's there
         filename = File.join(current, 'Gemfile')