diff options
Diffstat (limited to 'actionpack/test')
| -rw-r--r-- | actionpack/test/controller/request_forgery_protection_test.rb | 24 | ||||
| -rw-r--r-- | actionpack/test/template/text_helper_test.rb | 9 |
2 files changed, 13 insertions, 20 deletions
diff --git a/actionpack/test/controller/request_forgery_protection_test.rb b/actionpack/test/controller/request_forgery_protection_test.rb index 5c4dc1ee5f..59df4615c5 100644 --- a/actionpack/test/controller/request_forgery_protection_test.rb +++ b/actionpack/test/controller/request_forgery_protection_test.rb @@ -5,7 +5,7 @@ ActionController::Routing::Routes.draw do |map| end class RequestForgeryProtectionController < ActionController::Base - verify_token :only => :index, :secret => 'abc' + protect_from_forgery :only => :index, :secret => 'abc' def index render :inline => "<%= form_tag('/') {} %>" @@ -27,7 +27,7 @@ class RequestForgeryProtectionControllerTest < Test::Unit::TestCase def session_id() '123' end end @token = OpenSSL::HMAC.hexdigest(OpenSSL::Digest::Digest.new('SHA1'), 'abc', '123') - ActionController::Base.request_forgery_protection_token = :_token + ActionController::Base.request_forgery_protection_token = :authenticity_token end def teardown @@ -36,7 +36,7 @@ class RequestForgeryProtectionControllerTest < Test::Unit::TestCase def test_should_render_form_with_token_tag get :index - assert_select 'form>div>input[name=?][value=?]', '_token', @token + assert_select 'form>div>input[name=?][value=?]', 'authenticity_token', @token end # Replace this with your real tests. @@ -75,17 +75,17 @@ class RequestForgeryProtectionControllerTest < Test::Unit::TestCase end def test_should_allow_post_with_token - post :index, :_token => @token + post :index, :authenticity_token => @token assert_response :success end def test_should_allow_put_with_token - put :index, :_token => @token + put :index, :authenticity_token => @token assert_response :success end def test_should_allow_delete_with_token - delete :index, :_token => @token + delete :index, :authenticity_token => @token assert_response :success end @@ -107,7 +107,7 @@ end # no token is given, assume the cookie store is used class CsrfCookieMonsterController < ActionController::Base - verify_token :only => :index + protect_from_forgery :only => :index def index render :inline => "<%= form_tag('/') {} %>" @@ -137,7 +137,7 @@ class CsrfCookieMonsterControllerTest < Test::Unit::TestCase attr_reader :dbman end @token = Digest::SHA1.hexdigest("secure") - ActionController::Base.request_forgery_protection_token = :_token + ActionController::Base.request_forgery_protection_token = :authenticity_token end def teardown @@ -146,7 +146,7 @@ class CsrfCookieMonsterControllerTest < Test::Unit::TestCase def test_should_render_form_with_token_tag get :index - assert_select 'form>div>input[name=?][value=?]', '_token', @token + assert_select 'form>div>input[name=?][value=?]', 'authenticity_token', @token end # Replace this with your real tests. @@ -185,17 +185,17 @@ class CsrfCookieMonsterControllerTest < Test::Unit::TestCase end def test_should_allow_post_with_token - post :index, :_token => @token + post :index, :authenticity_token => @token assert_response :success end def test_should_allow_put_with_token - put :index, :_token => @token + put :index, :authenticity_token => @token assert_response :success end def test_should_allow_delete_with_token - delete :index, :_token => @token + delete :index, :authenticity_token => @token assert_response :success end diff --git a/actionpack/test/template/text_helper_test.rb b/actionpack/test/template/text_helper_test.rb index 80b9c773b3..979e436556 100644 --- a/actionpack/test/template/text_helper_test.rb +++ b/actionpack/test/template/text_helper_test.rb @@ -289,7 +289,7 @@ class TextHelperTest < Test::Unit::TestCase assert_sanitized raw, %{src="javascript:bang" <img width="5">foo</img>, <span>bar</span>} end - ActionView::Base.sanitized_allowed_tags.each do |tag_name| + ActionView::Helpers::TextHelper.sanitized_allowed_tags.each do |tag_name| define_method "test_should_allow_#{tag_name}_tag" do assert_sanitized "start <#{tag_name} title=\"1\" onclick=\"foo\">foo <bad>bar</bad> baz</#{tag_name}> end", %(start <#{tag_name} title="1">foo bar baz</#{tag_name}> end) end @@ -551,11 +551,4 @@ class TextHelperTest < Test::Unit::TestCase def assert_sanitized(text, expected = nil) assert_equal((expected || text), sanitize(text)) end - - # pull in configuration values from ActionView::Base - [:sanitized_protocol_separator, :sanitized_protocol_attributes, :sanitized_bad_tags, :sanitized_allowed_tags, :sanitized_allowed_attributes, :sanitized_allowed_protocols, :sanitized_allowed_css_properties, :sanitized_allowed_css_keywords, :sanitized_shorthand_css_properties, :sanitized_uri_attributes].each do |attr| - define_method attr do - ActionView::Base.send(attr) - end - end end |