diff options
| author | Rafael Mendonça França <rafael@franca.dev> | 2019-08-02 00:24:11 -0400 |
|---|---|---|
| committer | Rafael Mendonça França <rafael@franca.dev> | 2019-08-02 00:24:11 -0400 |
| commit | 6384933994a494a1ea44cb51609534c1ccf639e4 (patch) | |
| tree | 39f291c7f02f8b253ad6a7260abf0666ef1abd1e /activesupport | |
| parent | a162fc22e8fe08ba017acf1bc7f19a8e6231a536 (diff) | |
| download | rails-6384933994a494a1ea44cb51609534c1ccf639e4.tar.gz rails-6384933994a494a1ea44cb51609534c1ccf639e4.tar.bz2 rails-6384933994a494a1ea44cb51609534c1ccf639e4.zip | |
Revert "You give jruby_skip & rubinius_skip a good name"
This reverts commit 8d2866bb80fbe81acb04f5b0c44f152f571fb29f.
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/lib/active_support/test_case.rb | 2 | ||||
| -rw-r--r-- | activesupport/lib/active_support/testing/alternative_runtime_skipper.rb | 18 | ||||
| -rw-r--r-- | activesupport/test/abstract_unit.rb | 13 |
3 files changed, 13 insertions, 20 deletions
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" |