aboutsummaryrefslogtreecommitdiffstats
path: root/actionview
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2014-07-15 13:30:28 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2014-07-15 13:40:21 -0300
commit158a6dfcd28e8b59ff656fc78856e623b7c0f799 (patch)
tree379379846c41ddc29db4bed1a074e520451c025a /actionview
parent126a15e0fe6a0021dd8bc37d32a2498a9c22cafd (diff)
downloadrails-158a6dfcd28e8b59ff656fc78856e623b7c0f799.tar.gz
rails-158a6dfcd28e8b59ff656fc78856e623b7c0f799.tar.bz2
rails-158a6dfcd28e8b59ff656fc78856e623b7c0f799.zip
We don't need loofah for the assertions
We can just use nokogiri
Diffstat (limited to 'actionview')
-rw-r--r--actionview/lib/action_view/test_case.rb3
-rw-r--r--actionview/test/template/form_tag_helper_test.rb2
2 files changed, 2 insertions, 3 deletions
diff --git a/actionview/lib/action_view/test_case.rb b/actionview/lib/action_view/test_case.rb
index 2d54b90570..4c65860423 100644
--- a/actionview/lib/action_view/test_case.rb
+++ b/actionview/lib/action_view/test_case.rb
@@ -3,7 +3,6 @@ require 'action_controller'
require 'action_controller/test_case'
require 'action_view'
-require 'loofah'
require 'rails-dom-testing'
module ActionView
@@ -159,7 +158,7 @@ module ActionView
# Need to experiment if this priority is the best one: rendered => output_buffer
def document_root_element
- @html_document ||= Loofah.document(@rendered.blank? ? @output_buffer : @rendered)
+ @html_document ||= Nokogiri::HTML::Document.parse(@rendered.blank? ? @output_buffer : @rendered)
@html_document.root
end
diff --git a/actionview/test/template/form_tag_helper_test.rb b/actionview/test/template/form_tag_helper_test.rb
index d5976905c5..771e3fefc3 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)
- Loofah.fragment(rendered_content).children.first # extract from nodeset
+ Nokogiri::HTML::DocumentFragment.parse(rendered_content).children.first # extract from nodeset
end
end