diff options
| author | Kazuhiro NISHIYAMA <[email protected]> | 2020-06-22 18:34:24 +0900 |
|---|---|---|
| committer | Kazuhiro NISHIYAMA <[email protected]> | 2020-06-22 18:34:24 +0900 |
| commit | 6adbdb56edcf62c11229e1c9c6f75656700f1c5f () | |
| tree | 5272b8bbee68b7fbd12d9021554941a34ce518f5 | |
| parent | 3a1e63e54064496755e9e306f10c72fafc5bd162 (diff) | |
Fix Encoding::CompatibilityError in `FileUtils::Entry_#join`
| -rw-r--r-- | lib/fileutils.rb | 10 | ||||
| -rw-r--r-- | test/fileutils/test_fileutils.rb | 3 |
2 files changed, 9 insertions, 4 deletions
@@ -1557,7 +1557,15 @@ module FileUtils def join(dir, base) return File.path(dir) if not base or base == '.' return File.path(base) if not dir or dir == '.' - File.join(dir, base) end if File::ALT_SEPARATOR @@ -771,9 +771,6 @@ class TestFileUtils < Test::Unit::TestCase remove_entry dir assert_file_not_exist dir - rescue MiniTest::Assertion - STDERR.puts Dir.glob("#{dir}/**/*").inspect - raise end def test_remove_entry_secure |