Revert "You give jruby_skip & rubinius_skip a good name"

This reverts commit 8d2866bb80fbe81acb04f5b0c44f152f571fb29f.

8 files changed, 78 insertions, 20 deletions

diff --git a/actionmailer/test/abstract_unit.rb b/actionmailer/test/abstract_unit.rb
index 0f3490a85f..0e31a81c8c 100644
--- a/actionmailer/test/abstract_unit.rb
+++ b/actionmailer/test/abstract_unit.rb
@@ -34,4 +34,17 @@ ActionMailer::Base.view_paths = FIXTURE_LOAD_PATH
 
 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"
diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb
index 238ce32ce6..ded93dd33f 100644
--- a/actionpack/test/abstract_unit.rb
+++ b/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
diff --git a/actionview/test/abstract_unit.rb b/actionview/test/abstract_unit.rb
index debf553689..516631ddb2 100644
--- a/actionview/test/abstract_unit.rb
+++ b/actionview/test/abstract_unit.rb
@@ -192,6 +192,17 @@ end
 
 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"
diff --git a/activemodel/test/cases/helper.rb b/activemodel/test/cases/helper.rb
index 786b54983c..483a108bda 100644
--- a/activemodel/test/cases/helper.rb
+++ b/activemodel/test/cases/helper.rb
@@ -11,4 +11,17 @@ I18n.enforce_available_locales = false
 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"
diff --git a/activesupport/lib/active_support/test_case.rb b/activesupport/lib/active_support/test_case.rb
index c513c76315..0b1cefc5e1 100644
--- a/activesupport/lib/active_support/test_case.rb
+++ b/activesupport/lib/active_support/test_case.rb
@@ -13,7 +13,6 @@ require "active_support/testing/constant_lookup"
 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 @@ module ActiveSupport
     include ActiveSupport::Testing::TimeHelpers
     include ActiveSupport::Testing::FileFixtures
     extend ActiveSupport::Testing::Declarative
-    include ActiveSupport::Testing::AlternativeRuntimeSkipper
 
 
     # test/unit backwards compatibility methods
diff --git a/activesupport/lib/active_support/testing/alternative_runtime_skipper.rb b/activesupport/lib/active_support/testing/alternative_runtime_skipper.rb
deleted file mode 100644
index f9e6eaff2f..0000000000
--- a/activesupport/lib/active_support/testing/alternative_runtime_skipper.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-# 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
diff --git a/activesupport/test/abstract_unit.rb b/activesupport/test/abstract_unit.rb
index a14748a6b3..b46ad6842f 100644
--- a/activesupport/test/abstract_unit.rb
+++ b/activesupport/test/abstract_unit.rb
@@ -25,4 +25,17 @@ ActiveSupport.to_time_preserves_timezone = ENV["PRESERVE_TIMEZONES"] == "1"
 # 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"
diff --git a/railties/test/abstract_unit.rb b/railties/test/abstract_unit.rb
index 93d09aad55..9600194ed6 100644
--- a/railties/test/abstract_unit.rb
+++ b/railties/test/abstract_unit.rb
@@ -18,4 +18,19 @@ module TestApp
   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"