* lib/rubygems/test_case.rb: use explicitly exception class and reverted

  to require JSON library for rubygems tests with Ruby 2.2.0 or earlier.

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

1 files changed, 7 insertions, 1 deletions

diff --git a/lib/rubygems/test_case.rb b/lib/rubygems/test_case.rb
index 85a159f938..a116b6c93c 100644
--- a/lib/rubygems/test_case.rb
+++ b/lib/rubygems/test_case.rb
@@ -23,10 +23,16 @@ unless Gem::Dependency.new('rdoc', '>= 3.10').matching_specs.empty?
   gem 'rdoc'
   begin
     gem 'json'
-  rescue LoadError
+  rescue Gem::LoadError
+    # for Ruby 2.3.0
   end
 end
 
+begin
+  require 'json'
+rescue LoadError
+end
+
 require 'minitest/autorun'
 
 require 'rubygems/deprecate'