Skip to content

Commit 08521cb

Browse files
Merge pull request #4653 from nobu/ignore-uplevel-gemfiles
Ignore any gemfiles in parent directories (cherry picked from commit eabf2b3)
1 parent 1f80f94 commit 08521cb

File tree

4 files changed

+13
-3
lines changed

4 files changed

+13
-3
lines changed

lib/rubygems/test_case.rb

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -553,6 +553,10 @@ def common_installer_teardown
553553
Gem.pre_uninstall_hooks.clear
554554
end
555555

556+
def without_any_upwards_gemfiles
557+
ENV["BUNDLE_GEMFILE"] = File.join(@tempdir, "Gemfile")
558+
end
559+
556560
##
557561
# A git_gem is used with a gem dependencies file. The gem created here
558562
# has no files, just a gem specification for the given +name+ and +version+.

test/rubygems/test_gem_bundler_version_finder.rb

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,12 @@ def setup
66
super
77

88
@argv = ARGV.dup
9-
@env = ENV.to_hash.clone
10-
ENV.delete("BUNDLER_VERSION")
119
@dollar_0 = $0
10+
without_any_upwards_gemfiles
1211
end
1312

1413
def teardown
1514
ARGV.replace @argv
16-
ENV.replace @env
1715
$0 = @dollar_0
1816

1917
super

test/rubygems/test_gem_dependency.rb

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@
33
require 'rubygems/dependency'
44

55
class TestGemDependency < Gem::TestCase
6+
def setup
7+
super
8+
9+
without_any_upwards_gemfiles
10+
end
11+
612
def test_initialize
713
d = dep "pkg", "> 1.0"
814

test/rubygems/test_kernel.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ def setup
88
@old_path = $:.dup
99

1010
util_make_gems
11+
12+
without_any_upwards_gemfiles
1113
end
1214

1315
def teardown

0 commit comments

Comments
 (0)