diff options
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 7be4108ed7..0b1cefc5e1 100644 --- a/activesupport/lib/active_support/test_case.rb +++ b/activesupport/lib/active_support/test_case.rb @@ -5,6 +5,7 @@ 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" @@ -137,11 +138,13 @@ 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 01e60abd99..b46ad6842f 100644 --- a/activesupport/test/abstract_unit.rb +++ b/activesupport/test/abstract_unit.rb @@ -10,7 +10,6 @@ silence_warnings do end require "active_support/testing/autorun" -require "active_support/testing/method_call_assertions" ENV["NO_RELOAD"] = "1" require "active_support" @@ -27,8 +26,6 @@ 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 = "") |