Skip to content
Permalink
Browse files
Merge remote-tracking branch 'origin/jruby-1_7'
  • Loading branch information
headius committed Dec 16, 2014
2 parents 9388989 + e6150c6 commit 23690ec9007f5d82b5be62d0c1bcbd95c95cd90d
Showing with 4 additions and 4 deletions.
  1. +4 −4 test/jruby/test_file.rb
@@ -255,15 +255,15 @@ def test_expand_path_with_file_url_relative_path
def test_expand_path_looks_like_url
jruby_specific_test
assert_equal "classpath:/META-INF/jruby.home", File.expand_path("classpath:/META-INF/jruby.home")
assert_equal "uri:bundle://12.0:1/META-INF/jruby.home", File.expand_path("uri:bundle://12.0:1/META-INF/jruby.home")
assert_equal "uri:file://META-INF/jruby.home", File.expand_path("uri:file://META-INF/jruby.home")
assert_equal "http://example.com/a.jar", File.expand_path("http://example.com/a.jar")
assert_equal "http://example.com/", File.expand_path("..", "http://example.com/a.jar")
assert_equal "classpath:/foo/bar/baz", File.expand_path("baz", "classpath:/foo/bar")
assert_equal "classpath:/foo/bar", File.expand_path("classpath:/foo/bar", "classpath:/baz/quux")
assert_equal "classpath:/foo", File.expand_path("..", "classpath:/foo/bar")
assert_equal "uri:bundle://12.0:1/foo/bar/baz", File.expand_path("baz", "uri:bundle://12.0:1/foo/bar")
assert_equal "uri:bundle://12.0:1/foo/bar", File.expand_path("uri:bundle://12.0:1/foo/bar", "uri:bundle://12.0:1/baz/quux")
assert_equal "uri:bundle://12.0:1/foo", File.expand_path("..", "uri:bundle://12.0:1/foo/bar")
assert_equal "uri:jar://foo/bar/baz", File.expand_path("baz", "uri:jar://foo/bar")
assert_equal "uri:file://foo/bar", File.expand_path("uri:file://foo/bar", "uri:file://baz/quux")
assert_equal "uri:jar://foo", File.expand_path("..", "uri:jar://foo/bar")
end

def test_mkdir_with_non_file_uri_raises_error

0 comments on commit 23690ec

Please sign in to comment.