diff options
| -rw-r--r-- | lib/rubygems.rb | 1 | ||||
| -rw-r--r-- | test/rubygems/test_gem.rb | 11 |
2 files changed, 8 insertions, 4 deletions
diff --git a/lib/rubygems.rb b/lib/rubygems.rb index 60a599e380..271f4d2999 100644 --- a/lib/rubygems.rb +++ b/lib/rubygems.rb @@ -1121,7 +1121,6 @@ An Array (#{env.inspect}) was passed in from #{caller[3]} ensure Gem::DefaultUserInteraction.ui.close end - @gemdeps.requested_specs.map(&:to_spec).sort_by(&:name) end rescue => e diff --git a/test/rubygems/test_gem.rb b/test/rubygems/test_gem.rb index 12612bd759..608c6bacd2 100644 --- a/test/rubygems/test_gem.rb +++ b/test/rubygems/test_gem.rb @@ -674,7 +674,9 @@ class TestGem < Gem::TestCase begin Dir.chdir 'detect/a/b' - assert_equal add_bundler_full_name([]), Gem.use_gemdeps.map(&:full_name) + Gem.use_gemdeps + + assert_equal add_bundler_full_name([]), loaded_spec_names ensure Dir.chdir @tempdir end @@ -1713,8 +1715,11 @@ class TestGem < Gem::TestCase ENV['RUBYGEMS_GEMDEPS'] = "-" - expected_specs = [a, b, util_spec("bundler", Bundler::VERSION), c].compact - assert_equal expected_specs, Gem.use_gemdeps.sort_by {|s| s.name } + expected_specs = [a, b, util_spec("bundler", Bundler::VERSION), c].compact.map(&:full_name) + + Gem.use_gemdeps + + assert_equal expected_specs, loaded_spec_names end BUNDLER_LIB_PATH = File.expand_path $LOAD_PATH.find {|lp| File.file?(File.join(lp, "bundler.rb")) } |