diff options
| -rw-r--r-- | test/ruby/test_file_exhaustive.rb | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/test/ruby/test_file_exhaustive.rb b/test/ruby/test_file_exhaustive.rb index cd2760a72f..b0bb16243a 100644 --- a/test/ruby/test_file_exhaustive.rb +++ b/test/ruby/test_file_exhaustive.rb @@ -398,14 +398,15 @@ class TestFileExhaustive < Test::Unit::TestCase assert_equal(@file, File.expand_path(@file + "::$DATA")) assert_match(/\Ac:\//i, File.expand_path('c:'), '[ruby-core:31591]') assert_match(/\Ac:\//i, File.expand_path('c:foo', 'd:/bar')) - assert_equal('c:/bar/foo', File.expand_path('c:foo', 'c:/bar')) - assert_equal('C:/bar/foo', File.expand_path('c:foo', 'C:/bar')) + assert_match(%r'\Ac:/bar/foo\z'i, File.expand_path('c:foo', 'c:/bar')) end if drive = Dir.pwd[%r'\A(?:[a-z]:|//[^/]+/[^/]+)'i] - assert_equal("z:/foo", File.expand_path('/foo', "z:/bar")) - assert_equal("//host/share/foo", File.expand_path('/foo', "//host/share/bar")) + assert_match(%r"\Az:/foo\z"i, File.expand_path('/foo', "z:/bar")) + assert_match(%r"\A//host/share/foo\z"i, File.expand_path('/foo', "//host/share/bar").downcase) + assert_match(%r"\A#{drive}/foo\z"i, File.expand_path('/foo')) + else + assert_equal("/foo", File.expand_path('/foo')) end - assert_equal("#{drive}/foo", File.expand_path('/foo')) assert_kind_of(String, File.expand_path("~")) if ENV["HOME"] assert_raise(ArgumentError) { File.expand_path("~foo_bar_baz_unknown_user_wahaha") } assert_raise(ArgumentError) { File.expand_path("~foo_bar_baz_unknown_user_wahaha", "/") } |