From 22d9456b7917fe96fa81fd1d994073312753af8b Mon Sep 17 00:00:00 2001
From: drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 17 Apr 2012 20:50:00 +0000
Subject: * lib/rubygems:  Update to RubyGems 1.8.22 plus r33517 and r35337
 which   were ported to the rubygems git repository.

  See https://github.com/rubygems/rubygems/blob/1.8/History.txt for
  changes since 1.8.11.
* test/rubygems:  ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35370 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 test/rubygems/test_gem_commands_install_command.rb | 33 ++++++++++++++++++++++
 1 file changed, 33 insertions(+)

(limited to 'test/rubygems/test_gem_commands_install_command.rb')

diff --git a/test/rubygems/test_gem_commands_install_command.rb b/test/rubygems/test_gem_commands_install_command.rb
index bd61db5e45..2215d4d4ab 100644
--- a/test/rubygems/test_gem_commands_install_command.rb
+++ b/test/rubygems/test_gem_commands_install_command.rb
@@ -3,6 +3,7 @@ require 'rubygems/commands/install_command'
 
 begin
   gem "rdoc"
+  gem "json"
 rescue Gem::LoadError
   # ignore
 end
@@ -177,6 +178,38 @@ class TestGemCommandsInstallCommand < Gem::TestCase
     assert_match(/ould not find a valid gem 'nonexistent'/, @ui.error)
   end
 
+  def test_execute_bad_source
+    util_setup_fake_fetcher
+    util_setup_spec_fetcher
+
+    # This is needed because we need to exercise the cache path
+    # within SpecFetcher
+    path = File.join Gem.user_home, '.gem', 'specs', "not-there.nothing%80",
+                                    "latest_specs.4.8"
+
+    FileUtils.mkdir_p File.dirname(path)
+
+    File.open path, "w" do |f|
+      f.write Marshal.dump([])
+    end
+
+    Gem.sources.replace ["http://not-there.nothing"]
+
+    @cmd.options[:args] = %w[nonexistent]
+
+    use_ui @ui do
+      e = assert_raises Gem::SystemExitException do
+        @cmd.execute
+      end
+      assert_equal 2, e.exit_code
+    end
+
+    errs = @ui.error.split("\n")
+
+    assert_match(/WARNING:  Error fetching data/, errs.shift)
+    assert_match(/ould not find a valid gem 'nonexistent'/, errs.shift)
+  end
+
   def test_execute_nonexistent_with_hint
     misspelled = "nonexistent_with_hint"
     correctly_spelled = "non_existent_with_hint"
-- 
cgit v1.2.3