aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2012-01-21 13:00:42 -0800
committerJosé Valim <jose.valim@gmail.com>2012-01-21 13:00:42 -0800
commit15a9b2c0d619fd29abebf56344e28011526b5c03 (patch)
tree7f867fd983b4b2443616dd9f030320ee7a8d9fe0 /actionpack
parent1620df78dff527b4fa3f7b204fa05d1b630aae17 (diff)
parent9cecb2db16fc2bde3dd489775d4642a469b9bf53 (diff)
downloadrails-15a9b2c0d619fd29abebf56344e28011526b5c03.tar.gz
rails-15a9b2c0d619fd29abebf56344e28011526b5c03.tar.bz2
rails-15a9b2c0d619fd29abebf56344e28011526b5c03.zip
Merge pull request #4588 from carlosantoniodasilva/remove-require-csrf
Remove not used requires from csrf helper file and test
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_view/helpers/csrf_helper.rb2
-rw-r--r--actionpack/test/controller/request_forgery_protection_test.rb7
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