diff options
| author | David RodrÃguez <deivid.rodriguez@riseup.net> | 2021-12-04 14:00:02 +0100 |
|---|---|---|
| committer | git <svn-admin@ruby-lang.org> | 2022-09-29 03:41:51 +0900 |
| commit | 00a040dda3bd2955aa6f470578d639b3c4fc3220 (patch) | |
| tree | 052c57999f0b5989944f99853ed8534faac0a9b3 | |
| parent | 874a2bf17c8136bf4a9a9abee6ba2b3ab0f82add (diff) | |
| download | ruby-00a040dda3bd2955aa6f470578d639b3c4fc3220.tar.gz | |
[rubygems/rubygems] Little refactor to keep things consistent
https://github.com/rubygems/rubygems/commit/3934deb4e4
| -rw-r--r-- | test/rubygems/helper.rb | 4 | ||||
| -rw-r--r-- | test/rubygems/test_gem.rb | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/test/rubygems/helper.rb b/test/rubygems/helper.rb index 5eae310222..1ab23c2983 100644 --- a/test/rubygems/helper.rb +++ b/test/rubygems/helper.rb @@ -1297,6 +1297,10 @@ Also, a list: $LOAD_PATH.find {|p| p == File.dirname($LOADED_FEATURES.find {|f| f.end_with?("/rubygems.rb") }) } end + def bundler_path + $LOAD_PATH.find {|p| p == File.dirname($LOADED_FEATURES.find {|f| f.end_with?("/bundler.rb") }) } + end + def with_clean_path_to_ruby orig_ruby = Gem.ruby diff --git a/test/rubygems/test_gem.rb b/test/rubygems/test_gem.rb index f3a543dd05..8ed374eb0b 100644 --- a/test/rubygems/test_gem.rb +++ b/test/rubygems/test_gem.rb @@ -1676,8 +1676,6 @@ class TestGem < Gem::TestCase end end - BUNDLER_LIB_PATH = File.expand_path $LOAD_PATH.find {|lp| File.file?(File.join(lp, "bundler.rb")) } - def add_bundler_full_name(names) names << "bundler-#{Bundler::VERSION}".freeze names.sort! @@ -1708,7 +1706,7 @@ class TestGem < Gem::TestCase with_rubygems_gemdeps("-") do new_PATH = [File.join(path, "bin"), ENV["PATH"]].join(File::PATH_SEPARATOR) - new_RUBYOPT = "-I#{rubygems_path} -I#{BUNDLER_LIB_PATH}" + new_RUBYOPT = "-I#{rubygems_path} -I#{bundler_path}" path = File.join @tempdir, "gem.deps.rb" @@ -1759,7 +1757,7 @@ class TestGem < Gem::TestCase Dir.mkdir "sub1" new_PATH = [File.join(path, "bin"), ENV["PATH"]].join(File::PATH_SEPARATOR) - new_RUBYOPT = "-I#{rubygems_path} -I#{BUNDLER_LIB_PATH}" + new_RUBYOPT = "-I#{rubygems_path} -I#{bundler_path}" path = File.join @tempdir, "gem.deps.rb" |