1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00

Revert "You give jruby_skip & rubinius_skip a good name"

This reverts commit 8d2866bb80.
This commit is contained in:
Rafael Mendonça França 2019-08-02 00:24:11 -04:00
parent a162fc22e8
commit 6384933994
No known key found for this signature in database
GPG key ID: FC23B6D0F1EEE948
8 changed files with 78 additions and 20 deletions

View file

@ -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"

View file

@ -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

View file

@ -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"

View file

@ -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"

View file

@ -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

View file

@ -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

View file

@ -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"

View file

@ -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"