Get rid of the jruby_skip test helper

The last test calling it actually passes on latest
JRuby.
This commit is contained in:
Jean Boussier 2023-10-02 13:01:44 +02:00
parent b10a2e4943
commit 02e679ba75
7 changed files with 1 additions and 39 deletions

@ -38,12 +38,6 @@ def self.root
class ActiveSupport::TestCase class ActiveSupport::TestCase
include ActiveSupport::Testing::MethodCallAssertions 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 end
require_relative "../../tools/test_common" require_relative "../../tools/test_common"

@ -362,12 +362,6 @@ class ImagesController < ResourcesController; end
class ActiveSupport::TestCase class ActiveSupport::TestCase
include ActiveSupport::Testing::MethodCallAssertions 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 end
module CookieAssertions module CookieAssertions

@ -186,12 +186,6 @@ class ActiveSupport::TestCase
end end
include ActiveSupport::Testing::MethodCallAssertions 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 end
require_relative "../../tools/test_common" require_relative "../../tools/test_common"

@ -144,9 +144,7 @@ def test_distance_in_words_with_mixed_argument_types
end end
def test_distance_in_words_doesnt_use_the_quotient_operator 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 gem to return Rational)
# Make sure that we avoid Integer#/ (redefined by mathn)
Integer.send :private, :/ Integer.send :private, :/
from = Time.utc(2004, 6, 6, 21, 45, 0) from = Time.utc(2004, 6, 6, 21, 45, 0)

@ -23,12 +23,6 @@ def after_teardown
raise AssertionlessTest, "No assertions made." if passed? && assertions.zero? raise AssertionlessTest, "No assertions made." if passed? && assertions.zero?
end end
private
# Skips the current run on JRuby using Minitest::Assertions#skip
def jruby_skip(message = "")
skip message if defined?(JRUBY_VERSION)
end
end end
require_relative "../../../tools/test_common" require_relative "../../../tools/test_common"

@ -43,12 +43,6 @@ class ActiveSupport::TestCase
include ActiveSupport::Testing::MethodCallAssertions include ActiveSupport::Testing::MethodCallAssertions
include ActiveSupport::Testing::ErrorReporterAssertions 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 end
require_relative "../../tools/test_common" require_relative "../../tools/test_common"

@ -22,12 +22,6 @@ class Application < Rails::Application
class ActiveSupport::TestCase class ActiveSupport::TestCase
include ActiveSupport::Testing::Stream 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 end
require_relative "../../tools/test_common" require_relative "../../tools/test_common"