1 files changed, 10 insertions, 1 deletions
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
-