diff options
Diffstat (limited to 'test/rubygems')
-rw-r--r-- | test/rubygems/test_gem_commands_check_command.rb | 2 | ||||
-rw-r--r-- | test/rubygems/test_gem_commands_query_command.rb | 2 | ||||
-rw-r--r-- | test/rubygems/test_gem_doctor.rb | 8 | ||||
-rw-r--r-- | test/rubygems/test_gem_installer.rb | 4 | ||||
-rw-r--r-- | test/rubygems/test_require.rb | 3 |
5 files changed, 7 insertions, 12 deletions
diff --git a/test/rubygems/test_gem_commands_check_command.rb b/test/rubygems/test_gem_commands_check_command.rb index b28748623e..67db6a3206 100644 --- a/test/rubygems/test_gem_commands_check_command.rb +++ b/test/rubygems/test_gem_commands_check_command.rb @@ -45,7 +45,7 @@ class TestGemCommandsCheckCommand < Gem::TestCase end def test_doctor - a = gem 'a' + gem 'a' b = gem 'b' FileUtils.rm b.spec_file diff --git a/test/rubygems/test_gem_commands_query_command.rb b/test/rubygems/test_gem_commands_query_command.rb index 09e6efcd07..c14fbc0099 100644 --- a/test/rubygems/test_gem_commands_query_command.rb +++ b/test/rubygems/test_gem_commands_query_command.rb @@ -405,8 +405,6 @@ pl \(1\) @cmd.execute end - str = @ui.output - expected = <<-EOF *** LOCAL GEMS *** diff --git a/test/rubygems/test_gem_doctor.rb b/test/rubygems/test_gem_doctor.rb index 2fa68b2448..0dce8c2eac 100644 --- a/test/rubygems/test_gem_doctor.rb +++ b/test/rubygems/test_gem_doctor.rb @@ -55,13 +55,13 @@ class TestGemDoctor < Gem::TestCase expected = <<-OUTPUT Checking #{@gemhome} +Removed file specifications/c-2.gemspec Removed directory gems/b-2 Removed directory gems/c-2 -Removed file specifications/c-2.gemspec OUTPUT - assert_equal expected.lines.sort, @ui.output.lines.sort + assert_equal expected, @ui.output assert_equal Gem.dir, @userhome assert_equal Gem.path, [@gemhome, @userhome] @@ -108,13 +108,13 @@ Removed file specifications/c-2.gemspec expected = <<-OUTPUT Checking #{@gemhome} +Extra file specifications/c-2.gemspec Extra directory gems/b-2 Extra directory gems/c-2 -Extra file specifications/c-2.gemspec OUTPUT - assert_equal expected.lines.sort, @ui.output.lines.sort + assert_equal expected, @ui.output assert_equal Gem.dir, @userhome assert_equal Gem.path, [@gemhome, @userhome] diff --git a/test/rubygems/test_gem_installer.rb b/test/rubygems/test_gem_installer.rb index 98f1878dfb..c531c60b29 100644 --- a/test/rubygems/test_gem_installer.rb +++ b/test/rubygems/test_gem_installer.rb @@ -261,7 +261,7 @@ load Gem.bin_path('a', 'executable', version) end def test_ensure_loadable_spec_security_policy - a, a_gem = util_gem 'a', 2 do |s| + _, a_gem = util_gem 'a', 2 do |s| s.add_dependency 'garbage ~> 5' end @@ -1015,8 +1015,6 @@ load Gem.bin_path('a', 'executable', version) installer = Gem::Installer.new gem, :install_dir => gemhome2 - gem_home = Gem.dir - build_rake_in do use_ui @ui do assert installer.pre_install_checks diff --git a/test/rubygems/test_require.rb b/test/rubygems/test_require.rb index 9484901581..7553822319 100644 --- a/test/rubygems/test_require.rb +++ b/test/rubygems/test_require.rb @@ -57,9 +57,8 @@ class TestGemRequire < Gem::TestCase end def test_activate_via_require_respects_loaded_files + require 'benchmark' # stdlib save_loaded_features do - require 'benchmark' # stdlib - a1 = new_spec "a", "1", {"b" => ">= 1"}, "lib/a.rb" b1 = new_spec "b", "1", nil, "lib/benchmark.rb" b2 = new_spec "b", "2", nil, "lib/benchmark.rb" |