* lib/rdoc/servlet.rb: Add support for serving documentation from a

  subdirectory.
* lib/rdoc/generator/darkfish.rb:  ditto
* test/rdoc/test_rdoc_servlet.rb:  Test for above
* test/rdoc/test_rdoc_servlet.rb:  ditto


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37927 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 20 insertions, 3 deletions

diff --git a/test/rdoc/test_rdoc_servlet.rb b/test/rdoc/test_rdoc_servlet.rb
index e349babeb0..5c2ba4e6a7 100644
--- a/test/rdoc/test_rdoc_servlet.rb
+++ b/test/rdoc/test_rdoc_servlet.rb
@@ -1,4 +1,5 @@
 require 'rdoc/test_case'
+
 class TestRDocServlet < RDoc::TestCase
 
   def setup
@@ -16,13 +17,13 @@ class TestRDocServlet < RDoc::TestCase
     Gem::Specification.reset
     Gem::Specification.all = [@spec]
 
-    server = {}
-    def server.mount(*) end
+    @server = {}
+    def @server.mount(*) end
 
     @stores = {}
     @cache  = Hash.new { |hash, store| hash[store] = {} }
 
-    @s = RDoc::Servlet.new server, @stores, @cache
+    @s = RDoc::Servlet.new @server, @stores, @cache
 
     @req = WEBrick::HTTPRequest.new :Logger => nil
     @res = WEBrick::HTTPResponse.new :HTTPVersion => '1.0'
@@ -126,6 +127,22 @@ class TestRDocServlet < RDoc::TestCase
     assert_equal 500, @res.status
   end
 
+  def test_do_GET_mount_path
+    @s = RDoc::Servlet.new @server, @stores, @cache, '/mount/path'
+
+    temp_dir do
+      FileUtils.touch 'rdoc.css'
+
+      @s.asset_dirs[:darkfish] = '.'
+
+      @req.path = '/mount/path/rdoc.css'
+
+      @s.do_GET @req, @res
+
+      assert_equal 'text/css', @res.content_type
+    end
+  end
+
   def test_do_GET_not_modified
     touch_system_cache_path
     @req.header['if-modified-since'] = [(Time.now + 10).httpdate]