Revert "Get AS TestCase off deprecated callbacks"

This reverts commit 29b280666b6a8216a46b8349fa76c85f5b5dcc55.

2 files changed, 53 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 = '.'
diff --git a/activesupport/test/test_test.rb b/activesupport/test/test_test.rb
index 7a45dab60b..5cbffb81fc 100644
--- a/activesupport/test/test_test.rb
+++ b/activesupport/test/test_test.rb
@@ -95,3 +95,55 @@ end
 
 class AlsoDoingNothingTest < ActiveSupport::TestCase
 end
+
+# Setup and teardown callbacks.
+class SetupAndTeardownTest < ActiveSupport::TestCase
+  setup :reset_callback_record, :foo
+  teardown :foo, :sentinel, :foo
+
+  def test_inherited_setup_callbacks
+    assert_equal [:reset_callback_record, :foo], self.class.setup_callback_chain.map(&:method)
+    assert_equal [:foo], @called_back
+    assert_equal [:foo, :sentinel, :foo], self.class.teardown_callback_chain.map(&:method)
+  end
+
+  def setup
+  end
+
+  def teardown
+  end
+
+  protected
+    def reset_callback_record
+      @called_back = []
+    end
+
+    def foo
+      @called_back << :foo
+    end
+
+    def sentinel
+      assert_equal [:foo, :foo], @called_back
+    end
+end
+
+
+class SubclassSetupAndTeardownTest < SetupAndTeardownTest
+  setup :bar
+  teardown :bar
+
+  def test_inherited_setup_callbacks
+    assert_equal [:reset_callback_record, :foo, :bar], self.class.setup_callback_chain.map(&:method)
+    assert_equal [:foo, :bar], @called_back
+    assert_equal [:foo, :sentinel, :foo, :bar], self.class.teardown_callback_chain.map(&:method)
+  end
+
+  protected
+    def bar
+      @called_back << :bar
+    end
+
+    def sentinel
+      assert_equal [:foo, :bar, :bar, :foo], @called_back
+    end
+end