Merge RubyGems master@9be7858f7f17eae3058204f3c03e4b798ba18b9c

  This version contains the some style changes by RuboCop.

    * https://github.com/rubygems/rubygems/commit/9d810be0ede925fb2e3af535848582c3f8e0e72f
    * https://github.com/rubygems/rubygems/commit/61ea98a727fb1b76b6fac52d74107ee4b02aaef2
    * https://github.com/rubygems/rubygems/commit/795893dce3c5f8540804fc08144cc6a90f086b13
    * https://github.com/rubygems/rubygems/commit/9be7858f7f17eae3058204f3c03e4b798ba18b9c

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

1 files changed, 2 insertions, 135 deletions

diff --git a/test/rubygems/test_gem_rdoc.rb b/test/rubygems/test_gem_rdoc.rb
index 073578527d..6184d4b457 100644
--- a/test/rubygems/test_gem_rdoc.rb
+++ b/test/rubygems/test_gem_rdoc.rb
@@ -4,8 +4,8 @@ require 'rubygems/test_case'
 require 'rubygems/rdoc'
 
 class TestGemRDoc < Gem::TestCase
+
   Gem::RDoc.load_rdoc
-  rdoc_4 = Gem::Requirement.new('> 3').satisfied_by?(Gem::RDoc.rdoc_version)
 
   def setup
     super
@@ -31,29 +31,8 @@ class TestGemRDoc < Gem::TestCase
     Gem.configuration[:rdoc] = nil
   end
 
-  ##
-  # 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
-
-  def rdoc_3_8_or_better?
-    Gem::Requirement.new('>= 3.8').satisfied_by? @hook.class.rdoc_version
-  end
-
   def test_initialize
-    if rdoc_4?
-      refute @hook.generate_rdoc
-    else
-      assert @hook.generate_rdoc
-    end
+    refute @hook.generate_rdoc
     assert @hook.generate_ri
 
     rdoc = Gem::RDoc.new @a, false, false
@@ -75,67 +54,6 @@ class TestGemRDoc < Gem::TestCase
     assert_empty args
   end
 
-  def test_document
-    skip 'RDoc 3 required' unless rdoc_3?
-
-    options = RDoc::Options.new
-    options.files = []
-
-    rdoc = @hook.new_rdoc
-    @hook.instance_variable_set :@rdoc, rdoc
-    @hook.instance_variable_set :@file_info, []
-
-    @hook.document 'darkfish', options, @a.doc_dir('rdoc')
-
-    assert @hook.rdoc_installed?
-  end unless rdoc_4
-
-  def test_generate
-    skip 'RDoc 3 required' unless rdoc_3?
-
-    FileUtils.mkdir_p @a.doc_dir
-    FileUtils.mkdir_p File.join(@a.gem_dir, 'lib')
-
-    @hook.generate
-
-    assert @hook.rdoc_installed?
-    assert @hook.ri_installed?
-
-    rdoc = @hook.instance_variable_get :@rdoc
-
-    refute rdoc.options.hyperlink_all
-  end unless rdoc_4
-
-  def test_generate_configuration_rdoc_array
-    skip 'RDoc 3 required' unless rdoc_3?
-
-    Gem.configuration[:rdoc] = %w[-A]
-
-    FileUtils.mkdir_p @a.doc_dir
-    FileUtils.mkdir_p File.join(@a.gem_dir, 'lib')
-
-    @hook.generate
-
-    rdoc = @hook.instance_variable_get :@rdoc
-
-    assert rdoc.options.hyperlink_all
-  end unless rdoc_4
-
-  def test_generate_configuration_rdoc_string
-    skip 'RDoc 3 required' unless rdoc_3?
-
-    Gem.configuration[:rdoc] = '-A'
-
-    FileUtils.mkdir_p @a.doc_dir
-    FileUtils.mkdir_p File.join(@a.gem_dir, 'lib')
-
-    @hook.generate
-
-    rdoc = @hook.instance_variable_get :@rdoc
-
-    assert rdoc.options.hyperlink_all
-  end unless rdoc_4
-
   def test_generate_disabled
     @hook.generate_rdoc = false
     @hook.generate_ri   = false
@@ -146,57 +64,6 @@ class TestGemRDoc < Gem::TestCase
     refute @hook.ri_installed?
   end
 
-  def test_generate_force
-    skip 'RDoc 3 required' unless rdoc_3?
-
-    FileUtils.mkdir_p @a.doc_dir 'ri'
-    FileUtils.mkdir_p @a.doc_dir 'rdoc'
-    FileUtils.mkdir_p File.join(@a.gem_dir, 'lib')
-
-    @hook.force = true
-
-    @hook.generate
-
-    assert_path_exists File.join(@a.doc_dir('rdoc'), 'index.html')
-    assert_path_exists File.join(@a.doc_dir('ri'),   'cache.ri')
-  end unless rdoc_4
-
-  def test_generate_no_overwrite
-    skip 'RDoc 3 required' unless rdoc_3?
-
-    FileUtils.mkdir_p @a.doc_dir 'ri'
-    FileUtils.mkdir_p @a.doc_dir 'rdoc'
-    FileUtils.mkdir_p File.join(@a.gem_dir, 'lib')
-
-    @hook.generate
-
-    refute_path_exists File.join(@a.doc_dir('rdoc'), 'index.html')
-    refute_path_exists File.join(@a.doc_dir('ri'),   'cache.ri')
-  end unless rdoc_4
-
-  def test_generate_legacy
-    skip 'RDoc < 3.8 required' if rdoc_3_8_or_better?
-
-    FileUtils.mkdir_p @a.doc_dir
-    FileUtils.mkdir_p File.join(@a.gem_dir, 'lib')
-
-    @hook.generate_legacy
-
-    assert @hook.rdoc_installed?
-    assert @hook.ri_installed?
-  end unless rdoc_4
-
-  def test_legacy_rdoc
-    skip 'RDoc < 3.8 required' if rdoc_3_8_or_better?
-
-    FileUtils.mkdir_p @a.doc_dir
-    FileUtils.mkdir_p File.join(@a.gem_dir, 'lib')
-
-    @hook.legacy_rdoc '--op', @a.doc_dir('rdoc')
-
-    assert @hook.rdoc_installed?
-  end unless rdoc_4
-
   def test_new_rdoc
     assert_kind_of RDoc::RDoc, @hook.new_rdoc
   end