diff options
| author | aycabta <aycabta@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-11-27 07:02:36 +0000 |
|---|---|---|
| committer | aycabta <aycabta@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-11-27 07:02:36 +0000 |
| commit | 4beec6675716f8189be680e6bb966f4db44a7e53 (patch) | |
| tree | de0a556dd20c0e2181223b34022bbda7403dad48 /test/rdoc | |
| parent | 7aaf5b2878210d4df03a84be8d514a553839a5ba (diff) | |
Merge rdoc-6.1.0.bata2
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66024 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/rdoc')
| -rw-r--r-- | test/rdoc/test_rdoc_generator_json_index.rb | 8 | ||||
| -rw-r--r-- | test/rdoc/test_rdoc_ri_driver.rb | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/test/rdoc/test_rdoc_generator_json_index.rb b/test/rdoc/test_rdoc_generator_json_index.rb index ca7260c820..b057832329 100644 --- a/test/rdoc/test_rdoc_generator_json_index.rb +++ b/test/rdoc/test_rdoc_generator_json_index.rb @@ -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' diff --git a/test/rdoc/test_rdoc_ri_driver.rb b/test/rdoc/test_rdoc_ri_driver.rb index f636c6346f..18dcb5b68a 100644 --- a/test/rdoc/test_rdoc_ri_driver.rb +++ b/test/rdoc/test_rdoc_ri_driver.rb @@ -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, |