From 934f537b458778f4786716c95b73fc72bc1ce256 Mon Sep 17 00:00:00 2001 From: ryan Date: Fri, 28 Jan 2011 23:46:47 +0000 Subject: Import rubygems 1.5.0 (release candidate @ 09893d9) git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30717 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/rubygems/test_gem_installer.rb | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'test/rubygems/test_gem_installer.rb') diff --git a/test/rubygems/test_gem_installer.rb b/test/rubygems/test_gem_installer.rb index c77de792f3..94fa4423bc 100644 --- a/test/rubygems/test_gem_installer.rb +++ b/test/rubygems/test_gem_installer.rb @@ -4,9 +4,9 @@ # File a patch instead and assign it to Ryan Davis or Eric Hodel. ###################################################################### -require "test/rubygems/gem_installer_test_case" +require 'rubygems/installer_test_case' -class TestGemInstaller < GemInstallerTestCase +class TestGemInstaller < Gem::InstallerTestCase def test_app_script_text util_make_exec '2', '' @@ -72,6 +72,7 @@ load Gem.bin_path('a', 'my_exec', version) end def test_build_extensions_unsupported + gem_make_out = File.join @gemhome, 'gems', @spec.full_name, 'gem_make.out' @spec.extensions << nil e = assert_raises Gem::Installer::ExtensionBuildError do @@ -80,15 +81,15 @@ load Gem.bin_path('a', 'my_exec', version) end end - assert_match(/^No builder for extension ''$/, e.message) + assert_match(/^\s*No builder for extension ''$/, e.message) assert_equal "Building native extensions. This could take a while...\n", @ui.output assert_equal '', @ui.error - assert_equal "No builder for extension ''\n", File.read('gem_make.out') + assert_equal "No builder for extension ''\n", File.read(gem_make_out) ensure - FileUtils.rm_f 'gem_make.out' + FileUtils.rm_f gem_make_out end def test_ensure_dependency -- cgit v1.2.3