* lib/rubygems: Update to RubyGems 1.8.6.1.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32693 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 19 insertions, 11 deletions

diff --git a/test/rubygems/test_gem_commands_which_command.rb b/test/rubygems/test_gem_commands_which_command.rb
index 5e42debb74..4985395871 100644
--- a/test/rubygems/test_gem_commands_which_command.rb
+++ b/test/rubygems/test_gem_commands_which_command.rb
@@ -1,9 +1,3 @@
-######################################################################
-# This file is imported from the rubygems project.
-# DO NOT make modifications in this repo. They _will_ be reverted!
-# File a patch instead and assign it to Ryan Davis or Eric Hodel.
-######################################################################
-
 require 'rubygems/test_case'
 require 'rubygems/commands/which_command'
 
@@ -28,24 +22,38 @@ class TestGemCommandsWhichCommand < Gem::TestCase
     assert_equal '', @ui.error
   end
 
+  def test_execute_directory
+    @cmd.handle_options %w[directory]
+
+    use_ui @ui do
+      assert_raises Gem::MockGemUi::TermError do
+        @cmd.execute
+      end
+    end
+
+    assert_equal '', @ui.output
+    assert_match %r%Can.t find ruby library file or shared library directory\n%,
+                 @ui.error
+  end
+
   def test_execute_one_missing
     # TODO: this test fails in isolation
 
     util_foo_bar
 
-    @cmd.handle_options %w[foo_bar missinglib]
+    @cmd.handle_options %w[foo_bar missing]
 
     use_ui @ui do
       @cmd.execute
     end
 
     assert_equal "#{@foo_bar.full_gem_path}/lib/foo_bar.rb\n", @ui.output
-    assert_match %r%Can.t find ruby library file or shared library missinglib\n%,
+    assert_match %r%Can.t find ruby library file or shared library missing\n%,
                  @ui.error
   end
 
   def test_execute_missing
-    @cmd.handle_options %w[missinglib]
+    @cmd.handle_options %w[missing]
 
     use_ui @ui do
       assert_raises Gem::MockGemUi::TermError do
@@ -54,12 +62,12 @@ class TestGemCommandsWhichCommand < Gem::TestCase
     end
 
     assert_equal '', @ui.output
-    assert_match %r%Can.t find ruby library file or shared library missinglib\n%,
+    assert_match %r%Can.t find ruby library file or shared library missing\n%,
                  @ui.error
   end
 
   def util_foo_bar
-    files = %w[lib/foo_bar.rb Rakefile]
+    files = %w[lib/foo_bar.rb lib/directory/baz.rb Rakefile]
     @foo_bar = quick_spec 'foo_bar' do |gem|
       gem.files = files
     end