Merge RDoc 6.1.0.beta3 from upstream

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

1 files changed, 0 insertions, 14 deletions

diff --git a/test/rdoc/test_rdoc_rdoc.rb b/test/rdoc/test_rdoc_rdoc.rb
index 97e98cffb7..4014ecfa54 100644
--- a/test/rdoc/test_rdoc_rdoc.rb
+++ b/test/rdoc/test_rdoc_rdoc.rb
@@ -69,13 +69,6 @@ class TestRDocRDoc < RDoc::TestCase
   end
 
   def test_gather_files
-    # TODO: dummy finish
-    # RDoc::Options#@exclude is initialized as an empty array.
-    # Then, #finish converts it to a regexp or nil and reassign it to @exclude.
-    # RDoc#gather_files assumes that #finish has been already called.
-    # So, it forces to assign nil to @exclude.
-    @rdoc.options.exclude = nil
-
     a = File.expand_path __FILE__
     b = File.expand_path '../test_rdoc_text.rb', __FILE__
 
@@ -189,13 +182,6 @@ class TestRDocRDoc < RDoc::TestCase
   end
 
   def test_normalized_file_list_with_dot_doc
-    # TODO: dummy finish
-    # RDoc::Options#@exclude is initialized as an empty array.
-    # Then, #finish converts it to a regexp or nil and reassign it to @exclude.
-    # RDoc#normalized_file_list assumes that #finish has been already called.
-    # So, it forces to assign nil to @exclude.
-    @rdoc.options.exclude = nil
-
     expected_files = []
     files = temp_dir do |dir|
       a = File.expand_path('a.rb')