From 1b43644edc85a93bfc9228588c065c87f975cd93 Mon Sep 17 00:00:00 2001
From: aycabta <aycabta@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 17 Oct 2018 06:28:20 +0000
Subject: Merge rdoc-6.1.0.beta2

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65106 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 test/rdoc/test_rdoc_markup_formatter.rb | 38 ++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 19 deletions(-)

(limited to 'test/rdoc/test_rdoc_markup_formatter.rb')

diff --git a/test/rdoc/test_rdoc_markup_formatter.rb b/test/rdoc/test_rdoc_markup_formatter.rb
index b1f0855de3..cdc5944cdf 100644
--- a/test/rdoc/test_rdoc_markup_formatter.rb
+++ b/test/rdoc/test_rdoc_markup_formatter.rb
@@ -19,8 +19,8 @@ class TestRDocMarkupFormatter < RDoc::TestCase
       convert_flow @am.flow text.dup
     end
 
-    def handle_special_CAPS special
-      "handled #{special.text}"
+    def handle_regexp_CAPS target
+      "handled #{target.text}"
     end
 
     def start_accepting
@@ -37,16 +37,16 @@ class TestRDocMarkupFormatter < RDoc::TestCase
     super
 
     @markup = @RM.new
-    @markup.add_special(/[A-Z]+/, :CAPS)
+    @markup.add_regexp_handling(/[A-Z]+/, :CAPS)
 
     @attribute_manager = @markup.attribute_manager
     @attributes = @attribute_manager.attributes
 
     @to = ToTest.new @markup
 
-    @caps    = @attributes.bitmap_for :CAPS
-    @special = @attributes.bitmap_for :_SPECIAL_
-    @tt      = @attributes.bitmap_for :TT
+    @caps            = @attributes.bitmap_for :CAPS
+    @regexp_handling = @attributes.bitmap_for :_REGEXP_HANDLING_
+    @tt              = @attributes.bitmap_for :TT
   end
 
   def test_class_gen_relative_url
@@ -62,19 +62,19 @@ class TestRDocMarkupFormatter < RDoc::TestCase
     assert_equal 'a/c.html',  gen('a.html',   'a/c.html')
   end
 
-  def special_names
-    @attribute_manager.special.map do |_, mask|
+  def regexp_handling_names
+    @attribute_manager.regexp_handlings.map do |_, mask|
       @attributes.as_string mask
     end
   end
 
-  def test_add_special_RDOCLINK
-    @to.add_special_RDOCLINK
+  def test_add_regexp_handling_RDOCLINK
+    @to.add_regexp_handling_RDOCLINK
 
-    assert_includes special_names, 'RDOCLINK'
+    assert_includes regexp_handling_names, 'RDOCLINK'
 
-    def @to.handle_special_RDOCLINK special
-      "<#{special.text}>"
+    def @to.handle_regexp_RDOCLINK target
+      "<#{target.text}>"
     end
 
     document = doc(para('{foo}[rdoc-label:bar].'))
@@ -84,13 +84,13 @@ class TestRDocMarkupFormatter < RDoc::TestCase
     assert_equal '{foo}[<rdoc-label:bar>].', formatted
   end
 
-  def test_add_special_TIDYLINK
-    @to.add_special_TIDYLINK
+  def test_add_regexp_handling_TIDYLINK
+    @to.add_regexp_handling_TIDYLINK
 
-    assert_includes special_names, 'TIDYLINK'
+    assert_includes regexp_handling_names, 'TIDYLINK'
 
-    def @to.handle_special_TIDYLINK special
-      "<#{special.text}>"
+    def @to.handle_regexp_TIDYLINK target
+      "<#{target.text}>"
     end
 
     document = doc(para('foo[rdoc-label:bar].'))
@@ -166,7 +166,7 @@ class TestRDocMarkupFormatter < RDoc::TestCase
     assert_nil   id
   end
 
-  def test_convert_tt_special
+  def test_convert_tt_regexp_handling
     converted = @to.convert '<code>AAA</code>'
 
     assert_equal '<code>AAA</code>', converted
-- 
cgit v1.2.3