diff options
| -rw-r--r-- | lib/fileutils.rb | 6 | ||||
| -rw-r--r-- | test/fileutils/test_fileutils.rb | 5 |
2 files changed, 5 insertions, 6 deletions
diff --git a/lib/fileutils.rb b/lib/fileutils.rb index 371a348159..438f3210f7 100644 --- a/lib/fileutils.rb +++ b/lib/fileutils.rb @@ -1287,11 +1287,7 @@ module FileUtils def entries opts = {} - if fu_windows? && ::Encoding.compatible?(::Encoding::UTF_8, path.encoding) - opts[:encoding] = ::Encoding::UTF_8 - else - opts[:encoding] = path.encoding - end + opts[:encoding] = fu_windows? ? ::Encoding::UTF_8 : path.encoding files = if Dir.respond_to?(:children) Dir.children(path, **opts) diff --git a/test/fileutils/test_fileutils.rb b/test/fileutils/test_fileutils.rb index 8a546ccf1b..31973bf9da 100644 --- a/test/fileutils/test_fileutils.rb +++ b/test/fileutils/test_fileutils.rb @@ -770,7 +770,10 @@ class TestFileUtils < Test::Unit::TestCase File.write("#{dir}/#{c}.txt", "test_remove_entry_multibyte_path") remove_entry dir - assert_file_not_exist dir + assert_no_file_exist dir + rescue MiniTest::Assertion + STDERR.puts Dir.glob("#{dir}/**").inspect + raise end def test_remove_entry_secure |