File tree Expand file tree Collapse file tree 2 files changed +5
-6
lines changed
Expand file tree Collapse file tree 2 files changed +5
-6
lines changed Original file line number Diff line number Diff line change @@ -1289,11 +1289,7 @@ def door?
12891289
12901290 def entries
12911291 opts = { }
1292- if fu_windows? && ::Encoding . compatible? ( ::Encoding ::UTF_8 , path . encoding )
1293- opts [ :encoding ] = ::Encoding ::UTF_8
1294- else
1295- opts [ :encoding ] = path . encoding
1296- end
1292+ opts [ :encoding ] = fu_windows? ? ::Encoding ::UTF_8 : path . encoding
12971293
12981294 files = if Dir . respond_to? ( :children )
12991295 Dir . children ( path , **opts )
Original file line number Diff line number Diff line change @@ -770,7 +770,10 @@ def test_remove_entry_multibyte_path
770770 File . write ( "#{ dir } /#{ c } .txt" , "test_remove_entry_multibyte_path" )
771771
772772 remove_entry dir
773- assert_file_not_exist dir
773+ assert_no_file_exist dir
774+ rescue MiniTest ::Assertion
775+ STDERR . puts Dir . glob ( "#{ dir } /**" ) . inspect
776+ raise
774777 end
775778
776779 def test_remove_entry_secure
You can’t perform that action at this time.
0 commit comments