diff options
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/actionpack.gemspec | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_dispatch/testing/assertions/dom.rb | 18 |
2 files changed, 11 insertions, 9 deletions
diff --git a/actionpack/actionpack.gemspec b/actionpack/actionpack.gemspec index 1d6009bab8..47a3d96cc8 100644 --- a/actionpack/actionpack.gemspec +++ b/actionpack/actionpack.gemspec @@ -21,6 +21,8 @@ Gem::Specification.new do |s| s.add_dependency 'activesupport', version + s.add_dependency 'loofah', '~> 1.2.1' + s.add_dependency 'rack', '~> 1.5.2' s.add_dependency 'rack-test', '~> 0.6.2' s.add_dependency 'actionview', version 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 |