From 71a8a86f10cfc7ab98c1ab82376955c951c9fc67 Mon Sep 17 00:00:00 2001 From: nobu Date: Wed, 17 Jun 2015 00:50:15 +0000 Subject: servlet.rb: requires json * lib/rdoc/servlet.rb (documentation_search, root_search): requires json for JSON.dump and fix sporadic failures due to the loading order. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50928 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ lib/rdoc/servlet.rb | 1 + test/rdoc/test_rdoc_servlet.rb | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index cc31830447..08341a0a21 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Wed Jun 17 09:50:12 2015 Nobuyoshi Nakada + + * lib/rdoc/servlet.rb (documentation_search, root_search): + requires json for JSON.dump and fix sporadic failures due to + the loading order. + Tue Jun 16 19:19:53 2015 Tanaka Akira * ext/rbconfig/sizeof/extconf.rb: Check several types defined in C99 diff --git a/lib/rdoc/servlet.rb b/lib/rdoc/servlet.rb index ec8fd739f1..7ef04655e5 100644 --- a/lib/rdoc/servlet.rb +++ b/lib/rdoc/servlet.rb @@ -1,5 +1,6 @@ require 'rdoc' require 'time' +require 'json' require 'webrick' ## diff --git a/test/rdoc/test_rdoc_servlet.rb b/test/rdoc/test_rdoc_servlet.rb index 143e2f225b..9edd176cc4 100644 --- a/test/rdoc/test_rdoc_servlet.rb +++ b/test/rdoc/test_rdoc_servlet.rb @@ -185,7 +185,7 @@ class TestRDocServlet < RDoc::TestCase @s.do_GET @req, @res - assert_equal 'application/javascript', @res.content_type + assert_equal 'application/javascript', @res.content_type, @res.body end def test_documentation_page_class -- cgit v1.2.3