merge revision(s) 39608: [Backport #7749]

	* test/rubygems/test_require.rb:  Fix tests when 'a.rb' exists.
	  [ruby-trunk - Bug #7749]


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

3 files changed, 25 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index 3685ae372f..bc92936ea2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Mar 18 00:03:27 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* test/rubygems/test_require.rb:  Fix tests when 'a.rb' exists.
+	  [ruby-trunk - Bug #7749]
+
 Mon Mar 18 00:02:27 2013  Eric Hodel  <drbrain@segment7.net>
 
 	* lib/rubygems.rb:  Allow specification of directory permissions.
diff --git a/test/rubygems/test_require.rb b/test/rubygems/test_require.rb
index 7553822319..b846103f1b 100644
--- a/test/rubygems/test_require.rb
+++ b/test/rubygems/test_require.rb
@@ -2,19 +2,30 @@ require 'rubygems/test_case'
 require 'rubygems'
 
 class TestGemRequire < Gem::TestCase
+
+  def setup
+    super
+
+    assert_raises LoadError do
+      save_loaded_features do
+        require 'test_gem_require_a'
+      end
+    end
+  end
+
   def assert_require(path)
     assert require(path), "'#{path}' was already required"
   end
 
   def test_require_is_not_lazy_with_exact_req
-    a1 = new_spec "a", "1", {"b" => "= 1"}, "lib/a.rb"
+    a1 = new_spec "a", "1", {"b" => "= 1"}, "lib/test_gem_require_a.rb"
     b1 = new_spec "b", "1", nil, "lib/b/c.rb"
     b2 = new_spec "b", "2", nil, "lib/b/c.rb"
 
     install_specs a1, b1, b2
 
     save_loaded_features do
-      assert_require 'a'
+      assert_require 'test_gem_require_a'
       assert_equal %w(a-1 b-1), loaded_spec_names
       assert_equal unresolved_names, []
 
@@ -24,14 +35,14 @@ class TestGemRequire < Gem::TestCase
   end
 
   def test_require_is_lazy_with_inexact_req
-    a1 = new_spec "a", "1", {"b" => ">= 1"}, "lib/a.rb"
+    a1 = new_spec "a", "1", {"b" => ">= 1"}, "lib/test_gem_require_a.rb"
     b1 = new_spec "b", "1", nil, "lib/b/c.rb"
     b2 = new_spec "b", "2", nil, "lib/b/c.rb"
 
     install_specs a1, b1, b2
 
     save_loaded_features do
-      assert_require 'a'
+      assert_require 'test_gem_require_a'
       assert_equal %w(a-1), loaded_spec_names
       assert_equal unresolved_names, ["b (>= 1)"]
 
@@ -41,13 +52,13 @@ class TestGemRequire < Gem::TestCase
   end
 
   def test_require_is_not_lazy_with_one_possible
-    a1 = new_spec "a", "1", {"b" => ">= 1"}, "lib/a.rb"
+    a1 = new_spec "a", "1", {"b" => ">= 1"}, "lib/test_gem_require_a.rb"
     b1 = new_spec "b", "1", nil, "lib/b/c.rb"
 
     install_specs a1, b1
 
     save_loaded_features do
-      assert_require 'a'
+      assert_require 'test_gem_require_a'
       assert_equal %w(a-1 b-1), loaded_spec_names
       assert_equal unresolved_names, []
 
@@ -59,13 +70,13 @@ class TestGemRequire < Gem::TestCase
   def test_activate_via_require_respects_loaded_files
     require 'benchmark' # stdlib
     save_loaded_features do
-      a1 = new_spec "a", "1", {"b" => ">= 1"}, "lib/a.rb"
+      a1 = new_spec "a", "1", {"b" => ">= 1"}, "lib/test_gem_require_a.rb"
       b1 = new_spec "b", "1", nil, "lib/benchmark.rb"
       b2 = new_spec "b", "2", nil, "lib/benchmark.rb"
 
       install_specs a1, b1, b2
 
-      require 'a'
+      require 'test_gem_require_a'
       assert_equal unresolved_names, ["b (>= 1)"]
 
       refute require('benchmark'), "benchmark should have already been loaded"
diff --git a/version.h b/version.h
index ab17b6ce06..b060322ee8 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "2.0.0"
 #define RUBY_RELEASE_DATE "2013-03-18"
-#define RUBY_PATCHLEVEL 68
+#define RUBY_PATCHLEVEL 69
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 3