diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2011-09-10 17:29:04 -0700 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2011-09-10 17:29:04 -0700 |
| commit | a9509284cad9047693f8e5d74248ad307ab5b23d (patch) | |
| tree | 340d8da35c7cb6dab632ab0194bd2467afd66f4b /actionpack | |
| parent | d0946fdd57125872efb6ece8257dccedfe3bef01 (diff) | |
| parent | dbef311819c2c6475d156cc74611992ae45f1330 (diff) | |
| download | rails-a9509284cad9047693f8e5d74248ad307ab5b23d.tar.gz rails-a9509284cad9047693f8e5d74248ad307ab5b23d.tar.bz2 rails-a9509284cad9047693f8e5d74248ad307ab5b23d.zip | |
Merge pull request #2974 from md5/csrf_token_warning
Use ensure instead of rescue
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/test/controller/request_forgery_protection_test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/test/controller/request_forgery_protection_test.rb b/actionpack/test/controller/request_forgery_protection_test.rb index 7a0b724387..fd5a41a0bb 100644 --- a/actionpack/test/controller/request_forgery_protection_test.rb +++ b/actionpack/test/controller/request_forgery_protection_test.rb @@ -168,7 +168,7 @@ module RequestForgeryProtectionTests assert_equal 1, logger.logged(:warn).size assert_match(/CSRF token authenticity/, logger.logged(:warn).last) - rescue + ensure ActionController::Base.logger = old_logger end end |