Skip to content

Commit

Permalink
fix merge conflict on uri:classloader:/ prefix in test
Browse files Browse the repository at this point in the history
  • Loading branch information
mkristian committed Jun 18, 2015
1 parent 16f52b7 commit 7fac768
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion test/jruby/test_dir.rb
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ def test_chdir_and_pwd
def test_glob_inside_jar_file
jar_file = jar_file_with_spaces

prefix = 'uri:classloader:'
prefix = 'uri:classloader:/'
["#{prefix}/abc", "#{prefix}/inside_jar.rb", "#{prefix}/second_jar.rb"].each do |f|
assert $__glob_value.include?(f), "#{f} not found in #{$__glob_value.inspect}"
end
Expand Down

0 comments on commit 7fac768

Please sign in to comment.