aboutsummaryrefslogtreecommitdiffstats
path: root/actionview
diff options
context:
space:
mode:
authorTimm <kaspth@gmail.com>2013-07-23 16:34:32 +0200
committerTimm <kaspth@gmail.com>2014-06-15 23:41:00 +0200
commit37ac1c45a3a95e6d1eb01c7cf1f8dd0850f12de8 (patch)
tree7f9eddef4aa750344eedb1e4c7fa9c2f35a08ec0 /actionview
parent11fc26b96f6c51643aced40e4522c74036c7458d (diff)
downloadrails-37ac1c45a3a95e6d1eb01c7cf1f8dd0850f12de8.tar.gz
rails-37ac1c45a3a95e6d1eb01c7cf1f8dd0850f12de8.tar.bz2
rails-37ac1c45a3a95e6d1eb01c7cf1f8dd0850f12de8.zip
Replaced html-scanner with Loofah.
Diffstat (limited to 'actionview')
-rw-r--r--actionview/lib/action_view/test_case.rb2
-rw-r--r--actionview/test/template/form_tag_helper_test.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/actionview/lib/action_view/test_case.rb b/actionview/lib/action_view/test_case.rb
index 9e8e6f43d5..112923adf9 100644
--- a/actionview/lib/action_view/test_case.rb
+++ b/actionview/lib/action_view/test_case.rb
@@ -155,7 +155,7 @@ module ActionView
#
# Need to experiment if this priority is the best one: rendered => output_buffer
def response_from_page
- HTML::Document.new(@rendered.blank? ? @output_buffer : @rendered).root
+ Loofah.document(@rendered.blank? ? @output_buffer : @rendered).root
end
def say_no_to_protect_against_forgery!
diff --git a/actionview/test/template/form_tag_helper_test.rb b/actionview/test/template/form_tag_helper_test.rb
index 18c739674a..d5976905c5 100644
--- a/actionview/test/template/form_tag_helper_test.rb
+++ b/actionview/test/template/form_tag_helper_test.rb
@@ -632,6 +632,6 @@ class FormTagHelperTest < ActionView::TestCase
private
def root_elem(rendered_content)
- HTML::Document.new(rendered_content).root.children[0]
+ Loofah.fragment(rendered_content).children.first # extract from nodeset
end
end