diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-06-17 00:50:15 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-06-17 00:50:15 +0000 |
| commit | e5471cbe631cf2cb7949b46d480f68affdc29790 (patch) | |
| tree | fd8072c8ac681c2b5bb4254560ee1c64bb9e632a | |
| parent | db577345ca577e36dd8026b43f9e104d4680a4ad (diff) | |
| download | ruby-e5471cbe631cf2cb7949b46d480f68affdc29790.tar.gz | |
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
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | lib/rdoc/servlet.rb | 1 | ||||
| -rw-r--r-- | test/rdoc/test_rdoc_servlet.rb | 2 |
3 files changed, 8 insertions, 1 deletions
@@ -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 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 |