Rename some RequestForgeryProtection methods. The class method is now #protect_from_forgery, and the default parameter is now 'authenticity_token'. [Rick]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7596 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

1 files changed, 1 insertions, 8 deletions

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