Revert "You give jruby_skip & rubinius_skip a good name"

This reverts commit 8d2866bb.
上级 a162fc22
...@@ -34,4 +34,17 @@ def self.root ...@@ -34,4 +34,17 @@ def self.root
ActionMailer::Base.delivery_job = ActionMailer::MailDeliveryJob 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" require_relative "../../tools/test_common"
...@@ -350,6 +350,19 @@ class CommentsController < ResourcesController; end ...@@ -350,6 +350,19 @@ class CommentsController < ResourcesController; end
class AccountsController < ResourcesController; end class AccountsController < ResourcesController; end
class ImagesController < 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 class DrivenByRackTest < ActionDispatch::SystemTestCase
driven_by :rack_test driven_by :rack_test
end end
......
...@@ -192,6 +192,17 @@ def stderr_logger ...@@ -192,6 +192,17 @@ def stderr_logger
class ActiveSupport::TestCase class ActiveSupport::TestCase
parallelize 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 end
require_relative "../../tools/test_common" require_relative "../../tools/test_common"
...@@ -11,4 +11,17 @@ ...@@ -11,4 +11,17 @@
require "active_support/testing/autorun" require "active_support/testing/autorun"
require "active_support/core_ext/integer/time" 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" require_relative "../../../tools/test_common"
...@@ -13,7 +13,6 @@ ...@@ -13,7 +13,6 @@
require "active_support/testing/time_helpers" require "active_support/testing/time_helpers"
require "active_support/testing/file_fixtures" require "active_support/testing/file_fixtures"
require "active_support/testing/parallelization" require "active_support/testing/parallelization"
require "active_support/testing/alternative_runtime_skipper"
require "concurrent/utility/processor_counter" require "concurrent/utility/processor_counter"
module ActiveSupport module ActiveSupport
...@@ -144,7 +143,6 @@ def parallelize_teardown(&block) ...@@ -144,7 +143,6 @@ def parallelize_teardown(&block)
include ActiveSupport::Testing::TimeHelpers include ActiveSupport::Testing::TimeHelpers
include ActiveSupport::Testing::FileFixtures include ActiveSupport::Testing::FileFixtures
extend ActiveSupport::Testing::Declarative extend ActiveSupport::Testing::Declarative
include ActiveSupport::Testing::AlternativeRuntimeSkipper
# test/unit backwards compatibility methods # test/unit backwards compatibility methods
......
# 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
...@@ -25,4 +25,17 @@ ...@@ -25,4 +25,17 @@
# Disable available locale checks to avoid warnings running the test suite. # Disable available locale checks to avoid warnings running the test suite.
I18n.enforce_available_locales = false 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" require_relative "../../tools/test_common"
...@@ -18,4 +18,19 @@ class Application < Rails::Application ...@@ -18,4 +18,19 @@ class Application < Rails::Application
end end
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" require_relative "../../tools/test_common"
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册