aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--actionpack/lib/action_controller/request_forgery_protection.rb8
1 files changed, 7 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/request_forgery_protection.rb b/actionpack/lib/action_controller/request_forgery_protection.rb
index 035bad7498..75f9c0b284 100644
--- a/actionpack/lib/action_controller/request_forgery_protection.rb
+++ b/actionpack/lib/action_controller/request_forgery_protection.rb
@@ -54,6 +54,12 @@ module ActionController #:nodoc:
# skip_before_filter :verify_authenticity_token
# end
#
+ # If you are upgrading from Rails 1.x, disable forgery protection to
+ # simplify your tests. Add this to config/environments/test.rb:
+ #
+ # # Disable request forgery protection in test environment
+ # config.action_controller.allow_forgery_protection = false
+ #
# Valid Options:
#
# * <tt>:only/:except</tt> - passed to the before_filter call. Set which actions are verified.
@@ -123,4 +129,4 @@ module ActionController #:nodoc:
allow_forgery_protection && request_forgery_protection_token
end
end
-end \ No newline at end of file
+end