diff options
| author | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-12-16 23:00:04 +0000 |
|---|---|---|
| committer | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-12-16 23:00:04 +0000 |
| commit | 92443fccbfeb910447c1db2a1fad750415525040 (patch) | |
| tree | 2e37bed024374a409175243d6654f6f78e57ab5e /test/rubygems/test_gem_rdoc.rb | |
| parent | 44b4b9060d7f02b10768c09bf8f59fa96aeda1b9 (diff) | |
* lib/rubygems.rb: Updated VERSION
* test/rubygems/test_gem_installer.rb: Fixed ambiguous first argument
warning.
* test/rubygems/test_gem_rdoc.rb: RDoc generation depends on installed
version of RDoc.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38416 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/rubygems/test_gem_rdoc.rb')
| -rw-r--r-- | test/rubygems/test_gem_rdoc.rb | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/test/rubygems/test_gem_rdoc.rb b/test/rubygems/test_gem_rdoc.rb index bece6a1782..0285a2fede 100644 --- a/test/rubygems/test_gem_rdoc.rb +++ b/test/rubygems/test_gem_rdoc.rb @@ -34,6 +34,11 @@ class TestGemRDoc < Gem::TestCase # RDoc 4 ships with its own Gem::RDoc which overrides this one which is # shipped for backwards compatibility. + def rdoc_4? + Gem::Requirement.new('>= 4.0.0.preview2').satisfied_by? \ + @hook.class.rdoc_version + end + def rdoc_3? Gem::Requirement.new('~> 3.0').satisfied_by? @hook.class.rdoc_version end @@ -43,7 +48,11 @@ class TestGemRDoc < Gem::TestCase end def test_initialize - refute @hook.generate_rdoc + if rdoc_4? then + refute @hook.generate_rdoc + else + assert @hook.generate_rdoc + end assert @hook.generate_ri rdoc = Gem::RDoc.new @a, false, false |