Merge pull request rails#49454 from Shopify/jruby-skip

Author: byroot

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"

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

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"

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)

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"

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"

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"