diff options
| author | Rafael Mendonça França <rafael@franca.dev> | 2019-08-02 00:24:21 -0400 |
|---|---|---|
| committer | Rafael Mendonça França <rafael@franca.dev> | 2019-08-02 00:24:21 -0400 |
| commit | 967beb7229e29c7d09fc3a5bc8205d2a6119e1c5 (patch) | |
| tree | 48fd29296e0c353ca856e72ce084387b6512ff7e /activesupport | |
| parent | 6384933994a494a1ea44cb51609534c1ccf639e4 (diff) | |
| download | rails-967beb7229e29c7d09fc3a5bc8205d2a6119e1c5.tar.gz rails-967beb7229e29c7d09fc3a5bc8205d2a6119e1c5.tar.bz2 rails-967beb7229e29c7d09fc3a5bc8205d2a6119e1c5.zip | |
Revert "MethodCallAssertions is a regular player of the team ActiveSupport::TestCase now"
This reverts commit 98d0f7ebd34b858f12a12dcf37ae54fdbb5cab64.
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/lib/active_support/test_case.rb | 3 | ||||
| -rw-r--r-- | activesupport/test/abstract_unit.rb | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/activesupport/lib/active_support/test_case.rb b/activesupport/lib/active_support/test_case.rb index 0b1cefc5e1..7be4108ed7 100644 --- a/activesupport/lib/active_support/test_case.rb +++ b/activesupport/lib/active_support/test_case.rb @@ -5,7 +5,6 @@ require "minitest" require "active_support/testing/tagged_logging" require "active_support/testing/setup_and_teardown" require "active_support/testing/assertions" -require "active_support/testing/method_call_assertions" require "active_support/testing/deprecation" require "active_support/testing/declarative" require "active_support/testing/isolation" @@ -138,13 +137,11 @@ module ActiveSupport include ActiveSupport::Testing::TaggedLogging prepend ActiveSupport::Testing::SetupAndTeardown include ActiveSupport::Testing::Assertions - include ActiveSupport::Testing::MethodCallAssertions include ActiveSupport::Testing::Deprecation include ActiveSupport::Testing::TimeHelpers include ActiveSupport::Testing::FileFixtures extend ActiveSupport::Testing::Declarative - # test/unit backwards compatibility methods alias :assert_raise :assert_raises alias :assert_not_empty :refute_empty diff --git a/activesupport/test/abstract_unit.rb b/activesupport/test/abstract_unit.rb index b46ad6842f..01e60abd99 100644 --- a/activesupport/test/abstract_unit.rb +++ b/activesupport/test/abstract_unit.rb @@ -10,6 +10,7 @@ silence_warnings do end require "active_support/testing/autorun" +require "active_support/testing/method_call_assertions" ENV["NO_RELOAD"] = "1" require "active_support" @@ -26,6 +27,8 @@ ActiveSupport.to_time_preserves_timezone = ENV["PRESERVE_TIMEZONES"] == "1" I18n.enforce_available_locales = false class ActiveSupport::TestCase + include ActiveSupport::Testing::MethodCallAssertions + private # Skips the current run on Rubinius using Minitest::Assertions#skip def rubinius_skip(message = "") |