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

@@ -1,3 +1,9 @@
+Wed Jun 17 09:50:12 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* 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  <akr@fsij.org>
 
 	* ext/rbconfig/sizeof/extconf.rb: Check several types defined in C99

lib/rdoc/servlet.rb

@@ -1,5 +1,6 @@
 require 'rdoc'
 require 'time'
+require 'json'
 require 'webrick'
 
 ##

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