diff options
| author | Michael Koziarski <michael@koziarski.com> | 2012-03-10 16:16:35 -0800 |
|---|---|---|
| committer | Michael Koziarski <michael@koziarski.com> | 2012-03-10 16:16:35 -0800 |
| commit | 411a8265835971e48f79de9829c5e18e01837395 (patch) | |
| tree | 2d4c987577d64c62107159d050372ce6cae92d84 /actionpack/test | |
| parent | d5d241cb2c696f13e2c16efca0d24565a6e1c0a5 (diff) | |
| parent | 245941101b1ea00a9b1af613c20b0ee994a43946 (diff) | |
| download | rails-411a8265835971e48f79de9829c5e18e01837395.tar.gz rails-411a8265835971e48f79de9829c5e18e01837395.tar.bz2 rails-411a8265835971e48f79de9829c5e18e01837395.zip | |
Merge pull request #5326 from lest/patch-2
configure how unverified request will be handled
Diffstat (limited to 'actionpack/test')
| -rw-r--r-- | actionpack/test/controller/request_forgery_protection_test.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/test/controller/request_forgery_protection_test.rb b/actionpack/test/controller/request_forgery_protection_test.rb index 64ed7f667f..ef795dad89 100644 --- a/actionpack/test/controller/request_forgery_protection_test.rb +++ b/actionpack/test/controller/request_forgery_protection_test.rb @@ -43,7 +43,7 @@ class RequestForgeryProtectionController < ActionController::Base protect_from_forgery :only => %w(index meta) end -class RequestForgeryProtectionControllerUsingOldBehaviour < ActionController::Base +class RequestForgeryProtectionControllerUsingException < ActionController::Base include RequestForgeryProtectionActions protect_from_forgery :only => %w(index meta) @@ -215,7 +215,7 @@ class RequestForgeryProtectionControllerTest < ActionController::TestCase end end -class RequestForgeryProtectionControllerUsingOldBehaviourTest < ActionController::TestCase +class RequestForgeryProtectionControllerUsingExceptionTest < ActionController::TestCase include RequestForgeryProtectionTests def assert_blocked assert_raises(ActionController::InvalidAuthenticityToken) do |