diff options
Diffstat (limited to 'test/rubygems/test_gem.rb')
| -rw-r--r-- | test/rubygems/test_gem.rb | 35 |
1 files changed, 22 insertions, 13 deletions
diff --git a/test/rubygems/test_gem.rb b/test/rubygems/test_gem.rb index 723b2559bc..4fe5e8661c 100644 --- a/test/rubygems/test_gem.rb +++ b/test/rubygems/test_gem.rb @@ -10,17 +10,18 @@ class TestGem < RubyGemTestCase super @additional = %w[a b].map { |d| File.join @tempdir, d } - @default_dir_re = %r|/ruby/gems/[0-9.]+| + @default_dir_re = %r|/[Rr]uby/[Gg]ems/[0-9.]+| end def test_self_all_load_paths util_make_gems expected = [ - File.join(@tempdir, *%w[gemhome gems a-0.0.1 lib]), - File.join(@tempdir, *%w[gemhome gems a-0.0.2 lib]), - File.join(@tempdir, *%w[gemhome gems b-0.0.2 lib]), - File.join(@tempdir, *%w[gemhome gems c-1.2 lib]), + File.join(@gemhome, *%W[gems #{@a0_0_1.full_name} lib]), + File.join(@gemhome, *%W[gems #{@a0_0_2.full_name} lib]), + File.join(@gemhome, *%W[gems #{@b0_0_2.full_name} lib]), + File.join(@gemhome, *%W[gems #{@c1_2.full_name} lib]), + File.join(@gemhome, *%W[gems #{@pl1.full_name} lib]), ] assert_equal expected, Gem.all_load_paths.sort @@ -34,8 +35,9 @@ class TestGem < RubyGemTestCase def test_self_bindir_default_dir default = Gem.default_dir - assert_equal Config::CONFIG['bindir'], Gem.bindir(default) - assert_equal Config::CONFIG['bindir'], Gem.bindir(Pathname.new(default)) + bindir = (defined? RUBY_FRAMEWORK_VERSION) ? '/usr/bin' : Config::CONFIG['bindir'] + assert_equal bindir, Gem.bindir(default) + assert_equal bindir, Gem.bindir(Pathname.new(default)) end def test_self_clear_paths @@ -172,9 +174,10 @@ class TestGem < RubyGemTestCase util_make_gems expected = [ - File.join(@tempdir, *%w[gemhome gems a-0.0.2 lib]), - File.join(@tempdir, *%w[gemhome gems b-0.0.2 lib]), - File.join(@tempdir, *%w[gemhome gems c-1.2 lib]), + File.join(@gemhome, *%W[gems #{@a0_0_2.full_name} lib]), + File.join(@gemhome, *%W[gems #{@b0_0_2.full_name} lib]), + File.join(@gemhome, *%W[gems #{@c1_2.full_name} lib]), + File.join(@gemhome, *%W[gems #{@pl1.full_name} lib]), ] assert_equal expected, Gem.latest_load_paths.sort @@ -196,12 +199,14 @@ class TestGem < RubyGemTestCase def test_self_path_ENV_PATH Gem.clear_paths + path_count = Gem.path.size + Gem.clear_paths util_ensure_gem_dirs ENV['GEM_PATH'] = @additional.join(File::PATH_SEPARATOR) assert_equal @additional, Gem.path[0,2] - assert_equal 3, Gem.path.size + assert_equal path_count + @additional.size, Gem.path.size assert_match Gem.dir, Gem.path.last end @@ -214,7 +219,9 @@ class TestGem < RubyGemTestCase ENV['GEM_PATH'] = dirs.join File::PATH_SEPARATOR assert_equal @gemhome, Gem.dir - assert_equal @additional + [Gem.dir], Gem.path + paths = [Gem.dir] + paths << APPLE_GEM_HOME if defined? APPLE_GEM_HOME + assert_equal @additional + paths, Gem.path end def test_self_path_overlap @@ -225,7 +232,9 @@ class TestGem < RubyGemTestCase ENV['GEM_PATH'] = @additional.join(File::PATH_SEPARATOR) assert_equal @gemhome, Gem.dir - assert_equal @additional + [Gem.dir], Gem.path + paths = [Gem.dir] + paths.insert(0, APPLE_GEM_HOME) if defined? APPLE_GEM_HOME + assert_equal @additional + paths, Gem.path end def test_self_platforms |