diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2008-12-30 18:06:56 -0800 |
|---|---|---|
| committer | Yehuda Katz <wycats@gmail.com> | 2009-01-01 00:13:11 -0800 |
| commit | 658cf556d2bf3ea099fbce434ca338bf28365b40 (patch) | |
| tree | 9eea2baef4356b4d2a0b11c0006d4c760a7dae8c /actionpack/lib | |
| parent | 6b3c702bd7321e7fcf86a82edb720b96a7e34119 (diff) | |
| download | rails-658cf556d2bf3ea099fbce434ca338bf28365b40.tar.gz rails-658cf556d2bf3ea099fbce434ca338bf28365b40.tar.bz2 rails-658cf556d2bf3ea099fbce434ca338bf28365b40.zip | |
Test that exceptions raised in filters are properly rescued
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_controller/base.rb | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb index bc18dfaec8..aa604395a9 100644 --- a/actionpack/lib/action_controller/base.rb +++ b/actionpack/lib/action_controller/base.rb @@ -1350,9 +1350,12 @@ module ActionController #:nodoc: end Base.class_eval do - include Flash, Filters, Layout, Benchmarking, Rescue, MimeResponds, Helpers - include Cookies, Caching, Verification, Streaming - include SessionManagement, HttpAuthentication::Basic::ControllerMethods - include RecordIdentifier, RequestForgeryProtection, Translation + [ Flash, Filters, Layout, Benchmarking, Rescue, MimeResponds, Helpers, + Cookies, Caching, Verification, Streaming, SessionManagement, + HttpAuthentication::Basic::ControllerMethods, RecordIdentifier, + RequestForgeryProtection, Translation + ].each do |mod| + include mod + end end end |