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 /test/rubygems | |
parent | 8e7b572d97f0a19a8467f3a299d72c49ba51a293 (diff) | |
download | ruby-cfaddc2a3248dd0ce4a370fdbab44ca88adf5722.tar.gz |
* 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 'test/rubygems')
-rw-r--r-- | test/rubygems/test_gem_commands_install_command.rb | 2 | ||||
-rw-r--r-- | test/rubygems/test_gem_commands_update_command.rb | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/test/rubygems/test_gem_commands_install_command.rb b/test/rubygems/test_gem_commands_install_command.rb index f03285ae85..c165479e76 100644 --- a/test/rubygems/test_gem_commands_install_command.rb +++ b/test/rubygems/test_gem_commands_install_command.rb @@ -379,7 +379,7 @@ ERROR: Possible alternatives: non_existent_with_hint wait_for_child_process_to_exit assert_path_exists File.join(a2.doc_dir, 'ri') - assert_path_exists File.join(a2.doc_dir, 'rdoc') + assert_path_exists File.join(a2.doc_dir, 'rdoc') if defined?(JSON) end def test_execute_saves_build_args diff --git a/test/rubygems/test_gem_commands_update_command.rb b/test/rubygems/test_gem_commands_update_command.rb index 6a327068e2..4387eea20b 100644 --- a/test/rubygems/test_gem_commands_update_command.rb +++ b/test/rubygems/test_gem_commands_update_command.rb @@ -265,7 +265,7 @@ class TestGemCommandsUpdateCommand < Gem::TestCase a2 = @specs['a-2'] assert_path_exists File.join(a2.doc_dir, 'rdoc') - end + end if defined?(JSON) def test_execute_named spec_fetcher do |fetcher| @@ -540,4 +540,3 @@ class TestGemCommandsUpdateCommand < Gem::TestCase end end - |