aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/rdoc/test_rdoc_options.rb42
1 files changed, 19 insertions, 23 deletions
diff --git a/test/rdoc/test_rdoc_options.rb b/test/rdoc/test_rdoc_options.rb
index 8e5ec853cc..eaa10586fd 100644
--- a/test/rdoc/test_rdoc_options.rb
+++ b/test/rdoc/test_rdoc_options.rb
@@ -17,27 +17,28 @@ class TestRDocOptions < MiniTest::Unit::TestCase
end
def test_check_files
+ expected = ''
out, err = capture_io do
Dir.mktmpdir do |dir|
- begin
- unreadable = nil # variable for windows
-
- Dir.chdir dir do
- if RUBY_PLATFORM =~ /mswin|mingw/ then
- unreadable = open 'unreadable'
- File.delete 'unreadable'
- else
- FileUtils.touch 'unreadable'
- FileUtils.chmod 0, 'unreadable'
- end
-
- @options.files = %w[nonexistent unreadable]
-
- @options.check_files
- end
- ensure
- unreadable.close if unreadable
+ if RUBY_PLATFORM =~ /mswin|mingw/ then
+ @options.files = %w[nonexistent]
+
+ expected = <<-EXPECTED
+file 'nonexistent' not found
+ EXPECTED
+ else
+ FileUtils.touch 'unreadable'
+ FileUtils.chmod 0, 'unreadable'
+
+ @options.files = %w[nonexistent unreadable]
+
+ expected = <<-EXPECTED
+file 'nonexistent' not found
+file 'unreadable' not readable
+ EXPECTED
end
+
+ @options.check_files
end
end
@@ -45,11 +46,6 @@ class TestRDocOptions < MiniTest::Unit::TestCase
assert_equal '', out
- expected = <<-EXPECTED
-file 'nonexistent' not found
-file 'unreadable' not readable
- EXPECTED
-
assert_equal expected, err
end