diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-10-14 16:12:19 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-10-14 16:12:57 -0700 |
| commit | 00eb09e016837e361fb9dcf6a46d1715ec59beca (patch) | |
| tree | 189c39066a1bb552c2d37f3204e3655ae0b13126 /activesupport/lib/active_support/testing | |
| parent | efdc06245470fa7caf2a14f2cb59e8bf8c76de5e (diff) | |
| download | rails-00eb09e016837e361fb9dcf6a46d1715ec59beca.tar.gz rails-00eb09e016837e361fb9dcf6a46d1715ec59beca.tar.bz2 rails-00eb09e016837e361fb9dcf6a46d1715ec59beca.zip | |
Revert "Get AS TestCase off deprecated callbacks"
This reverts commit 29b280666b6a8216a46b8349fa76c85f5b5dcc55.
Diffstat (limited to 'activesupport/lib/active_support/testing')
| -rw-r--r-- | activesupport/lib/active_support/testing/setup_and_teardown.rb | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/activesupport/lib/active_support/testing/setup_and_teardown.rb b/activesupport/lib/active_support/testing/setup_and_teardown.rb index 97773dc2c0..7952eb50c3 100644 --- a/activesupport/lib/active_support/testing/setup_and_teardown.rb +++ b/activesupport/lib/active_support/testing/setup_and_teardown.rb @@ -3,9 +3,7 @@ module ActiveSupport module SetupAndTeardown def self.included(base) base.class_eval do - extend ClassMethods - - include ActiveSupport::Callbacks + include ActiveSupport::DeprecatedCallbacks define_callbacks :setup, :teardown if defined?(MiniTest::Assertions) && TestCase < MiniTest::Assertions @@ -16,16 +14,6 @@ module ActiveSupport end end - module ClassMethods - def setup(*args, &block) - set_callback(:setup, *args, &block) - end - - def teardown(*args, &block) - set_callback(:teardown, *args, &block) - end - end - module ForMiniTest def run(runner) result = '.' |