Added Loofah as a dependency in actionview.gemspec.

Implemented ActionView: FullSanitizer, LinkSanitizer and WhiteListSanitizer in sanitizers.rb.
Deprecated protocol_separator and bad_tags.
Added new tests in sanitizers_test.rb and reimplemented assert_dom_equal with Loofah.

1 files changed, 9 insertions, 9 deletions

diff --git a/actionpack/lib/action_dispatch/testing/assertions/dom.rb b/actionpack/lib/action_dispatch/testing/assertions/dom.rb
index 241a39393a..d929e4b400 100644
--- a/actionpack/lib/action_dispatch/testing/assertions/dom.rb
+++ b/actionpack/lib/action_dispatch/testing/assertions/dom.rb
@@ -1,4 +1,4 @@
-require 'action_view/vendor/html-scanner'
+require 'loofah'
 
 module ActionDispatch
   module Assertions
@@ -7,20 +7,20 @@ module ActionDispatch
       #
       #   # assert that the referenced method generates the appropriate HTML string
       #   assert_dom_equal '<a href="http://www.example.com">Apples</a>', link_to("Apples", "http://www.example.com")
-      def assert_dom_equal(expected, actual, message = nil)
-        expected_dom = HTML::Document.new(expected).root
-        actual_dom   = HTML::Document.new(actual).root
-        assert_equal expected_dom, actual_dom, message
+      def assert_dom_equal(expected, actual, message = "")
+        expected_dom = Loofah.fragment(expected).to_s
+        actual_dom   = Loofah.fragment(actual).to_s
+        assert_equal expected_dom, actual_dom
       end
 
       # The negated form of +assert_dom_equivalent+.
       #
       #   # assert that the referenced method does not generate the specified HTML string
       #   assert_dom_not_equal '<a href="http://www.example.com">Apples</a>', link_to("Oranges", "http://www.example.com")
-      def assert_dom_not_equal(expected, actual, message = nil)
-        expected_dom = HTML::Document.new(expected).root
-        actual_dom   = HTML::Document.new(actual).root
-        assert_not_equal expected_dom, actual_dom, message
+      def assert_dom_not_equal(expected, actual, message = "")
+        expected_dom = Loofah.fragment(expected).to_s
+        actual_dom   = Loofah.fragment(actual).to_s
+        assert_not_equal expected_dom, actual_dom
       end
     end
   end