diff options
author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-01-21 18:47:05 -0200 |
---|---|---|
committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-01-21 18:47:06 -0200 |
commit | 9cecb2db16fc2bde3dd489775d4642a469b9bf53 (patch) | |
tree | 89531045f844d98def9cc512db0634617856fd72 | |
parent | c05f3b0e4f6c5b2b350828e5e3cf9d0b1146562f (diff) | |
download | rails-9cecb2db16fc2bde3dd489775d4642a469b9bf53.tar.gz rails-9cecb2db16fc2bde3dd489775d4642a469b9bf53.tar.bz2 rails-9cecb2db16fc2bde3dd489775d4642a469b9bf53.zip |
Remove not used requires from csrf helper file and test
These requires were added in a87b92d and the implementation changed in
2cdc1f0, removing the need for them.
-rw-r--r-- | actionpack/lib/action_view/helpers/csrf_helper.rb | 2 | ||||
-rw-r--r-- | actionpack/test/controller/request_forgery_protection_test.rb | 7 |
2 files changed, 0 insertions, 9 deletions
diff --git a/actionpack/lib/action_view/helpers/csrf_helper.rb b/actionpack/lib/action_view/helpers/csrf_helper.rb index 1f2bc28cac..eeb0ed94b9 100644 --- a/actionpack/lib/action_view/helpers/csrf_helper.rb +++ b/actionpack/lib/action_view/helpers/csrf_helper.rb @@ -1,5 +1,3 @@ -require 'active_support/core_ext/string/strip' - module ActionView # = Action View CSRF Helper module Helpers diff --git a/actionpack/test/controller/request_forgery_protection_test.rb b/actionpack/test/controller/request_forgery_protection_test.rb index 4a291582d8..e6d3fa74f2 100644 --- a/actionpack/test/controller/request_forgery_protection_test.rb +++ b/actionpack/test/controller/request_forgery_protection_test.rb @@ -1,6 +1,5 @@ require 'abstract_unit' require 'digest/sha1' -require 'active_support/core_ext/string/strip' require "active_support/log_subscriber/test_helper" # common controller actions @@ -72,9 +71,7 @@ class CustomAuthenticityParamController < RequestForgeryProtectionController end end - # common test methods - module RequestForgeryProtectionTests def setup @token = "cf50faa3fe97702ca1ae" @@ -246,10 +243,6 @@ class FreeCookieControllerTest < ActionController::TestCase end end - - - - class CustomAuthenticityParamControllerTest < ActionController::TestCase def setup ActionController::Base.request_forgery_protection_token = :custom_token_name |