diff options
Diffstat (limited to 'actionpack/lib')
-rw-r--r-- | actionpack/lib/action_controller/test_case.rb | 19 |
1 files changed, 16 insertions, 3 deletions
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 |