diff options
author | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-11-29 06:52:18 +0000 |
---|---|---|
committer | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-11-29 06:52:18 +0000 |
commit | 9694bb8cac12969300692dac5a1cf7aa4e3a46cd (patch) | |
tree | c3cb423d701f7049ba9382de052e2a937cd1302d /test/rubygems/test_gem_server.rb | |
parent | 3f606b7063fc7a8b191556365ad343a314719a8d (diff) | |
download | ruby-9694bb8cac12969300692dac5a1cf7aa4e3a46cd.tar.gz |
* lib/rubygems*: Updated to RubyGems 2.0
* test/rubygems*: ditto.
* common.mk (prelude): Updated for RubyGems 2.0 source rearrangement.
* tool/change_maker.rb: Allow invalid UTF-8 characters in source
files.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37976 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/rubygems/test_gem_server.rb')
-rw-r--r-- | test/rubygems/test_gem_server.rb | 67 |
1 files changed, 31 insertions, 36 deletions
diff --git a/test/rubygems/test_gem_server.rb b/test/rubygems/test_gem_server.rb index f11840db06..1c94144913 100644 --- a/test/rubygems/test_gem_server.rb +++ b/test/rubygems/test_gem_server.rb @@ -18,55 +18,50 @@ class TestGemServer < Gem::TestCase @res = WEBrick::HTTPResponse.new :HTTPVersion => '1.0' end - def test_spec_dirs - s = Gem::Server.new Gem.dir, process_based_port, false + def test_doc_root_3 + orig_rdoc_version = Gem::RDoc.rdoc_version + Gem::RDoc.instance_variable_set :@rdoc_version, Gem::Version.new('3.12') - assert_equal [File.join(Gem.dir, 'specifications')], s.spec_dirs - - s = Gem::Server.new [Gem.dir, Gem.dir], process_based_port, false + assert_equal '/doc_root/X-1/rdoc/index.html', @server.doc_root('X-1') - assert_equal [File.join(Gem.dir, 'specifications'), - File.join(Gem.dir, 'specifications')], s.spec_dirs + ensure + Gem::RDoc.instance_variable_set :@rdoc_version, orig_rdoc_version end - def test_Marshal - data = StringIO.new "GET /Marshal.#{Gem.marshal_version} HTTP/1.0\r\n\r\n" - @req.parse data + def test_doc_root_4 + orig_rdoc_version = Gem::RDoc.rdoc_version + Gem::RDoc.instance_variable_set :@rdoc_version, Gem::Version.new('4.0') - Gem::Deprecate.skip_during do - @server.Marshal @req, @res - end + assert_equal '/doc_root/X-1/', @server.doc_root('X-1') - assert_equal 200, @res.status, @res.body - assert_match %r| \d\d:\d\d:\d\d |, @res['date'] - assert_equal 'application/octet-stream', @res['content-type'] + ensure + Gem::RDoc.instance_variable_set :@rdoc_version, orig_rdoc_version + end - Gem::Deprecate.skip_during do - si = Gem::SourceIndex.new - si.add_specs @a1, @a2 + def test_have_rdoc_4_plus_eh + orig_rdoc_version = Gem::RDoc.rdoc_version + Gem::RDoc.instance_variable_set :@rdoc_version, Gem::Version.new('4.0') - assert_equal si, Marshal.load(@res.body) - end - end + server = Gem::Server.new Gem.dir, 0, false + assert server.have_rdoc_4_plus? - def test_Marshal_Z - data = StringIO.new "GET /Marshal.#{Gem.marshal_version}.Z HTTP/1.0\r\n\r\n" - @req.parse data + Gem::RDoc.instance_variable_set :@rdoc_version, Gem::Version.new('3.12') - Gem::Deprecate.skip_during do - @server.Marshal @req, @res - end + server = Gem::Server.new Gem.dir, 0, false + refute server.have_rdoc_4_plus? + ensure + Gem::RDoc.instance_variable_set :@rdoc_version, orig_rdoc_version + end - assert_equal 200, @res.status, @res.body - assert_match %r| \d\d:\d\d:\d\d |, @res['date'] - assert_equal 'application/x-deflate', @res['content-type'] + def test_spec_dirs + s = Gem::Server.new Gem.dir, process_based_port, false - Gem::Deprecate.skip_during do - si = Gem::SourceIndex.new - si.add_specs @a1, @a2 + assert_equal [File.join(Gem.dir, 'specifications')], s.spec_dirs - assert_equal si, Marshal.load(Gem.inflate(@res.body)) - end + s = Gem::Server.new [Gem.dir, Gem.dir], process_based_port, false + + assert_equal [File.join(Gem.dir, 'specifications'), + File.join(Gem.dir, 'specifications')], s.spec_dirs end def test_latest_specs |