kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

Merge rdoc-6.1.0.bata2

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66024 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
aycabta 2018-11-27 07:02:36 +00:00
parent 7aaf5b2878
commit 4beec66757
4 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/rdoc/rdoc.gemspec
View file

File diff suppressed because one or more lines are too long

2
lib/rdoc/ri/driver.rb
View file

@ -1468,7 +1468,7 @@ or the PAGER environment variable.
out << method.comment
end
out << RDoc::Markup::BlankLine.new
out << RDoc::Markup::Paragraph.new("(this method is alias for #{alias_for.full_name})")
out << RDoc::Markup::Paragraph.new("(This method is an alias for #{alias_for.full_name}.)")
out << RDoc::Markup::BlankLine.new
out << alias_for.comment
out << RDoc::Markup::BlankLine.new

8
test/rdoc/test_rdoc_generator_json_index.rb
View file

@ -96,7 +96,7 @@ class TestRDocGeneratorJsonIndex < RDoc::TestCase
assert_file 'js/navigation.js'
assert_file 'js/search_index.js'
srcdir = File.expand_path("../../lib/rdoc", __FILE__)
srcdir = File.expand_path('lib/rdoc', @pwd)
if !File.directory? srcdir
# for Ruby core repository
srcdir = File.expand_path("../../../lib/rdoc", __FILE__)
@ -109,7 +109,11 @@ class TestRDocGeneratorJsonIndex < RDoc::TestCase
assert orig_file.mtime.inspect == generated_file.mtime.inspect,
'.js files should be tha same timestamp of original'
assert generated_file.mtime < now, '.js files should be the same timestamp'
assert generated_file.mtime < now,
".js files should be the same timestamp,\n" +
"path: #{generated_file.inspect},\n" +
"time: #{generated_file.mtime.inspect},\n" +
"now : #{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'

2
test/rdoc/test_rdoc_ri_driver.rb
View file

@ -260,7 +260,7 @@ class TestRDocRIDriver < RDoc::TestCase
para('alias comment'),
blank_line,
blank_line,
para('(this method is alias for Qux#original)'),
para('(This method is an alias for Qux#original.)'),
blank_line,
para('original comment'),
blank_line,