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/lib/action_controller/test_case.rb | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) (limited to 'actionpack/lib') diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb index d81cb5dae3..84610c34c0 100644 --- a/actionpack/lib/action_controller/test_case.rb +++ b/actionpack/lib/action_controller/test_case.rb @@ -44,10 +44,23 @@ module ActionController end end - def setup + def setup_with_controller @controller = self.class.controller_class.new @request = TestRequest.new @response = TestResponse.new end - end -end \ No newline at end of file + alias_method :setup, :setup_with_controller + + def self.method_added(method) + if method.to_s == 'setup' + unless method_defined?(:setup_without_controller) + alias_method :setup_without_controller, :setup + define_method(:setup) do + setup_with_controller + setup_without_controller + end + end + end + end + end +end -- cgit v1.2.3