diff options
| author | aycabta <[email protected]> | 2021-03-08 06:14:03 +0900 |
|---|---|---|
| committer | Nobuyoshi Nakada <[email protected]> | 2021-03-16 15:47:27 +0900 |
| commit | 61a29a41e1d0d11a9963315aa86d25ed690124c0 (patch) | |
| tree | dc7518239bfb71dff67eedc1cbf495a6c9c46de5 | |
| parent | 971a0cd246db6578e1ea8760a903e1a23e3681f3 (diff) | |
[ruby/rdoc] Allow empty .rdoc_options
https://github.com/ruby/rdoc/commit/0c8cb25b50
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/4274
| -rw-r--r-- | lib/rdoc/rdoc.rb | 2 | ||||
| -rw-r--r-- | test/rdoc/test_rdoc_rdoc.rb | 11 |
2 files changed, 13 insertions, 0 deletions
diff --git a/lib/rdoc/rdoc.rb b/lib/rdoc/rdoc.rb index c47f639cc4..df04646f3c 100644 --- a/lib/rdoc/rdoc.rb +++ b/lib/rdoc/rdoc.rb @@ -166,6 +166,8 @@ class RDoc::RDoc rescue Psych::SyntaxError end + return RDoc::Options.new if options == false # Allow empty file. + raise RDoc::Error, "#{options_file} is not a valid rdoc options file" unless RDoc::Options === options or Hash === options diff --git a/test/rdoc/test_rdoc_rdoc.rb b/test/rdoc/test_rdoc_rdoc.rb index b54cec5538..3910dd4656 100644 --- a/test/rdoc/test_rdoc_rdoc.rb +++ b/test/rdoc/test_rdoc_rdoc.rb @@ -133,6 +133,17 @@ class TestRDocRDoc < RDoc::TestCase end end + def test_load_options_empty_file + temp_dir do + File.open '.rdoc_options', 'w' do |io| + end + + options = @rdoc.load_options + + assert_equal 'rdoc', options.markup + end + end + def test_load_options_partial_override temp_dir do File.open '.rdoc_options', 'w' do |io| |