From 18911e99d2960433f4e77e5f6ce28bf187dad5a9 Mon Sep 17 00:00:00 2001
From: aycabta <aycabta@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 8 Dec 2018 17:39:52 +0000
Subject: 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
---
 test/rdoc/minitest_helper.rb                |  3 +--
 test/rdoc/test_rdoc_generator_json_index.rb | 29 ++++++------------------
 test/rdoc/test_rdoc_markup_parser.rb        | 35 +++++++++++++++++++++++++++++
 test/rdoc/test_rdoc_rdoc.rb                 | 14 ------------
 4 files changed, 43 insertions(+), 38 deletions(-)

(limited to 'test/rdoc')

diff --git a/test/rdoc/minitest_helper.rb b/test/rdoc/minitest_helper.rb
index 9fb0cd676b..1814669bf9 100644
--- a/test/rdoc/minitest_helper.rb
+++ b/test/rdoc/minitest_helper.rb
@@ -1,8 +1,7 @@
 # frozen_string_literal: true
-require 'bundler/errors'
 begin
   gem 'minitest', '~> 5.0'
-rescue NoMethodError, Gem::LoadError, Bundler::GemfileNotFound
+rescue NoMethodError, Gem::LoadError
   # for ruby tests
 end
 
diff --git a/test/rdoc/test_rdoc_generator_json_index.rb b/test/rdoc/test_rdoc_generator_json_index.rb
index 04bf2df340..ab8f6f1521 100644
--- a/test/rdoc/test_rdoc_generator_json_index.rb
+++ b/test/rdoc/test_rdoc_generator_json_index.rb
@@ -89,6 +89,12 @@ class TestRDocGeneratorJsonIndex < RDoc::TestCase
   end
 
   def test_generate
+    @g.generate
+
+    assert_file 'js/searcher.js'
+    assert_file 'js/navigation.js'
+    assert_file 'js/search_index.js'
+
     srcdir = File.expand_path('lib/rdoc', @pwd)
     if !File.directory? srcdir
       # for Ruby core repository
@@ -96,33 +102,12 @@ class TestRDocGeneratorJsonIndex < RDoc::TestCase
     end
 
     orig_file = Pathname(File.join srcdir, 'generator/template/json_index/js/navigation.js')
-    orig_time = orig_file.mtime
-
-    now = Time.now
-    @g.generate
-
-    assert_file 'js/searcher.js'
-    assert_file 'js/navigation.js'
-    assert_file 'js/search_index.js'
-
     generated_file = Pathname(File.join @tmpdir, 'js/navigation.js')
-    generated_mtime = generated_file.mtime
 
     # This is dirty hack on JRuby for MiniTest 4
-    assert orig_file.mtime.inspect == generated_mtime.inspect,
+    assert orig_file.mtime.inspect == generated_file.mtime.inspect,
       '.js files should be tha same timestamp of original'
 
-    assert generated_mtime < now, proc {t = Time.now; <<~INSPECT}
-      .js files should be the same timestamp,
-      path : #{generated_file}
-      mtime: #{generated_mtime}
-      orig : #{orig_time} -> #{orig_file.mtime}, #{orig_file.mtime-orig_time}
-      now  : #{now} -> #{t}, #{t-now}
-      INSPECT
-
-    generated_search_index = Pathname(File.join @tmpdir, 'js/search_index.js')
-    assert generated_search_index.mtime > (now - 1), 'search_index.js should be generated timestamp'
-
     json = File.read 'js/search_index.js'
 
     json =~ /\Avar search_data = /
diff --git a/test/rdoc/test_rdoc_markup_parser.rb b/test/rdoc/test_rdoc_markup_parser.rb
index 6d4953bc06..344d67df39 100644
--- a/test/rdoc/test_rdoc_markup_parser.rb
+++ b/test/rdoc/test_rdoc_markup_parser.rb
@@ -1045,6 +1045,41 @@ the time
     assert_equal expected, @RMP.parse("  1\n   2\n\n    3").parts
   end
 
+  def test_parse_block_quote
+    expected = [
+      @RM::BlockQuote.new(@RM::Paragraph.new("foo"))
+    ]
+    assert_equal expected, @RMP.parse(<<-DOC).parts
+>>>
+  foo
+    DOC
+
+    expected = [
+      @RM::BlockQuote.new(@RM::Paragraph.new("foo"),
+                          @RM::Verbatim.new("code\n"),
+                          @RM::Paragraph.new("bar"))
+    ]
+    assert_equal expected, @RMP.parse(<<-DOC).parts
+>>>
+  foo
+    code
+  bar
+    DOC
+
+    expected = [
+      @RM::BlockQuote.new(@RM::Paragraph.new("foo"),
+                          @RM::BlockQuote.new(@RM::Paragraph.new("bar")),
+                          @RM::Paragraph.new("zot"))
+    ]
+    assert_equal expected, @RMP.parse(<<-DOC).parts
+>>>
+  foo
+  >>>
+    bar
+  zot
+    DOC
+  end
+
   def test_peek_token
     parser = util_parser
 
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')
-- 
cgit v1.2.3