diff options
Diffstat (limited to 'activesupport/lib/active_support/test_case.rb')
| -rw-r--r-- | activesupport/lib/active_support/test_case.rb | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/activesupport/lib/active_support/test_case.rb b/activesupport/lib/active_support/test_case.rb index a4a45079fa..1cc8564a18 100644 --- a/activesupport/lib/active_support/test_case.rb +++ b/activesupport/lib/active_support/test_case.rb @@ -1,21 +1,18 @@ -require 'test/unit/testcase' -require 'active_support/testing/setup_and_teardown' -require 'active_support/testing/assertions' -require 'active_support/testing/declarative' - begin - gem 'mocha', '>= 0.9.0' + gem 'mocha', '>= 0.9.3' require 'mocha' - - if defined?(MiniTest) - require 'active_support/testing/mocha_minitest_adapter' - end rescue LoadError # Fake Mocha::ExpectationError so we can rescue it in #run. Bleh. Object.const_set :Mocha, Module.new Mocha.const_set :ExpectationError, Class.new(StandardError) end +require 'test/unit/testcase' +require 'active_support/testing/setup_and_teardown' +require 'active_support/testing/assertions' +require 'active_support/testing/deprecation' +require 'active_support/testing/declarative' + module ActiveSupport class TestCase < ::Test::Unit::TestCase if defined? MiniTest @@ -35,6 +32,7 @@ module ActiveSupport include ActiveSupport::Testing::SetupAndTeardown include ActiveSupport::Testing::Assertions + include ActiveSupport::Testing::Deprecation extend ActiveSupport::Testing::Declarative end end |
