Import rubygems 1.5.0 (release candidate)

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

1 files changed, 12 insertions, 9 deletions

diff --git a/test/rubygems/test_kernel.rb b/test/rubygems/test_kernel.rb
index 524b20d82b..dcbb8770f8 100644
--- a/test/rubygems/test_kernel.rb
+++ b/test/rubygems/test_kernel.rb
@@ -1,5 +1,10 @@
-require_relative 'gemutilities'
-require 'rubygems/package'
+######################################################################
+# 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 "test/rubygems/gemutilities"
 
 class TestKernel < RubyGemTestCase
 
@@ -20,21 +25,18 @@ class TestKernel < RubyGemTestCase
   def test_gem
     assert gem('a', '= 1'), "Should load"
     assert $:.any? { |p| %r{a-1/lib} =~ p }
-    assert $:.any? { |p| %r{a-1/bin} =~ p }
   end
 
   def test_gem_redundent
     assert gem('a', '= 1'), "Should load"
     refute gem('a', '= 1'), "Should not load"
     assert_equal 1, $:.select { |p| %r{a-1/lib} =~ p }.size
-    assert_equal 1, $:.select { |p| %r{a-1/bin} =~ p }.size
   end
 
   def test_gem_overlapping
     assert gem('a', '= 1'), "Should load"
     refute gem('a', '>= 1'), "Should not load"
     assert_equal 1, $:.select { |p| %r{a-1/lib} =~ p }.size
-    assert_equal 1, $:.select { |p| %r{a-1/bin} =~ p }.size
   end
 
   def test_gem_conflicting
@@ -47,13 +49,14 @@ class TestKernel < RubyGemTestCase
     assert_match(/activate a \(= 2, runtime\)/, ex.message)
     assert_match(/activated a-1/, ex.message)
     assert_equal 'a', ex.name
-    assert_equal Gem::Requirement.new('= 2'), ex.version_requirement
+    assert_equal Gem::Requirement.new('= 2'), ex.requirement
 
     assert $:.any? { |p| %r{a-1/lib} =~ p }
-    assert $:.any? { |p| %r{a-1/bin} =~ p }
     refute $:.any? { |p| %r{a-2/lib} =~ p }
-    refute $:.any? { |p| %r{a-2/bin} =~ p }
   end
 
+  def test_gem_not_adding_bin
+    assert gem('a', '= 1'), "Should load"
+    refute $:.any? { |p| %r{a-1/bin} =~ p }
+  end
 end
-