From 02e679ba75067662c1dae1654e8225324bf9e62f Mon Sep 17 00:00:00 2001
From: Jean Boussier <jean.boussier@gmail.com>
Date: Mon, 2 Oct 2023 13:01:44 +0200
Subject: [PATCH] Get rid of the `jruby_skip` test helper

The last test calling it actually passes on latest
JRuby.
---
 actionmailer/test/abstract_unit.rb           | 6 ------
 actionpack/test/abstract_unit.rb             | 6 ------
 actionview/test/abstract_unit.rb             | 6 ------
 actionview/test/template/date_helper_test.rb | 4 +---
 activemodel/test/cases/helper.rb             | 6 ------
 activesupport/test/abstract_unit.rb          | 6 ------
 railties/test/abstract_unit.rb               | 6 ------
 7 files changed, 1 insertion(+), 39 deletions(-)

diff --git a/actionmailer/test/abstract_unit.rb b/actionmailer/test/abstract_unit.rb
index bdf18fb5f3..d0ae7ab401 100644
--- a/actionmailer/test/abstract_unit.rb
+++ b/actionmailer/test/abstract_unit.rb
@@ -38,12 +38,6 @@ def self.root
 
 class ActiveSupport::TestCase
   include ActiveSupport::Testing::MethodCallAssertions
-
-  private
-    # Skips the current run on JRuby using Minitest::Assertions#skip
-    def jruby_skip(message = "")
-      skip message if defined?(JRUBY_VERSION)
-    end
 end
 
 require_relative "../../tools/test_common"
diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb
index 210fb1df99..99330e9053 100644
--- a/actionpack/test/abstract_unit.rb
+++ b/actionpack/test/abstract_unit.rb
@@ -362,12 +362,6 @@ class ImagesController < ResourcesController; end
 
 class ActiveSupport::TestCase
   include ActiveSupport::Testing::MethodCallAssertions
-
-  private
-    # Skips the current run on JRuby using Minitest::Assertions#skip
-    def jruby_skip(message = "")
-      skip message if defined?(JRUBY_VERSION)
-    end
 end
 
 module CookieAssertions
diff --git a/actionview/test/abstract_unit.rb b/actionview/test/abstract_unit.rb
index 50d1424926..5afaa8596c 100644
--- a/actionview/test/abstract_unit.rb
+++ b/actionview/test/abstract_unit.rb
@@ -186,12 +186,6 @@ class ActiveSupport::TestCase
   end
 
   include ActiveSupport::Testing::MethodCallAssertions
-
-  private
-    # Skips the current run on JRuby using Minitest::Assertions#skip
-    def jruby_skip(message = "")
-      skip message if defined?(JRUBY_VERSION)
-    end
 end
 
 require_relative "../../tools/test_common"
diff --git a/actionview/test/template/date_helper_test.rb b/actionview/test/template/date_helper_test.rb
index 5cdf80fecb..7d9f41280b 100644
--- a/actionview/test/template/date_helper_test.rb
+++ b/actionview/test/template/date_helper_test.rb
@@ -144,9 +144,7 @@ def test_distance_in_words_with_mixed_argument_types
   end
 
   def test_distance_in_words_doesnt_use_the_quotient_operator
-    jruby_skip "Date is written in Ruby and relies on Integer#/"
-
-    # Make sure that we avoid Integer#/ (redefined by mathn)
+    # Make sure that we avoid Integer#/ (redefined by mathn gem to return Rational)
     Integer.send :private, :/
 
     from = Time.utc(2004, 6, 6, 21, 45, 0)
diff --git a/activemodel/test/cases/helper.rb b/activemodel/test/cases/helper.rb
index 6c4def0403..3e5e70cf14 100644
--- a/activemodel/test/cases/helper.rb
+++ b/activemodel/test/cases/helper.rb
@@ -23,12 +23,6 @@ def after_teardown
 
     raise AssertionlessTest, "No assertions made." if passed? && assertions.zero?
   end
-
-  private
-    # Skips the current run on JRuby using Minitest::Assertions#skip
-    def jruby_skip(message = "")
-      skip message if defined?(JRUBY_VERSION)
-    end
 end
 
 require_relative "../../../tools/test_common"
diff --git a/activesupport/test/abstract_unit.rb b/activesupport/test/abstract_unit.rb
index a0b1530174..d5de723cfb 100644
--- a/activesupport/test/abstract_unit.rb
+++ b/activesupport/test/abstract_unit.rb
@@ -43,12 +43,6 @@ class ActiveSupport::TestCase
 
   include ActiveSupport::Testing::MethodCallAssertions
   include ActiveSupport::Testing::ErrorReporterAssertions
-
-  private
-    # Skips the current run on JRuby using Minitest::Assertions#skip
-    def jruby_skip(message = "")
-      skip message if defined?(JRUBY_VERSION)
-    end
 end
 
 require_relative "../../tools/test_common"
diff --git a/railties/test/abstract_unit.rb b/railties/test/abstract_unit.rb
index 1de8fbdc83..82a559b73e 100644
--- a/railties/test/abstract_unit.rb
+++ b/railties/test/abstract_unit.rb
@@ -22,12 +22,6 @@ class Application < Rails::Application
 
 class ActiveSupport::TestCase
   include ActiveSupport::Testing::Stream
-
-  private
-    # Skips the current run on JRuby using Minitest::Assertions#skip
-    def jruby_skip(message = "")
-      skip message if defined?(JRUBY_VERSION)
-    end
 end
 
 require_relative "../../tools/test_common"