aboutsummaryrefslogtreecommitdiffstats
path: root/test/rdoc/test_rdoc_generator_ri.rb
diff options
context:
space:
mode:
authorhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-09-07 22:23:38 +0000
committerhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-09-07 22:23:38 +0000
commitde4fde9095c5380e8cef0a188d244a10f9184d6d (patch)
tree540581a54cefcdc817577f646f09372f7e9936d1 /test/rdoc/test_rdoc_generator_ri.rb
parentee61f5b40242dbec7fb45d25c5d44dfcfe556526 (diff)
downloadruby-de4fde9095c5380e8cef0a188d244a10f9184d6d.tar.gz
* lib/rdoc/*, test/rdoc/*: Update rdoc-5.0.0.beta2
Fixed ri parse defect with left-hand matched classes. https://github.com/rdoc/rdoc/pull/420 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@56097 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/rdoc/test_rdoc_generator_ri.rb')
-rw-r--r--test/rdoc/test_rdoc_generator_ri.rb9
1 files changed, 3 insertions, 6 deletions
diff --git a/test/rdoc/test_rdoc_generator_ri.rb b/test/rdoc/test_rdoc_generator_ri.rb
index 1e18e13b10..d9f7b7ebc6 100644
--- a/test/rdoc/test_rdoc_generator_ri.rb
+++ b/test/rdoc/test_rdoc_generator_ri.rb
@@ -7,10 +7,8 @@ class TestRDocGeneratorRI < RDoc::TestCase
super
@options = RDoc::Options.new
- if Object.const_defined? :Encoding then
- @options.encoding = Encoding::UTF_8
- @store.encoding = Encoding::UTF_8
- end
+ @options.encoding = Encoding::UTF_8
+ @store.encoding = Encoding::UTF_8
@tmpdir = File.join Dir.tmpdir, "test_rdoc_generator_ri_#{$$}"
FileUtils.mkdir_p @tmpdir
@@ -57,7 +55,7 @@ class TestRDocGeneratorRI < RDoc::TestCase
store = RDoc::RI::Store.new @tmpdir
store.load_cache
- encoding = Object.const_defined?(:Encoding) ? Encoding::UTF_8 : nil
+ encoding = Encoding::UTF_8
assert_equal encoding, store.encoding
end
@@ -76,4 +74,3 @@ class TestRDocGeneratorRI < RDoc::TestCase
end
end
-