diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | test/rubygems/test_gem_installer.rb | 2 |
2 files changed, 8 insertions, 1 deletions
@@ -1,3 +1,10 @@ +Fri Nov 30 23:39:58 2012 NAKAMURA Usaku <usa@ruby-lang.org> + + * test/rubygems/test_gem_installer.rb + (TestGemInstaller#test_check_executable_overwrite_default_bin_dir): + if the executable to be overwritten was generated by rubygems, the + error messsage differs from the only copied one's. + Fri Nov 30 23:27:26 2012 NAKAMURA Usaku <usa@ruby-lang.org> * test/rubygems/test_gem_ext_ext_conf_builder.rb diff --git a/test/rubygems/test_gem_installer.rb b/test/rubygems/test_gem_installer.rb index 23ac5b1f35..7d1abf18c5 100644 --- a/test/rubygems/test_gem_installer.rb +++ b/test/rubygems/test_gem_installer.rb @@ -180,7 +180,7 @@ load Gem.bin_path('a', 'executable', version) end conflicted = File.join @gemhome, 'bin', 'executable' - assert_equal "\"executable\" from a conflicts with #{conflicted}", + assert_match /\A"executable" from a conflicts with (?:#{Regexp.quote(conflicted)}|installed executable from conflict)\z/, e.message end ensure |