diff options
author | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-26 02:06:00 +0000 |
---|---|---|
committer | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-26 02:06:00 +0000 |
commit | 8b424513fd43c398aaeea5dede8bbc5c51602773 (patch) | |
tree | b1509d7a77a52206f7825520c99a693f7818a8a4 /test/rubygems/test_gem.rb | |
parent | dbf3fb3d8e6e10e2ac2af19937e0016a4815ca50 (diff) | |
download | ruby-8b424513fd43c398aaeea5dede8bbc5c51602773.tar.gz |
Upgrade to RubyGems 1.2.0 r1824. Incorporates [ruby-core:17353].
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@17576 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/rubygems/test_gem.rb')
-rw-r--r-- | test/rubygems/test_gem.rb | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/test/rubygems/test_gem.rb b/test/rubygems/test_gem.rb index e5dcef0d57..0c2a03160d 100644 --- a/test/rubygems/test_gem.rb +++ b/test/rubygems/test_gem.rb @@ -279,16 +279,16 @@ class TestGem < RubyGemTestCase end def test_self_path_ENV_PATH - Gem.clear_paths + Gem.send :set_paths, nil path_count = Gem.path.size - path_count -= 1 if defined? APPLE_GEM_HOME Gem.clear_paths - util_ensure_gem_dirs ENV['GEM_PATH'] = @additional.join(File::PATH_SEPARATOR) assert_equal @additional, Gem.path[0,2] - assert_equal path_count + @additional.size, Gem.path.size + + assert_equal path_count + @additional.size, Gem.path.size, + "extra path components: #{Gem.path[2..-1].inspect}" assert_match Gem.dir, Gem.path.last end @@ -337,6 +337,7 @@ class TestGem < RubyGemTestCase file_name = File.expand_path __FILE__ prefix = File.dirname File.dirname(file_name) + prefix = File.dirname prefix if File.basename(prefix) == 'test' Gem::ConfigMap[:libdir] = prefix @@ -350,6 +351,7 @@ class TestGem < RubyGemTestCase file_name = File.expand_path __FILE__ prefix = File.dirname File.dirname(file_name) + prefix = File.dirname prefix if File.basename(prefix) == 'test' Gem::ConfigMap[:sitelibdir] = prefix |