Revert "You give jruby_skip & rubinius_skip a good name"

This reverts commit 8d2866bb.

actionmailer/test/abstract_unit.rb

@@ -34,4 +34,17 @@ def self.root
 
 ActionMailer::Base.delivery_job = ActionMailer::MailDeliveryJob
 
+class ActiveSupport::TestCase
+  private
+    # Skips the current run on Rubinius using Minitest::Assertions#skip
+    def rubinius_skip(message = "")
+      skip message if RUBY_ENGINE == "rbx"
+    end
+
+    # 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

@@ -350,6 +350,19 @@ class CommentsController < ResourcesController; end
 class AccountsController < ResourcesController; end
 class ImagesController < ResourcesController; end
 
+class ActiveSupport::TestCase
+  private
+    # Skips the current run on Rubinius using Minitest::Assertions#skip
+    def rubinius_skip(message = "")
+      skip message if RUBY_ENGINE == "rbx"
+    end
+
+    # Skips the current run on JRuby using Minitest::Assertions#skip
+    def jruby_skip(message = "")
+      skip message if defined?(JRUBY_VERSION)
+    end
+end
+
 class DrivenByRackTest < ActionDispatch::SystemTestCase
   driven_by :rack_test
 end

actionview/test/abstract_unit.rb

@@ -192,6 +192,17 @@ def stderr_logger
 
 class ActiveSupport::TestCase
   parallelize
+
+  private
+    # Skips the current run on Rubinius using Minitest::Assertions#skip
+    def rubinius_skip(message = "")
+      skip message if RUBY_ENGINE == "rbx"
+    end
+
+    # 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"

activemodel/test/cases/helper.rb

@@ -11,4 +11,17 @@
 require "active_support/testing/autorun"
 require "active_support/core_ext/integer/time"
 
+class ActiveModel::TestCase < ActiveSupport::TestCase
+  private
+    # Skips the current run on Rubinius using Minitest::Assertions#skip
+    def rubinius_skip(message = "")
+      skip message if RUBY_ENGINE == "rbx"
+    end
+
+    # 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/lib/active_support/test_case.rb

@@ -13,7 +13,6 @@
 require "active_support/testing/time_helpers"
 require "active_support/testing/file_fixtures"
 require "active_support/testing/parallelization"
-require "active_support/testing/alternative_runtime_skipper"
 require "concurrent/utility/processor_counter"
 
 module ActiveSupport
@@ -144,7 +143,6 @@ def parallelize_teardown(&block)
     include ActiveSupport::Testing::TimeHelpers
     include ActiveSupport::Testing::FileFixtures
     extend ActiveSupport::Testing::Declarative
-    include ActiveSupport::Testing::AlternativeRuntimeSkipper
 
 
     # test/unit backwards compatibility methods

activesupport/lib/active_support/testing/alternative_runtime_skipper.rb

-# frozen_string_literal: true
-
-module ActiveSupport
-  module Testing
-    module AlternativeRuntimeSkipper
-      private
-        # Skips the current run on Rubinius using Minitest::Assertions#skip
-        def rubinius_skip(message = "")
-          skip message if RUBY_ENGINE == "rbx"
-        end
-
-        # Skips the current run on JRuby using Minitest::Assertions#skip
-        def jruby_skip(message = "")
-          skip message if defined?(JRUBY_VERSION)
-        end
-    end
-  end
-end

activesupport/test/abstract_unit.rb

@@ -25,4 +25,17 @@
 # Disable available locale checks to avoid warnings running the test suite.
 I18n.enforce_available_locales = false
 
+class ActiveSupport::TestCase
+  private
+    # Skips the current run on Rubinius using Minitest::Assertions#skip
+    def rubinius_skip(message = "")
+      skip message if RUBY_ENGINE == "rbx"
+    end
+
+    # 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

@@ -18,4 +18,19 @@ class Application < Rails::Application
   end
 end
 
+class ActiveSupport::TestCase
+  include ActiveSupport::Testing::Stream
+
+  private
+    # Skips the current run on Rubinius using Minitest::Assertions#skip
+    def rubinius_skip(message = "")
+      skip message if RUBY_ENGINE == "rbx"
+    end
+
+    # 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"