Fix Encoding::CompatibilityError in FileUtils::Entry_#join

lib/fileutils.rb

@@ -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)
+      begin
+        File.join(dir, base)
+      rescue EncodingError
+        if fu_windows?
+          File.join(dir.encode(::Encoding::UTF_8), base.encode(::Encoding::UTF_8))
+        else
+          raise
+        end
+      end
     end
 
     if File::ALT_SEPARATOR

test/fileutils/test_fileutils.rb

@@ -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