diff options
author | Joshua Peek <josh@joshpeek.com> | 2009-10-12 22:15:43 -0500 |
---|---|---|
committer | Joshua Peek <josh@joshpeek.com> | 2009-10-12 22:15:43 -0500 |
commit | 21e7b8462113fc7c0fd1882dcc2bf7225de67b1a (patch) | |
tree | 81350780f50b8378aec99210d956bba3dda635f7 /activesupport/lib/active_support/testing | |
parent | 9bc8defe38253840ceb9c4ad92e7c3abc0066ed8 (diff) | |
download | rails-21e7b8462113fc7c0fd1882dcc2bf7225de67b1a.tar.gz rails-21e7b8462113fc7c0fd1882dcc2bf7225de67b1a.tar.bz2 rails-21e7b8462113fc7c0fd1882dcc2bf7225de67b1a.zip |
Callbacks, DeprecatedCallbacks = NewCallbacks, Callbacks
Diffstat (limited to 'activesupport/lib/active_support/testing')
-rw-r--r-- | activesupport/lib/active_support/testing/setup_and_teardown.rb | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/activesupport/lib/active_support/testing/setup_and_teardown.rb b/activesupport/lib/active_support/testing/setup_and_teardown.rb index b59ac79e7b..7952eb50c3 100644 --- a/activesupport/lib/active_support/testing/setup_and_teardown.rb +++ b/activesupport/lib/active_support/testing/setup_and_teardown.rb @@ -1,11 +1,9 @@ -require 'active_support/callbacks' - module ActiveSupport module Testing module SetupAndTeardown def self.included(base) base.class_eval do - include ActiveSupport::Callbacks + include ActiveSupport::DeprecatedCallbacks define_callbacks :setup, :teardown if defined?(MiniTest::Assertions) && TestCase < MiniTest::Assertions @@ -34,7 +32,7 @@ module ActiveSupport result end end - + module ForClassicTestUnit # For compatibility with Ruby < 1.8.6 PASSTHROUGH_EXCEPTIONS = Test::Unit::TestCase::PASSTHROUGH_EXCEPTIONS rescue [NoMemoryError, SignalException, Interrupt, SystemExit] |