From 1df42597d15416357a20bd68700ce1a2d245e8bb Mon Sep 17 00:00:00 2001 From: matz Date: Mon, 7 Mar 2011 08:44:45 +0000 Subject: cancel subversion backfire. sorry git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31046 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/rubygems/test_gem_indexer.rb | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'test/rubygems/test_gem_indexer.rb') diff --git a/test/rubygems/test_gem_indexer.rb b/test/rubygems/test_gem_indexer.rb index a7f49506a6..71fb965460 100644 --- a/test/rubygems/test_gem_indexer.rb +++ b/test/rubygems/test_gem_indexer.rb @@ -18,21 +18,20 @@ class TestGemIndexer < Gem::TestCase util_make_gems - @d2_0 = quick_gem 'd', '2.0' do |s| + @d2_0 = quick_spec 'd', '2.0' do |s| s.date = Gem::Specification::TODAY - 86400 * 3 end util_build_gem @d2_0 - @d2_0_a = quick_gem 'd', '2.0.a' + @d2_0_a = quick_spec 'd', '2.0.a' util_build_gem @d2_0_a - @d2_0_b = quick_gem 'd', '2.0.b' + @d2_0_b = quick_spec 'd', '2.0.b' util_build_gem @d2_0_b gems = File.join(@tempdir, 'gems') FileUtils.mkdir_p gems - cache_gems = File.join @gemhome, 'cache', '*.gem' - FileUtils.mv Dir[cache_gems], gems + FileUtils.mv Dir[Gem.cache_gem('*.gem', @gemhome)], gems @indexer = Gem::Indexer.new @tempdir, :rss_title => 'ExampleForge gems', :rss_host => 'example.com', @@ -60,7 +59,7 @@ class TestGemIndexer < Gem::TestCase end def test_build_indicies - spec = quick_gem 'd', '2.0' + spec = quick_spec 'd', '2.0' spec.instance_variable_set :@original_platform, '' @indexer.make_temp_directories @@ -510,17 +509,17 @@ eighty characters.</pre> assert File.directory?(quickdir) assert File.directory?(marshal_quickdir) - @d2_1 = quick_gem 'd', '2.1' + @d2_1 = quick_spec 'd', '2.1' util_build_gem @d2_1 @d2_1_tuple = [@d2_1.name, @d2_1.version, @d2_1.original_platform] - @d2_1_a = quick_gem 'd', '2.2.a' + @d2_1_a = quick_spec 'd', '2.2.a' util_build_gem @d2_1_a @d2_1_a_tuple = [@d2_1_a.name, @d2_1_a.version, @d2_1_a.original_platform] gems = File.join @tempdir, 'gems' - FileUtils.mv File.join(@gemhome, 'cache', @d2_1.file_name), gems - FileUtils.mv File.join(@gemhome, 'cache', @d2_1_a.file_name), gems + FileUtils.mv Gem.cache_gem(@d2_1.file_name, @gemhome), gems + FileUtils.mv Gem.cache_gem(@d2_1_a.file_name, @gemhome), gems use_ui @ui do @indexer.update_index -- cgit v1.2.3