We don't need loofah for the assertions

rafaelfranca · rafaelfranca · commit 158a6dfcd28e · 2014-07-15T13:40:21.000-03:00
We can just use nokogiri
diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb
@@ -3,7 +3,6 @@
 require 'active_support/core_ext/module/anonymous'
 require 'active_support/core_ext/hash/keys'
 
-require 'loofah'
 require 'rails-dom-testing'
 
 module ActionController
diff --git a/actionpack/lib/action_dispatch/testing/assertions.rb b/actionpack/lib/action_dispatch/testing/assertions.rb
@@ -1,4 +1,3 @@
-require 'loofah'
 require 'rails-dom-testing'
 
 module ActionDispatch
@@ -14,9 +13,9 @@ module Assertions
 
     def html_document
       @html_document ||= if @response.content_type =~ /xml$/
-        Loofah.xml_document(@response.body)
+        Nokogiri::XML::Document.parse(@response.body)
       else
-        Loofah.document(@response.body)
+        Nokogiri::HTML::Document.parse(@response.body)
       end
     end
   end
diff --git a/actionpack/test/controller/integration_test.rb b/actionpack/test/controller/integration_test.rb
@@ -291,7 +291,7 @@ def test_get
       assert_equal({}, cookies.to_hash)
       assert_equal "OK", body
       assert_equal "OK", response.body
-      assert_kind_of Loofah::HTML::Document, html_document
+      assert_kind_of Nokogiri::HTML::Document, html_document
       assert_equal 1, request_count
     end
   end
@@ -307,7 +307,7 @@ def test_post
       assert_equal({}, cookies.to_hash)
       assert_equal "Created", body
       assert_equal "Created", response.body
-      assert_kind_of Loofah::HTML::Document, html_document
+      assert_kind_of Nokogiri::HTML::Document, html_document
       assert_equal 1, request_count
     end
   end
@@ -367,7 +367,7 @@ def test_redirect
       assert_response :redirect
       assert_response :found
       assert_equal "<html><body>You are being <a href=\"http://www.example.com/get\">redirected</a>.</body></html>", response.body
-      assert_kind_of Loofah::HTML::Document, html_document
+      assert_kind_of Nokogiri::HTML::Document, html_document
       assert_equal 1, request_count
 
       follow_redirect!
diff --git a/actionview/lib/action_view/test_case.rb b/actionview/lib/action_view/test_case.rb
@@ -3,7 +3,6 @@
 require 'action_controller/test_case'
 require 'action_view'
 
-require 'loofah'
 require 'rails-dom-testing'
 
 module ActionView
@@ -159,7 +158,7 @@ def view_rendered?(view, expected_locals)
 
       # 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
@@ -632,6 +632,6 @@ def protect_against_forgery?
   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
