rubygems-update 2.1.11 → 2.2.0.rc.1

data/test/rubygems/test_gem_commands_sources_command.rb

@@ -6,7 +6,7 @@ class TestGemCommandsSourcesCommand < Gem::TestCase
   def setup
     super
 
-    util_setup_fake_fetcher
+    spec_fetcher
 
     @cmd = Gem::Commands::SourcesCommand.new
 
@@ -18,7 +18,6 @@ class TestGemCommandsSourcesCommand < Gem::TestCase
   end
 
   def test_execute
-    util_setup_spec_fetcher
     @cmd.handle_options []
 
     use_ui @ui do
@@ -36,9 +35,9 @@ class TestGemCommandsSourcesCommand < Gem::TestCase
   end
 
   def test_execute_add
-    util_setup_fake_fetcher
-
-    install_specs @a1
+    spec_fetcher do |fetcher|
+      fetcher.spec 'a', 1
+    end
 
     specs = Gem::Specification.map { |spec|
       [spec.name, spec.version, spec.original_platform]
@@ -54,8 +53,6 @@ class TestGemCommandsSourcesCommand < Gem::TestCase
 
     @cmd.handle_options %W[--add #{@new_repo}]
 
-    util_setup_spec_fetcher
-
     use_ui @ui do
       @cmd.execute
     end
@@ -71,19 +68,13 @@ class TestGemCommandsSourcesCommand < Gem::TestCase
   end
 
   def test_execute_add_nonexistent_source
-    util_setup_fake_fetcher
-
     uri = "http://beta-gems.example.com/specs.#{@marshal_version}.gz"
     @fetcher.data[uri] = proc do
       raise Gem::RemoteFetcher::FetchError.new('it died', uri)
     end
 
-    Gem::RemoteFetcher.fetcher = @fetcher
-
     @cmd.handle_options %w[--add http://beta-gems.example.com]
 
-    util_setup_spec_fetcher
-
     use_ui @ui do
       assert_raises Gem::MockGemUi::TermError do
         @cmd.execute
@@ -102,8 +93,6 @@ Error fetching http://beta-gems.example.com:
   def test_execute_add_redundant_source
     @cmd.handle_options %W[--add #{@gem_repo}]
 
-    util_setup_spec_fetcher
-
     use_ui @ui do
       @cmd.execute
     end
@@ -120,9 +109,10 @@ source #{@gem_repo} already present in the cache
 
   def test_execute_add_http_rubygems_org
     http_rubygems_org = 'http://rubygems.org'
-    util_setup_fake_fetcher
 
-    install_specs @a1
+    spec_fetcher do |fetcher|
+      fetcher.spec 'a', 1
+    end
 
     specs = Gem::Specification.map { |spec|
       [spec.name, spec.version, spec.original_platform]
@@ -138,8 +128,6 @@ source #{@gem_repo} already present in the cache
 
     @cmd.handle_options %W[--add #{http_rubygems_org}]
 
-    util_setup_spec_fetcher
-
     ui = Gem::MockGemUi.new "n"
 
     use_ui ui do
@@ -160,8 +148,6 @@ source #{@gem_repo} already present in the cache
   def test_execute_add_bad_uri
     @cmd.handle_options %w[--add beta-gems.example.com]
 
-    util_setup_spec_fetcher
-
     use_ui @ui do
       assert_raises Gem::MockGemUi::TermError do
         @cmd.execute
@@ -181,8 +167,6 @@ beta-gems.example.com is not a URI
   def test_execute_clear_all
     @cmd.handle_options %w[--clear-all]
 
-    util_setup_spec_fetcher
-
     use_ui @ui do
       @cmd.execute
     end
@@ -218,8 +202,6 @@ beta-gems.example.com is not a URI
   def test_execute_remove
     @cmd.handle_options %W[--remove #{@gem_repo}]
 
-    util_setup_spec_fetcher
-
     use_ui @ui do
       @cmd.execute
     end
@@ -233,8 +215,6 @@ beta-gems.example.com is not a URI
   def test_execute_remove_no_network
     @cmd.handle_options %W[--remove #{@gem_repo}]
 
-    util_setup_fake_fetcher
-
     @fetcher.data["#{@gem_repo}Marshal.#{Gem.marshal_version}"] = proc do
       raise Gem::RemoteFetcher::FetchError
     end
@@ -252,22 +232,9 @@ beta-gems.example.com is not a URI
   def test_execute_update
     @cmd.handle_options %w[--update]
 
-    util_setup_fake_fetcher
-    util_setup_spec_fetcher @a1
-
-    specs = Gem::Specification.map { |spec|
-      [spec.name, spec.version, spec.original_platform]
-    }
-
-    @fetcher.data["#{@gem_repo}specs.#{Gem.marshal_version}.gz"] =
-      util_gzip Marshal.dump(specs)
-
-    latest_specs = Gem::Specification.latest_specs.map { |spec|
-      [spec.name, spec.version, spec.original_platform]
-    }
-
-    @fetcher.data["#{@gem_repo}latest_specs.#{Gem.marshal_version}.gz"] =
-      util_gzip Marshal.dump(latest_specs)
+    spec_fetcher do |fetcher|
+      fetcher.gem 'a', 1
+    end
 
     use_ui @ui do
       @cmd.execute

data/test/rubygems/test_gem_commands_specification_command.rb

@@ -10,7 +10,7 @@ class TestGemCommandsSpecificationCommand < Gem::TestCase
   end
 
   def test_execute
-    foo = quick_spec 'foo'
+    foo = util_spec 'foo'
 
     install_specs foo
 
@@ -26,8 +26,8 @@ class TestGemCommandsSpecificationCommand < Gem::TestCase
   end
 
   def test_execute_all
-    quick_spec 'foo', '0.0.1'
-    quick_spec 'foo', '0.0.2'
+    util_spec 'foo', '0.0.1'
+    util_spec 'foo', '0.0.2'
 
     @cmd.options[:args] = %w[foo]
     @cmd.options[:all] = true
@@ -44,8 +44,8 @@ class TestGemCommandsSpecificationCommand < Gem::TestCase
   end
 
   def test_execute_all_conflicts_with_version
-    quick_spec 'foo', '0.0.1'
-    quick_spec 'foo', '0.0.2'
+    util_spec 'foo', '0.0.1'
+    util_spec 'foo', '0.0.2'
 
     @cmd.options[:args] = %w[foo]
     @cmd.options[:all] = true
@@ -89,8 +89,8 @@ class TestGemCommandsSpecificationCommand < Gem::TestCase
   end
 
   def test_execute_exact_match
-    quick_spec 'foo'
-    quick_spec 'foo_bar'
+    util_spec 'foo'
+    util_spec 'foo_bar'
 
     @cmd.options[:args] = %w[foo]
 
@@ -118,7 +118,7 @@ class TestGemCommandsSpecificationCommand < Gem::TestCase
   end
 
   def test_execute_file
-    foo = quick_spec 'foo' do |s|
+    foo = util_spec 'foo' do |s|
       s.files = %w[lib/code.rb]
     end
 
@@ -152,14 +152,9 @@ class TestGemCommandsSpecificationCommand < Gem::TestCase
   end
 
   def test_execute_remote
-    foo = quick_gem 'foo'
-
-    @fetcher = Gem::FakeFetcher.new
-    Gem::RemoteFetcher.fetcher = @fetcher
-
-    util_setup_spec_fetcher foo
-
-    FileUtils.rm File.join(@gemhome, 'specifications', foo.spec_name)
+    spec_fetcher do |fetcher|
+      fetcher.spec 'foo', 1
+    end
 
     @cmd.options[:args] = %w[foo]
     @cmd.options[:domain] = :remote
@@ -173,16 +168,10 @@ class TestGemCommandsSpecificationCommand < Gem::TestCase
   end
 
   def test_execute_remote_with_version
-    foo1 = quick_gem 'foo', "1"
-    foo2 = quick_gem 'foo', "2"
-
-    @fetcher = Gem::FakeFetcher.new
-    Gem::RemoteFetcher.fetcher = @fetcher
-
-    util_setup_spec_fetcher foo1, foo2
-
-    FileUtils.rm File.join(@gemhome, 'specifications', foo1.spec_name)
-    FileUtils.rm File.join(@gemhome, 'specifications', foo2.spec_name)
+    spec_fetcher do |fetcher|
+      fetcher.spec 'foo', "1"
+      fetcher.spec 'foo', "2"
+    end
 
     @cmd.options[:args] = %w[foo]
     @cmd.options[:version] = "1"
@@ -198,16 +187,10 @@ class TestGemCommandsSpecificationCommand < Gem::TestCase
   end
 
   def test_execute_remote_without_prerelease
-    foo = new_spec 'foo', '2.0.0'
-    foo_pre = new_spec 'foo', '2.0.1.pre'
-
-    install_specs foo, foo_pre
-
-    @fetcher = Gem::FakeFetcher.new
-    Gem::RemoteFetcher.fetcher = @fetcher
-
-    util_setup_spec_fetcher foo
-    util_setup_spec_fetcher foo_pre
+    spec_fetcher do |fetcher|
+      fetcher.spec 'foo', '2.0.0'
+      fetcher.spec 'foo', '2.0.1.pre'
+    end
 
     @cmd.options[:args] = %w[foo]
     @cmd.options[:domain] = :remote
@@ -225,16 +208,10 @@ class TestGemCommandsSpecificationCommand < Gem::TestCase
   end
 
   def test_execute_remote_with_prerelease
-    foo = new_spec 'foo', '2.0.0'
-    foo_pre = new_spec 'foo', '2.0.1.pre'
-
-    install_specs foo, foo_pre
-
-    @fetcher = Gem::FakeFetcher.new
-    Gem::RemoteFetcher.fetcher = @fetcher
-
-    util_setup_spec_fetcher foo
-    util_setup_spec_fetcher foo_pre
+    spec_fetcher do |fetcher|
+      fetcher.spec 'foo', '2.0.0'
+      fetcher.spec 'foo', '2.0.1.pre'
+    end
 
     @cmd.options[:args] = %w[foo]
     @cmd.options[:domain] = :remote
@@ -253,7 +230,7 @@ class TestGemCommandsSpecificationCommand < Gem::TestCase
   end
 
   def test_execute_ruby
-    foo = quick_spec 'foo'
+    foo = util_spec 'foo'
 
     install_specs foo
 

data/test/rubygems/test_gem_commands_stale_command.rb

@@ -10,11 +10,11 @@ class TestGemCommandsStaleCommand < Gem::TestCase
 
   def test_execute_sorts
     files = %w[lib/foo_bar.rb Rakefile]
-    foo_bar = quick_spec 'foo_bar' do |gem|
+    foo_bar = util_spec 'foo_bar' do |gem|
       gem.files = files
     end
 
-    bar_baz = quick_spec 'bar_baz' do |gem|
+    bar_baz = util_spec 'bar_baz' do |gem|
       gem.files = files
     end
 

data/test/rubygems/test_gem_commands_uninstall_command.rb

@@ -24,7 +24,7 @@ class TestGemCommandsUninstallCommand < Gem::InstallerTestCase
 
     gemhome2 = "#{@gemhome}2"
 
-    a_4 = quick_spec 'a', 4
+    a_4 = util_spec 'a', 4
     install_gem a_4, :install_dir => gemhome2
 
     Gem::Specification.dirs = [@gemhome, gemhome2]
@@ -126,7 +126,7 @@ class TestGemCommandsUninstallCommand < Gem::InstallerTestCase
   end
 
   def test_execute_prerelease
-    @spec = quick_spec "pre", "2.b"
+    @spec = util_spec "pre", "2.b"
     @gem = File.join @tempdir, @spec.file_name
     FileUtils.touch @gem
 
@@ -213,7 +213,7 @@ class TestGemCommandsUninstallCommand < Gem::InstallerTestCase
 
     gemhome2 = "#{@gemhome}2"
 
-    a_4 = quick_spec 'a', 4
+    a_4 = util_spec 'a', 4
     install_gem a_4, :install_dir => gemhome2
 
     Gem::Specification.dirs = [@gemhome, gemhome2]

data/test/rubygems/test_gem_commands_unpack_command.rb

@@ -22,31 +22,22 @@ class TestGemCommandsUnpackCommand < Gem::TestCase
   end
 
   def test_get_path
-    util_setup_fake_fetcher
-    util_clear_gems
-    util_setup_spec_fetcher @a1
-
-    a1_data = nil
-
-    open @a1.cache_file, 'rb' do |fp|
-      a1_data = fp.read
+    specs = spec_fetcher do |fetcher|
+      fetcher.gem 'a', 1
     end
 
-    Gem::RemoteFetcher.fetcher.data['http://gems.example.com/gems/a-1.gem'] =
-      a1_data
-
-    dep = Gem::Dependency.new(@a1.name, @a1.version)
+    dep = Gem::Dependency.new 'a', 1
     assert_equal(
       @cmd.get_path(dep),
-      @a1.cache_file,
+      specs['a-1'].cache_file,
       'fetches a-1 and returns the cache path'
     )
 
-    FileUtils.rm @a1.cache_file
+    FileUtils.rm specs['a-1'].cache_file
 
     assert_equal(
       @cmd.get_path(dep),
-      @a1.cache_file,
+      specs['a-1'].cache_file,
       'when removed from cache, refetches a-1'
     )
   end
@@ -67,8 +58,9 @@ class TestGemCommandsUnpackCommand < Gem::TestCase
   end
 
   def test_execute_gem_path
-    util_setup_fake_fetcher
-    util_setup_spec_fetcher
+    spec_fetcher do |fetcher|
+      fetcher.gem 'a', '3.a'
+    end
 
     Gem.clear_paths
 
@@ -88,8 +80,7 @@ class TestGemCommandsUnpackCommand < Gem::TestCase
   end
 
   def test_execute_gem_path_missing
-    util_setup_fake_fetcher
-    util_setup_spec_fetcher
+    spec_fetcher
 
     Gem.clear_paths
 
@@ -109,18 +100,13 @@ class TestGemCommandsUnpackCommand < Gem::TestCase
   end
 
   def test_execute_remote
-    util_setup_fake_fetcher
-    util_setup_spec_fetcher @a1, @a2
-    util_clear_gems
+    spec_fetcher do |fetcher|
+      fetcher.spec 'a', 1
+      fetcher.gem  'a', 2
 
-    a2_data = nil
-    open @a2.cache_file, 'rb' do |fp|
-      a2_data = fp.read
+      fetcher.clear
     end
 
-    Gem::RemoteFetcher.fetcher.data['http://gems.example.com/gems/a-2.gem'] =
-      a2_data
-
     Gem.configuration.verbose = :really
     @cmd.options[:args] = %w[a]
 
@@ -186,8 +172,8 @@ class TestGemCommandsUnpackCommand < Gem::TestCase
   end
 
   def test_execute_exact_match
-    foo_spec = quick_spec 'foo'
-    foo_bar_spec = quick_spec 'foo_bar'
+    foo_spec = util_spec 'foo'
+    foo_bar_spec = util_spec 'foo_bar'
 
     use_ui @ui do
       Dir.chdir @tempdir do

data/test/rubygems/test_gem_commands_update_command.rb

@@ -17,26 +17,27 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
 
     @cmd.options[:document] = []
 
-    util_setup_fake_fetcher(true)
-    util_clear_gems
-    util_setup_spec_fetcher @a1, @a2, @a3a
-
-    @a1_path = @a1.cache_file
-    @a2_path = @a2.cache_file
-    @a3a_path = @a3a.cache_file
-
-    @fetcher.data["#{@gem_repo}gems/#{File.basename @a1_path}"] =
-      read_binary @a1_path
-    @fetcher.data["#{@gem_repo}gems/#{File.basename @a2_path}"] =
-      read_binary @a2_path
-    @fetcher.data["#{@gem_repo}gems/#{File.basename @a3a_path}"] =
-      read_binary @a3a_path
+    @specs = spec_fetcher do |fetcher|
+      fetcher.gem 'a', 1
+      fetcher.gem 'a', 2
+      fetcher.gem 'a', '3.a'
+
+      fetcher.clear
+    end
+
+    @a1_path  = @specs['a-1'].cache_file
+    @a2_path  = @specs['a-1'].cache_file
+    @a3a_path = @specs['a-3.a'].cache_file
   end
 
   def test_execute
-    util_clear_gems
+    spec_fetcher do |fetcher|
+      fetcher.gem 'a', 2
 
-    Gem::Installer.new(@a1_path).install
+      fetcher.clear
+
+      fetcher.spec 'a', 1
+    end
 
     @cmd.options[:args] = []
 
@@ -46,48 +47,17 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
 
     out = @ui.output.split "\n"
     assert_equal "Updating installed gems", out.shift
-    assert_equal "Updating #{@a2.name}", out.shift
-    assert_equal "Gems updated: #{@a2.name}", out.shift
+    assert_equal "Updating a", out.shift
+    assert_equal "Gems updated: a", out.shift
     assert_empty out
   end
 
-  def util_setup_rubygem version
-    gem = quick_spec('rubygems-update', version.to_s) do |s|
-      s.files = %w[setup.rb]
-    end
-    write_file File.join(*%W[gems #{gem.original_name} setup.rb])
-    util_build_gem gem
-    util_setup_spec_fetcher gem
-    gem
-  end
-
-  def util_setup_rubygem8
-    @rubygem8 = util_setup_rubygem 8
-  end
-
-  def util_setup_rubygem9
-    @rubygem9 = util_setup_rubygem 9
-  end
-
-  def util_setup_rubygem_current
-    @rubygem_current = util_setup_rubygem Gem::VERSION
-  end
-
-  def util_add_to_fetcher *specs
-    specs.each do |spec|
-      gem_file = spec.cache_file
-      file_name = File.basename gem_file
+  def test_execute_system
+    spec_fetcher do |fetcher|
+      fetcher.gem 'rubygems-update', 9 do |s| s.files = %w[setup.rb] end
 
-      @fetcher.data["http://gems.example.com/gems/#{file_name}"] =
-        Gem.read_binary gem_file
+      fetcher.clear
     end
-  end
-
-  def test_execute_system
-    util_clear_gems
-    util_setup_rubygem9
-    util_setup_spec_fetcher @rubygem9
-    util_add_to_fetcher @rubygem9
 
     @cmd.options[:args]          = []
     @cmd.options[:system]        = true
@@ -105,10 +75,13 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
   end
 
   def test_execute_system_at_latest
-    util_clear_gems
-    util_setup_rubygem_current
-    util_setup_spec_fetcher @rubygem_current
-    util_add_to_fetcher @rubygem_current
+    spec_fetcher do |fetcher|
+      fetcher.gem 'rubygems-update', Gem::VERSION do |s|
+        s.files = %w[setup.rb]
+      end
+
+      fetcher.clear
+    end
 
     @cmd.options[:args]          = []
     @cmd.options[:system]        = true
@@ -125,11 +98,12 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
   end
 
   def test_execute_system_multiple
-    util_clear_gems
-    util_setup_rubygem9
-    util_setup_rubygem8
-    util_setup_spec_fetcher @rubygem8, @rubygem9
-    util_add_to_fetcher @rubygem8, @rubygem9
+    spec_fetcher do |fetcher|
+      fetcher.gem 'rubygems-update', 8 do |s| s.files = %w[setup.rb] end
+      fetcher.gem 'rubygems-update', 9 do |s| s.files = %w[setup.rb] end
+
+      fetcher.clear
+    end
 
     @cmd.options[:args]          = []
     @cmd.options[:system]        = true
@@ -147,11 +121,12 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
   end
 
   def test_execute_system_specific
-    util_clear_gems
-    util_setup_rubygem9
-    util_setup_rubygem8
-    util_setup_spec_fetcher @rubygem8, @rubygem9
-    util_add_to_fetcher @rubygem8, @rubygem9
+    spec_fetcher do |fetcher|
+      fetcher.gem 'rubygems-update', 8 do |s| s.files = %w[setup.rb] end
+      fetcher.gem 'rubygems-update', 9 do |s| s.files = %w[setup.rb] end
+
+      fetcher.clear
+    end
 
     @cmd.options[:args]          = []
     @cmd.options[:system]        = "8"
@@ -169,11 +144,12 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
   end
 
   def test_execute_system_specifically_to_latest_version
-    util_clear_gems
-    util_setup_rubygem9
-    util_setup_rubygem8
-    util_setup_spec_fetcher @rubygem8, @rubygem9
-    util_add_to_fetcher @rubygem8, @rubygem9
+    spec_fetcher do |fetcher|
+      fetcher.gem 'rubygems-update', 8 do |s| s.files = %w[setup.rb] end
+      fetcher.gem 'rubygems-update', 9 do |s| s.files = %w[setup.rb] end
+
+      fetcher.clear
+    end
 
     @cmd.options[:args]          = []
     @cmd.options[:system]        = "9"
@@ -212,36 +188,16 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
   #   a2 -> c2
 
   def test_execute_dependencies
-    @a1.add_dependency 'c', '1.2'
-
-    @c2 = quick_spec 'c', '2' do |s|
-      s.files = %w[lib/code.rb]
-      s.require_paths = %w[lib]
-    end
-
-    @a2.add_dependency 'c', '2'
-    @a2.add_dependency 'b', '2'
-
-    @b2_path   = @b2.cache_file
-    @c1_2_path = @c1_2.cache_file
-    @c2_path   = @c2.cache_file
-
-    install_specs @a1, @a2, @b2, @c1_2, @c2
-
-    util_build_gem @a1
-    util_build_gem @a2
-    util_build_gem @c2
+    spec_fetcher do |fetcher|
+      fetcher.gem 'a', 2, 'b' => 2, 'c' => 2
+      fetcher.gem 'b', 2
+      fetcher.gem 'c', 2
 
-    @fetcher.data["#{@gem_repo}gems/#{@a1.file_name}"] = read_binary @a1_path
-    @fetcher.data["#{@gem_repo}gems/#{@a2.file_name}"] = read_binary @a2_path
-    @fetcher.data["#{@gem_repo}gems/#{@b2.file_name}"] = read_binary @b2_path
-    @fetcher.data["#{@gem_repo}gems/#{@c1_2.file_name}"] = read_binary @c1_2_path
-    @fetcher.data["#{@gem_repo}gems/#{@c2.file_name}"] = read_binary @c2_path
+      fetcher.clear
 
-    util_setup_spec_fetcher @a1, @a2, @b2, @c1_2, @c2
-
-    Gem::Installer.new(@c1_2_path).install
-    Gem::Installer.new(@a1_path).install
+      fetcher.spec 'a', 1, 'c' => '1.2'
+      fetcher.spec 'c', '1.2'
+    end
 
     Gem::Specification.reset
 
@@ -253,23 +209,27 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
 
     out = @ui.output.split "\n"
     assert_equal "Updating installed gems", out.shift
-    assert_equal "Updating #{@a2.name}", out.shift
-    assert_equal "Gems updated: #{@a2.name} #{@b2.name} #{@c2.name}",
+    assert_equal "Updating a", out.shift
+    assert_equal "Gems updated: a b c",
                  out.shift
 
     assert_empty out
   end
 
   def test_execute_rdoc
-    Gem.done_installing(&Gem::RDoc.method(:generation_hook))
+    spec_fetcher do |fetcher|
+      fetcher.gem 'a', 2
 
-    @cmd.options[:document] = %w[rdoc ri]
+      fetcher.clear
 
-    util_clear_gems
+      fetcher.spec 'a', 1
+    end
 
-    Gem::Installer.new(@a1_path).install
+    Gem.done_installing(&Gem::RDoc.method(:generation_hook))
+
+    @cmd.options[:document] = %w[rdoc ri]
 
-    @cmd.options[:args] = [@a1.name]
+    @cmd.options[:args] = %w[a]
 
     use_ui @ui do
       @cmd.execute
@@ -277,16 +237,22 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
 
     wait_for_child_process_to_exit
 
-    assert_path_exists File.join(@a2.doc_dir, 'ri')
-    assert_path_exists File.join(@a2.doc_dir, 'rdoc')
+    a2 = @specs['a-2']
+
+    assert_path_exists File.join(a2.doc_dir, 'ri')
+    assert_path_exists File.join(a2.doc_dir, 'rdoc')
   end
 
   def test_execute_named
-    util_clear_gems
+    spec_fetcher do |fetcher|
+      fetcher.gem 'a', 2
 
-    Gem::Installer.new(@a1_path).install
+      fetcher.clear
 
-    @cmd.options[:args] = [@a1.name]
+      fetcher.spec 'a', 1
+    end
+
+    @cmd.options[:args] = %w[a]
 
     use_ui @ui do
       @cmd.execute
@@ -294,18 +260,18 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
 
     out = @ui.output.split "\n"
     assert_equal "Updating installed gems", out.shift
-    assert_equal "Updating #{@a2.name}", out.shift
-    assert_equal "Gems updated: #{@a2.name}", out.shift
+    assert_equal "Updating a", out.shift
+    assert_equal "Gems updated: a", out.shift
 
     assert_empty out
   end
 
   def test_execute_named_up_to_date
-    util_clear_gems
-
-    Gem::Installer.new(@a2_path).install
+    spec_fetcher do |fetcher|
+      fetcher.spec 'a', 2
+    end
 
-    @cmd.options[:args] = [@a2.name]
+    @cmd.options[:args] = %w[a]
 
     use_ui @ui do
       @cmd.execute
@@ -319,11 +285,15 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
   end
 
   def test_execute_named_up_to_date_prerelease
-    util_clear_gems
+    spec_fetcher do |fetcher|
+      fetcher.gem 'a', '3.a'
 
-    Gem::Installer.new(@a2_path).install
+      fetcher.clear
 
-    @cmd.options[:args] = [@a2.name]
+      fetcher.gem 'a', 2
+    end
+
+    @cmd.options[:args] = %w[a]
     @cmd.options[:prerelease] = true
 
     use_ui @ui do
@@ -332,16 +302,16 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
 
     out = @ui.output.split "\n"
     assert_equal "Updating installed gems", out.shift
-    assert_equal "Updating #{@a3a.name}", out.shift
-    assert_equal "Gems updated: #{@a3a.name}", out.shift
+    assert_equal "Updating a", out.shift
+    assert_equal "Gems updated: a", out.shift
 
     assert_empty out
   end
 
   def test_execute_up_to_date
-    util_clear_gems
-
-    Gem::Installer.new(@a2_path).install
+    spec_fetcher do |fetcher|
+      fetcher.gem 'a', 2
+    end
 
     @cmd.options[:args] = []
 
@@ -357,9 +327,13 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
   end
 
   def test_execute_user_install
-    util_clear_gems
+    spec_fetcher do |fetcher|
+      fetcher.gem 'a', 2
 
-    Gem::Installer.new(@a1_path).install
+      fetcher.clear
+
+      fetcher.spec 'a', 1
+    end
 
     @cmd.handle_options %w[--user-install]
 
@@ -374,37 +348,51 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
   end
 
   def test_fetch_remote_gems
+    specs = spec_fetcher do |fetcher|
+      fetcher.gem 'a', 1
+      fetcher.gem 'a', 2
+    end
+
     expected = [
       [Gem::NameTuple.new('a', v(2), Gem::Platform::RUBY),
         Gem::Source.new(@gem_repo)],
     ]
 
-    assert_equal expected, @cmd.fetch_remote_gems(@a1)
+    assert_equal expected, @cmd.fetch_remote_gems(specs['a-1'])
   end
 
   def test_fetch_remote_gems_error
     Gem.sources.replace %w[http://nonexistent.example]
 
     assert_raises Gem::RemoteFetcher::FetchError do
-      @cmd.fetch_remote_gems @a1
+      @cmd.fetch_remote_gems @specs['a-1']
     end
   end
 
   def test_fetch_remote_gems_mismatch
     platform = Gem::Platform.new 'x86-freebsd9'
-    a2_p = quick_spec 'a', 2 do |s| s.platform = platform end
 
-    util_setup_spec_fetcher @a2, a2_p
+    specs = spec_fetcher do |fetcher|
+      fetcher.spec 'a', 1
+      fetcher.spec 'a', 2
+      fetcher.spec 'a', 2 do |s| s.platform = platform end
+    end
 
     expected = [
       [Gem::NameTuple.new('a', v(2), Gem::Platform::RUBY),
         Gem::Source.new(@gem_repo)],
     ]
 
-    assert_equal expected, @cmd.fetch_remote_gems(@a1)
+    assert_equal expected, @cmd.fetch_remote_gems(specs['a-1'])
   end
 
   def test_fetch_remote_gems_prerelease
+    specs = spec_fetcher do |fetcher|
+      fetcher.gem 'a', 1
+      fetcher.gem 'a', 2
+      fetcher.gem 'a', '3.a'
+    end
+
     @cmd.options[:prerelease] = true
 
     expected = [
@@ -414,7 +402,7 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
         Gem::Source.new(@gem_repo)],
     ]
 
-    assert_equal expected, @cmd.fetch_remote_gems(@a1)
+    assert_equal expected, @cmd.fetch_remote_gems(specs['a-1'])
   end
 
   def test_handle_options_system
@@ -449,4 +437,31 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
     assert_equal expected, @cmd.options
   end
 
+  def test_update_rubygems_arguments
+    @cmd.options[:system] = true
+
+    arguments = @cmd.update_rubygems_arguments
+
+    assert_equal '--prefix',           arguments.shift
+    assert_equal Gem.prefix,           arguments.shift
+    assert_equal '--no-rdoc',          arguments.shift
+    assert_equal '--no-ri',            arguments.shift
+    assert_equal '--previous-version', arguments.shift
+    assert_equal Gem::VERSION,         arguments.shift
+    assert_empty arguments
+  end
+
+  def test_update_rubygems_arguments_1_8_x
+    @cmd.options[:system] = '1.8.26'
+
+    arguments = @cmd.update_rubygems_arguments
+
+    assert_equal '--prefix',           arguments.shift
+    assert_equal Gem.prefix,           arguments.shift
+    assert_equal '--no-rdoc',          arguments.shift
+    assert_equal '--no-ri',            arguments.shift
+    assert_empty arguments
+  end
+
 end
+