ruby-changes:73770
From: David <ko1@a...>
Date: Thu, 29 Sep 2022 03:42:08 +0900 (JST)
Subject: [ruby-changes:73770] 5222a89ab6 (master): [rubygems/rubygems] Unskip stuff that now works on JRuby
https://git.ruby-lang.org/ruby.git/commit/?id=5222a89ab6 From 5222a89ab6c71ead00afc7c75684212328457414 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= <deivid.rodriguez@r...> Date: Sat, 4 Dec 2021 14:38:30 +0100 Subject: [rubygems/rubygems] Unskip stuff that now works on JRuby https://github.com/rubygems/rubygems/commit/d86a5ae2eb --- test/rubygems/test_gem.rb | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/test/rubygems/test_gem.rb b/test/rubygems/test_gem.rb index 9070b9342e..cc9d0a22d5 100644 --- a/test/rubygems/test_gem.rb +++ b/test/rubygems/test_gem.rb @@ -807,7 +807,7 @@ class TestGem < Gem::TestCase https://github.com/ruby/ruby/blob/trunk/test/rubygems/test_gem.rb#L807 assert_equal expected, Gem.find_files("sff/discover").sort assert_equal expected, Gem.find_files("sff/**.rb").sort, "[ruby-core:31730]" ensure - assert_equal cwd, actual_load_path.shift unless Gem.java_platform? + assert_equal cwd, actual_load_path.shift end def test_self_find_latest_files @@ -1335,12 +1335,10 @@ class TestGem < Gem::TestCase https://github.com/ruby/ruby/blob/trunk/test/rubygems/test_gem.rb#L1335 refute Gem.try_activate "nonexistent" end - unless Gem.java_platform? - expected = "Ignoring ext-1 because its extensions are not built. " + - "Try: gem pristine ext --version 1\n" + expected = "Ignoring ext-1 because its extensions are not built. " + + "Try: gem pristine ext --version 1\n" - assert_equal expected, err - end + assert_equal expected, err end def test_self_use_paths_with_nils @@ -1695,8 +1693,6 @@ class TestGem < Gem::TestCase https://github.com/ruby/ruby/blob/trunk/test/rubygems/test_gem.rb#L1693 end def test_looks_for_gemdeps_files_automatically_from_binstubs - pend "Requiring bundler messes things up" if Gem.java_platform? - a = util_spec "a", "1" do |s| s.executables = %w[foo] s.bindir = "exe" @@ -1744,7 +1740,7 @@ class TestGem < Gem::TestCase https://github.com/ruby/ruby/blob/trunk/test/rubygems/test_gem.rb#L1740 end def test_looks_for_gemdeps_files_automatically_from_binstubs_in_parent_dir - pend "Requiring bundler messes things up" if Gem.java_platform? + pend "IO.popen has issues on JRuby when passed :chdir" if Gem.java_platform? a = util_spec "a", "1" do |s| s.executables = %w[foo] -- cgit v1.2.1 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/