1 files changed, 19 insertions, 20 deletions
diff --git a/test/rubygems/test_gem_commands_fetch_command.rb b/test/rubygems/test_gem_commands_fetch_command.rb
index 9017a43b80..561075aac5 100644
--- a/test/rubygems/test_gem_commands_fetch_command.rb
+++ b/test/rubygems/test_gem_commands_fetch_command.rb
@@ -26,8 +26,8 @@ class TestGemCommandsFetchCommand < Gem::TestCase
       end
     end
 
-    assert File.exist?(File.join(@tempdir, @a2.file_name)),
-           "#{@a2.full_name} not fetched"
+    assert_path_exists(File.join(@tempdir, @a2.file_name),
+                       "#{@a2.full_name} not fetched")
   end
 
   def test_execute_prerelease
@@ -49,19 +49,23 @@ class TestGemCommandsFetchCommand < Gem::TestCase
       end
     end
 
-    assert File.exist?(File.join(@tempdir, @a2_pre.file_name)),
-           "#{@a2_pre.full_name} not fetched"
+    assert_path_exists(File.join(@tempdir, @a2_pre.file_name),
+                       "#{@a2_pre.full_name} not fetched")
   end
 
-  def test_execute_version
-    util_setup_fake_fetcher
-    util_setup_spec_fetcher @a1, @a2
+  def test_execute_specific_prerelease
+    util_setup_fake_fetcher true
+    util_clear_gems
+    util_setup_spec_fetcher @a2, @a2_pre
 
-    @fetcher.data["#{@gem_repo}gems/#{@a1.file_name}"] =
-      File.read(@a1.cache_file)
+    @fetcher.data["#{@gem_repo}gems/#{@a2.file_name}"] =
+      File.read(@a2.cache_file)
+    @fetcher.data["#{@gem_repo}gems/#{@a2_pre.file_name}"] =
+      File.read(@a2_pre.cache_file)
 
     @cmd.options[:args] = [@a2.name]
-    @cmd.options[:version] = Gem::Requirement.new '1'
+    @cmd.options[:prerelease] = true
+    @cmd.options[:version] = "2.a"
 
     use_ui @ui do
       Dir.chdir @tempdir do
@@ -69,16 +73,11 @@ class TestGemCommandsFetchCommand < Gem::TestCase
       end
     end
 
-    assert File.exist?(File.join(@tempdir, @a1.file_name)),
-           "#{@a1.full_name} not fetched"
+    assert_path_exists(File.join(@tempdir, @a2_pre.file_name),
+                       "#{@a2_pre.full_name} not fetched")
   end
 
-  def test_execute_handles_sources_properly
-    repo = "http://gems.example.com"
-    @uri = URI.parse repo
-
-    Gem.sources.replace [repo]
-
+  def test_execute_version
     util_setup_fake_fetcher
     util_setup_spec_fetcher @a1, @a2
 
@@ -94,8 +93,8 @@ class TestGemCommandsFetchCommand < Gem::TestCase
       end
     end
 
-    assert File.exist?(File.join(@tempdir, @a1.file_name)),
-           "#{@a1.full_name} not fetched"
+    assert_path_exists(File.join(@tempdir, @a1.file_name),
+                       "#{@a1.full_name} not fetched")
   end
 
 end