From 16558f6dd83d514f783ed13e9bc24d6b66e5aefd Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Fri, 28 Dec 2007 05:21:24 +0000 Subject: Ensure that test case setup is run even if overridden. Closes #10382. git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8497 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionpack/test/controller/test_test.rb | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'actionpack/test/controller') diff --git a/actionpack/test/controller/test_test.rb b/actionpack/test/controller/test_test.rb index 11e48da91c..68eee4f4a3 100644 --- a/actionpack/test/controller/test_test.rb +++ b/actionpack/test/controller/test_test.rb @@ -614,10 +614,19 @@ class InferringClassNameTest < Test::Unit::TestCase end end +class ContentControllerTest < ActionController::TestCase + def setup + # Should not override ActionController setup methods + end + + def test_should_still_setup_controller + assert_kind_of(ContentController, @controller) + end +end + class CrazyNameTest < ActionController::TestCase tests ContentController def test_controller_class_can_be_set_manually_not_just_inferred assert_equal ContentController, self.class.controller_class end end - -- cgit v1.2.3