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/rdoc | |
| 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/rdoc')
| -rw-r--r-- | test/rdoc/test_rdoc_generator_darkfish.rb | 3 | ||||
| -rw-r--r-- | test/rdoc/test_rdoc_generator_json_index.rb | 3 | ||||
| -rw-r--r-- | test/rdoc/test_rdoc_rubygems_hook.rb | 5 | ||||
| -rw-r--r-- | test/rdoc/test_rdoc_servlet.rb | 3 |
4 files changed, 5 insertions, 9 deletions
diff --git a/test/rdoc/test_rdoc_generator_darkfish.rb b/test/rdoc/test_rdoc_generator_darkfish.rb index fc77e4b105..204983d97b 100644 --- a/test/rdoc/test_rdoc_generator_darkfish.rb +++ b/test/rdoc/test_rdoc_generator_darkfish.rb @@ -225,5 +225,4 @@ class TestRDocGeneratorDarkfish < RDoc::TestCase "#{filename} is not hard-linked" end -end - +end if defined?(JSON) diff --git a/test/rdoc/test_rdoc_generator_json_index.rb b/test/rdoc/test_rdoc_generator_json_index.rb index 9283fd9b76..c95820ca1e 100644 --- a/test/rdoc/test_rdoc_generator_json_index.rb +++ b/test/rdoc/test_rdoc_generator_json_index.rb @@ -320,5 +320,4 @@ class TestRDocGeneratorJsonIndex < RDoc::TestCase assert_equal 'cd', @g.search_string('C d') end -end - +end if defined?(JSON) diff --git a/test/rdoc/test_rdoc_rubygems_hook.rb b/test/rdoc/test_rdoc_rubygems_hook.rb index 960afc9ed4..0d5e11ab89 100644 --- a/test/rdoc/test_rdoc_rubygems_hook.rb +++ b/test/rdoc/test_rdoc_rubygems_hook.rb @@ -66,7 +66,7 @@ class TestRDocRubygemsHook < Gem::TestCase @hook.document 'darkfish', options, @a.doc_dir('rdoc') assert @hook.rdoc_installed? - end + end if defined?(JSON) def test_generate FileUtils.mkdir_p @a.doc_dir @@ -105,7 +105,7 @@ class TestRDocRubygemsHook < Gem::TestCase assert_equal %w[README lib], rdoc.options.files.sort assert_equal 'MyTitle', rdoc.store.main - end + end if defined?(JSON) def test_generate_configuration_rdoc_array Gem.configuration[:rdoc] = %w[-A] @@ -248,4 +248,3 @@ class TestRDocRubygemsHook < Gem::TestCase end end - diff --git a/test/rdoc/test_rdoc_servlet.rb b/test/rdoc/test_rdoc_servlet.rb index 143e2f225b..c9449f3631 100644 --- a/test/rdoc/test_rdoc_servlet.rb +++ b/test/rdoc/test_rdoc_servlet.rb @@ -531,5 +531,4 @@ class TestRDocServlet < RDoc::TestCase store.save end -end - +end if defined?(JSON) |