diff options
| author | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-04-11 11:14:36 +0000 |
|---|---|---|
| committer | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-04-11 11:14:36 +0000 |
| commit | cfaddc2a3248dd0ce4a370fdbab44ca88adf5722 (patch) | |
| tree | 6c004c0c73ea77dc6c77033632241f6ba4f77a58 /lib/rubygems/test_case.rb | |
| parent | 8e7b572d97f0a19a8467f3a299d72c49ba51a293 (diff) | |
* ext/json/*, test/json/*, defs/default_gems: Gemify JSON library.
[fix GH-867][Feature #11057]
* test/ruby/test_extlibs.rb: removed json gem from existence extentions.
* gems/bundled_gems: added json gem into bundled gem.
* lib/rdoc/rubygems_hook.rb: ignored no json environment.
* lib/rubygems/test_case.rb, test/rubygems/*: ditto.
* lib/rdoc/test_case.rb, test/rdoc/*: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50231 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rubygems/test_case.rb')
| -rw-r--r-- | lib/rubygems/test_case.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/rubygems/test_case.rb b/lib/rubygems/test_case.rb index 306edcc3f6..b1aabb658d 100644 --- a/lib/rubygems/test_case.rb +++ b/lib/rubygems/test_case.rb @@ -24,6 +24,11 @@ unless Gem::Dependency.new('rdoc', '>= 3.10').matching_specs.empty? gem 'json' end +begin + require 'json' +rescue LoadError +end + require 'minitest/autorun' require 'rubygems/deprecate' |