diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | test/rubygems/gemutilities.rb | 4 | ||||
| -rw-r--r-- | test/rubygems/test_gem_commands_uninstall_command.rb | 6 | ||||
| -rw-r--r-- | test/rubygems/test_gem_installer.rb | 6 |
4 files changed, 16 insertions, 7 deletions
@@ -1,4 +1,9 @@ -Thu Sep 25 19:13:12 2008 +Thu Sep 25 19:34:33 2008 Eric Hodel <drbrain@segment7.net> + + * test/rubygems/*: Update some new tests to use build_rake_in. + * test/rubygems/gemutilities.rb: Fix broken merge of rake detection. + +Thu Sep 25 19:13:12 2008 Eric Hodel <drbrain@segment7.net> * lib/rubygems*: Update to RubyGems 1.3.0 r1891. diff --git a/test/rubygems/gemutilities.rb b/test/rubygems/gemutilities.rb index d1e50676d5..8083875f43 100644 --- a/test/rubygems/gemutilities.rb +++ b/test/rubygems/gemutilities.rb @@ -461,11 +461,11 @@ class RubyGemTestCase < Test::Unit::TestCase @@ruby = rubybin env_rake = ENV['rake'] - ruby19_rake = @@ruby + " " + File.expand_path("../../../bin/rake", __FILE__) + ruby19_rake = File.expand_path("../../../bin/rake", __FILE__) @@rake = if env_rake then ENV["rake"] elsif File.exist? ruby19_rake then - ruby19_rake + @@ruby + " " + ruby19_rake else 'rake' end diff --git a/test/rubygems/test_gem_commands_uninstall_command.rb b/test/rubygems/test_gem_commands_uninstall_command.rb index dfe84dc348..80f6591aef 100644 --- a/test/rubygems/test_gem_commands_uninstall_command.rb +++ b/test/rubygems/test_gem_commands_uninstall_command.rb @@ -12,8 +12,10 @@ class TestGemCommandsUninstallCommand < GemInstallerTestCase ui = MockGemUi.new util_setup_gem ui - use_ui ui do - @installer.install + build_rake_in do + use_ui ui do + @installer.install + end end @cmd = Gem::Commands::UninstallCommand.new diff --git a/test/rubygems/test_gem_installer.rb b/test/rubygems/test_gem_installer.rb index 4dc31efd1b..8ce9ed9ce6 100644 --- a/test/rubygems/test_gem_installer.rb +++ b/test/rubygems/test_gem_installer.rb @@ -618,8 +618,10 @@ load 'my_exec' @installer = Gem::Installer.new @gem, :install_dir => gemhome2, :source_index => source_index - use_ui @ui do - @installer.install + build_rake_in do + use_ui @ui do + @installer.install + end end assert File.exist?(File.join(gemhome2, 'gems', @spec.full_name)) |