summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authordrbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-08-23 23:53:49 +0000
committerdrbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-08-23 23:53:49 +0000
commit61920a128a2593f6fb968cfd4928499f0a3e2ed3 (patch)
tree603eb46008483ed97100d616b7f785bd86a14337 /test
parentcede48fd403ddb0631fafc49392350bb889c38ab (diff)
* lib/rdoc: Update to RDoc 3.9.3. Fixes RDoc with `ruby -Ku`. Allows
HTTPS image paths to be turned into <img> tags. Prevents special markup inside <tt> from being processed. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33043 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
-rw-r--r--test/rdoc/test_rdoc_code_object.rb2
-rw-r--r--test/rdoc/test_rdoc_encoding.rb2
-rw-r--r--test/rdoc/test_rdoc_markup_formatter.rb57
-rw-r--r--test/rdoc/test_rdoc_markup_to_html.rb8
4 files changed, 69 insertions, 0 deletions
diff --git a/test/rdoc/test_rdoc_code_object.rb b/test/rdoc/test_rdoc_code_object.rb
index 89dc4b1744..c7a37488cc 100644
--- a/test/rdoc/test_rdoc_code_object.rb
+++ b/test/rdoc/test_rdoc_code_object.rb
@@ -1,3 +1,5 @@
+# coding: US-ASCII
+
require 'rubygems'
require 'minitest/autorun'
require File.expand_path '../xref_test_case', __FILE__
diff --git a/test/rdoc/test_rdoc_encoding.rb b/test/rdoc/test_rdoc_encoding.rb
index 178f805129..b5ffd7714c 100644
--- a/test/rdoc/test_rdoc_encoding.rb
+++ b/test/rdoc/test_rdoc_encoding.rb
@@ -1,3 +1,5 @@
+# coding: US-ASCII
+
require 'rubygems'
require 'minitest/autorun'
require 'rdoc'
diff --git a/test/rdoc/test_rdoc_markup_formatter.rb b/test/rdoc/test_rdoc_markup_formatter.rb
new file mode 100644
index 0000000000..73e75e2aa1
--- /dev/null
+++ b/test/rdoc/test_rdoc_markup_formatter.rb
@@ -0,0 +1,57 @@
+require 'rubygems'
+require 'minitest/autorun'
+require 'rdoc'
+require 'rdoc/markup'
+require 'rdoc/markup/formatter'
+
+class TestRDocMarkupFormatter < MiniTest::Unit::TestCase
+
+ class ToTest < RDoc::Markup::Formatter
+
+ def initialize markup
+ super
+
+ add_tag :TT, '<tt>', '</tt>'
+ end
+
+ def accept_paragraph paragraph
+ @res << attributes(paragraph.text)
+ end
+
+ def attributes text
+ convert_flow @am.flow text.dup
+ end
+
+ def handle_special_CAPS special
+ "handled #{special.text}"
+ end
+
+ def start_accepting
+ @res = ""
+ end
+
+ def end_accepting
+ @res
+ end
+
+ end
+
+ def setup
+ @markup = RDoc::Markup.new
+ @markup.add_special(/[A-Z]+/, :CAPS)
+
+ @to = ToTest.new @markup
+
+ @caps = RDoc::Markup::Attribute.bitmap_for :CAPS
+ @special = RDoc::Markup::Attribute.bitmap_for :_SPECIAL_
+ @tt = RDoc::Markup::Attribute.bitmap_for :TT
+ end
+
+ def test_convert_tt_special
+ converted = @to.convert '<tt>AAA</tt>'
+
+ assert_equal '<tt>AAA</tt>', converted
+ end
+
+end
+
diff --git a/test/rdoc/test_rdoc_markup_to_html.rb b/test/rdoc/test_rdoc_markup_to_html.rb
index 9c26c00906..2cb16e88ae 100644
--- a/test/rdoc/test_rdoc_markup_to_html.rb
+++ b/test/rdoc/test_rdoc_markup_to_html.rb
@@ -306,6 +306,14 @@ class TestRDocMarkupToHtml < RDoc::Markup::FormatterTestCase
@to.gen_url('link:example', 'example')
end
+ def test_gem_url_image_url
+ assert_equal '<img src="http://example.com/image.png" />', @to.gen_url('http://example.com/image.png', 'ignored')
+ end
+
+ def test_gem_url_ssl_image_url
+ assert_equal '<img src="https://example.com/image.png" />', @to.gen_url('https://example.com/image.png', 'ignored')
+ end
+
def test_handle_special_HYPERLINK_link
special = RDoc::Markup::Special.new 0, 'link:README.txt'